This commit is contained in:
commit
642de03192
Binary file not shown.
File diff suppressed because one or more lines are too long
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 80d06dbff82270e4eb072d6e327986b2
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,40 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!84 &8400000
|
||||
RenderTexture:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: PlayerRenderTexture
|
||||
m_ImageContentsHash:
|
||||
serializedVersion: 2
|
||||
Hash: 00000000000000000000000000000000
|
||||
m_ForcedFallbackFormat: 4
|
||||
m_DownscaleFallback: 0
|
||||
m_IsAlphaChannelOptional: 0
|
||||
serializedVersion: 5
|
||||
m_Width: 256
|
||||
m_Height: 256
|
||||
m_AntiAliasing: 1
|
||||
m_MipCount: -1
|
||||
m_DepthStencilFormat: 94
|
||||
m_ColorFormat: 8
|
||||
m_MipMap: 0
|
||||
m_GenerateMips: 1
|
||||
m_SRGB: 0
|
||||
m_UseDynamicScale: 0
|
||||
m_BindMS: 0
|
||||
m_EnableCompatibleFormat: 1
|
||||
m_EnableRandomWrite: 0
|
||||
m_TextureSettings:
|
||||
serializedVersion: 2
|
||||
m_FilterMode: 1
|
||||
m_Aniso: 0
|
||||
m_MipBias: 0
|
||||
m_WrapU: 1
|
||||
m_WrapV: 1
|
||||
m_WrapW: 1
|
||||
m_Dimension: 2
|
||||
m_VolumeDepth: 1
|
||||
m_ShadowSamplingMode: 2
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 4e7ae4146b2526a4e853ba0c061ecc5b
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 8400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -167,6 +167,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 2230491642635869173}
|
||||
- {fileID: 2018910673817157846}
|
||||
- {fileID: 1147361631757159635}
|
||||
m_Father: {fileID: 4999506206623659068}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
|
|
@ -440,6 +441,79 @@ MonoBehaviour:
|
|||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!1 &2971887056018262127
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1147361631757159635}
|
||||
- component: {fileID: 7112708151782283752}
|
||||
- component: {fileID: 8429238067139431364}
|
||||
m_Layer: 5
|
||||
m_Name: showSelfRawImage
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1147361631757159635
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2971887056018262127}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1572287658}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 223, y: -26}
|
||||
m_SizeDelta: {x: 350, y: 450}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7112708151782283752
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2971887056018262127}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &8429238067139431364
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2971887056018262127}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 8400000, guid: 4e7ae4146b2526a4e853ba0c061ecc5b, type: 2}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!1 &3480542912618920984
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -285,249 +285,6 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: d175d4b181be89546abe91f03f9dc60e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &827663501
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 827663502}
|
||||
- component: {fileID: 827663504}
|
||||
- component: {fileID: 827663503}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
--- !u!224 &827663502
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 827663501}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1206934845}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &827663503
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 827663501}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.12941177}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 2800000, guid: d1a58d4c2b9683e48868cfd284dda5d1, type: 3}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!222 &827663504
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 827663501}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1 &1040589238
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1040589241}
|
||||
- component: {fileID: 1040589240}
|
||||
- component: {fileID: 1040589239}
|
||||
m_Layer: 0
|
||||
m_Name: EventSystem
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1040589239
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1040589238}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_SendPointerHoverToParent: 1
|
||||
m_HorizontalAxis: Horizontal
|
||||
m_VerticalAxis: Vertical
|
||||
m_SubmitButton: Submit
|
||||
m_CancelButton: Cancel
|
||||
m_InputActionsPerSecond: 10
|
||||
m_RepeatDelay: 0.5
|
||||
m_ForceModuleActive: 0
|
||||
--- !u!114 &1040589240
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1040589238}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_FirstSelected: {fileID: 0}
|
||||
m_sendNavigationEvents: 1
|
||||
m_DragThreshold: 10
|
||||
--- !u!4 &1040589241
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1040589238}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1206934841
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1206934845}
|
||||
- component: {fileID: 1206934844}
|
||||
- component: {fileID: 1206934843}
|
||||
- component: {fileID: 1206934842}
|
||||
m_Layer: 5
|
||||
m_Name: Canvas
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &1206934842
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206934841}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
m_BlockingObjects: 0
|
||||
m_BlockingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 55
|
||||
--- !u!114 &1206934843
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206934841}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
m_FallbackScreenDPI: 96
|
||||
m_DefaultSpriteDPI: 96
|
||||
m_DynamicPixelsPerUnit: 1
|
||||
m_PresetInfoIsWorld: 0
|
||||
--- !u!223 &1206934844
|
||||
Canvas:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206934841}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_Camera: {fileID: 0}
|
||||
m_PlaneDistance: 100
|
||||
m_PixelPerfect: 0
|
||||
m_ReceivesEvents: 1
|
||||
m_OverrideSorting: 0
|
||||
m_OverridePixelPerfect: 0
|
||||
m_SortingBucketNormalizedSize: 0
|
||||
m_VertexColorAlwaysGammaSpace: 0
|
||||
m_AdditionalShaderChannelsFlag: 25
|
||||
m_SortingLayerID: 0
|
||||
m_SortingOrder: 0
|
||||
m_TargetDisplay: 0
|
||||
--- !u!224 &1206934845
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1206934841}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0, y: 0, z: 0}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 827663502}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!1 &1406672269
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1208,9 +1208,9 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 919132148358585192}
|
||||
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -1.3153876, y: 0.66252714, z: -1.2924924}
|
||||
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0.024442196, y: 0.88570684, z: -1.0056937}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 5568970732483254973}
|
||||
|
|
@ -1554,6 +1554,8 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 543450652349448658}
|
||||
- component: {fileID: 919132148358585194}
|
||||
- component: {fileID: 919132148358585193}
|
||||
m_Layer: 0
|
||||
m_Name: "\u624B\u673A"
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1561,6 +1563,32 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &919132148358585193
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 919132148358585192}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2a85b91b2d2519347b583e108b24f3c8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
downIndex: 0
|
||||
--- !u!65 &919132148358585194
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 919132148358585192}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 0.08355041, y: 0.030540586, z: 0.17206752}
|
||||
m_Center: {x: -0.00045210123, y: 0.0055265427, z: 0.00059360266}
|
||||
--- !u!1 &919132148708085627
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -5221,9 +5249,9 @@ Transform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8049962175932441955}
|
||||
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 133.98299, y: 22.317968, z: 28.679873}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 543450652349448658}
|
||||
|
|
@ -6901,7 +6929,6 @@ GameObject:
|
|||
- component: {fileID: 5568970732483254973}
|
||||
- component: {fileID: 9006472541337010437}
|
||||
- component: {fileID: 7964202602271020417}
|
||||
- component: {fileID: 9006472541337010439}
|
||||
- component: {fileID: 9006472541337010438}
|
||||
m_Layer: 0
|
||||
m_Name: shouji1
|
||||
|
|
@ -7517,23 +7544,164 @@ MonoBehaviour:
|
|||
m_GameObject: {fileID: 8049962175932441955}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2a85b91b2d2519347b583e108b24f3c8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 888380afc233049ce9e618f9f36c8ba8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
downIndex: 0
|
||||
--- !u!65 &9006472541337010439
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8049962175932441955}
|
||||
m_Material: {fileID: 0}
|
||||
m_IsTrigger: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_Size: {x: 7.149084, y: 0.81946564, z: 16.000008}
|
||||
m_Center: {x: -0.000009536743, y: 0.34326786, z: -0.000002861023}
|
||||
profile: {fileID: 0}
|
||||
profileSync: 0
|
||||
previewInEditor: 1
|
||||
camerasLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
effectGroup: 0
|
||||
effectGroupLayer:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
effectNameFilter:
|
||||
combineMeshes: 0
|
||||
alphaCutOff: 0
|
||||
cullBackFaces: 1
|
||||
ignoreObjectVisibility: 0
|
||||
reflectionProbes: 0
|
||||
GPUInstancing: 1
|
||||
depthClip: 0
|
||||
cameraDistanceFade: 0
|
||||
cameraDistanceFadeNear: 0
|
||||
cameraDistanceFadeFar: 1000
|
||||
normalsOption: 0
|
||||
ignore: 0
|
||||
_highlighted: 0
|
||||
fadeInDuration: 0
|
||||
fadeOutDuration: 0
|
||||
flipY: 0
|
||||
constantWidth: 1
|
||||
subMeshMask: -1
|
||||
overlay: 0
|
||||
overlayMode: 0
|
||||
overlayColor: {r: 1, g: 0.92156863, b: 0.015686275, a: 1}
|
||||
overlayAnimationSpeed: 1
|
||||
overlayMinIntensity: 0.5
|
||||
overlayBlending: 1
|
||||
overlayTexture: {fileID: 0}
|
||||
overlayTextureUVSpace: 0
|
||||
overlayTextureScale: 1
|
||||
outline: 1
|
||||
outlineColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
outlineColorStyle: 0
|
||||
outlineGradient:
|
||||
serializedVersion: 2
|
||||
key0: {r: 1, g: 1, b: 1, a: 1}
|
||||
key1: {r: 1, g: 1, b: 1, a: 1}
|
||||
key2: {r: 0, g: 0, b: 0, a: 0}
|
||||
key3: {r: 0, g: 0, b: 0, a: 0}
|
||||
key4: {r: 0, g: 0, b: 0, a: 0}
|
||||
key5: {r: 0, g: 0, b: 0, a: 0}
|
||||
key6: {r: 0, g: 0, b: 0, a: 0}
|
||||
key7: {r: 0, g: 0, b: 0, a: 0}
|
||||
ctime0: 0
|
||||
ctime1: 65535
|
||||
ctime2: 0
|
||||
ctime3: 0
|
||||
ctime4: 0
|
||||
ctime5: 0
|
||||
ctime6: 0
|
||||
ctime7: 0
|
||||
atime0: 0
|
||||
atime1: 65535
|
||||
atime2: 0
|
||||
atime3: 0
|
||||
atime4: 0
|
||||
atime5: 0
|
||||
atime6: 0
|
||||
atime7: 0
|
||||
m_Mode: 0
|
||||
m_NumColorKeys: 2
|
||||
m_NumAlphaKeys: 2
|
||||
outlineGradientInLocalSpace: 0
|
||||
outlineWidth: 0.45
|
||||
outlineQuality: 3
|
||||
outlineDownsampling: 2
|
||||
outlineVisibility: 0
|
||||
glowBlendMode: 0
|
||||
outlineOptimalBlit: 1
|
||||
outlineBlitDebug: 0
|
||||
outlineIndependent: 0
|
||||
glow: 0
|
||||
glowWidth: 0.4
|
||||
glowQuality: 3
|
||||
glowDownsampling: 2
|
||||
glowHQColor: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
glowDithering: 1
|
||||
glowMagicNumber1: 0.75
|
||||
glowMagicNumber2: 0.5
|
||||
glowAnimationSpeed: 1
|
||||
glowVisibility: 0
|
||||
glowOptimalBlit: 1
|
||||
glowBlitDebug: 0
|
||||
glowBlendPasses: 1
|
||||
glowPasses:
|
||||
- offset: 4
|
||||
alpha: 0.1
|
||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
- offset: 3
|
||||
alpha: 0.2
|
||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
- offset: 2
|
||||
alpha: 0.3
|
||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
- offset: 1
|
||||
alpha: 0.4
|
||||
color: {r: 0.64, g: 1, b: 0, a: 1}
|
||||
glowIgnoreMask: 0
|
||||
innerGlow: 0
|
||||
innerGlowWidth: 1
|
||||
innerGlowColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
innerGlowVisibility: 0
|
||||
targetFX: 0
|
||||
targetFXTexture: {fileID: 0}
|
||||
targetFXColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
targetFXCenter: {fileID: 0}
|
||||
targetFXRotationSpeed: 50
|
||||
targetFXInitialScale: 4
|
||||
targetFXEndScale: 1.5
|
||||
targetFXScaleToRenderBounds: 1
|
||||
targetFXAlignToGround: 0
|
||||
targetFXFadePower: 32
|
||||
targetFXGroundMaxDistance: 10
|
||||
targetFXGroundLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
targetFXTransitionDuration: 0.5
|
||||
targetFXStayDuration: 1.5
|
||||
targetFXVisibility: 1
|
||||
seeThrough: 2
|
||||
seeThroughOccluderMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
seeThroughOccluderThreshold: 0.3
|
||||
seeThroughOccluderMaskAccurate: 0
|
||||
seeThroughOccluderCheckInterval: 1
|
||||
seeThroughOccluderCheckIndividualObjects: 0
|
||||
seeThroughDepthOffset: 0
|
||||
seeThroughMaxDepth: 0
|
||||
seeThroughIntensity: 0.8
|
||||
seeThroughTintAlpha: 0.5
|
||||
seeThroughTintColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
seeThroughNoise: 1
|
||||
seeThroughBorder: 0
|
||||
seeThroughBorderColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
seeThroughBorderOnly: 0
|
||||
seeThroughBorderWidth: 0.45
|
||||
seeThroughOrdered: 0
|
||||
seeThroughTexture: {fileID: 0}
|
||||
seeThroughTextureUVSpace: 0
|
||||
seeThroughTextureScale: 1
|
||||
rmsCount: 1
|
||||
hitFxInitialIntensity: 0
|
||||
hitFxMode: 0
|
||||
hitFxFadeOutDuration: 0.25
|
||||
hitFxColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
hitFxRadius: 0.5
|
||||
--- !u!4 &9011460203944377687
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -6,6 +6,7 @@ public class TB_SubProcess
|
|||
public string subProcessName;
|
||||
public bool isPrecondition;
|
||||
public string precondition;
|
||||
public string toolID;
|
||||
public string tipTitle;
|
||||
public string tips;
|
||||
}
|
||||
|
|
@ -7,5 +7,6 @@ public class TB_SubProcessStep
|
|||
public string subProcessStepName;
|
||||
public bool isPrecondition;
|
||||
public string precondition;
|
||||
public string tipTitle;
|
||||
public float score;
|
||||
}
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
public class TB_ToolAndMaterial
|
||||
{
|
||||
public int id;
|
||||
public int systemID;
|
||||
public int schemeId;
|
||||
public string objName;
|
||||
public int type;
|
||||
public string prefabName;
|
||||
|
|
|
|||
|
|
@ -48,6 +48,7 @@ public class DataManager : BaseManager<DataManager>
|
|||
private Dictionary<int, TB_ToolAndMaterial> toolAndMaterialDic = new Dictionary<int, TB_ToolAndMaterial>();
|
||||
|
||||
|
||||
|
||||
/// <summary>
|
||||
/// 初始化
|
||||
/// </summary>
|
||||
|
|
@ -76,30 +77,30 @@ public class DataManager : BaseManager<DataManager>
|
|||
var allSchemeList = new List<TB_Scheme>();
|
||||
foreach (var item in schemeDic.Values)
|
||||
{
|
||||
if (item.systemId == GameManager.ProcessMgr.id)
|
||||
if (item.systemId == GameManager.Instance.systemId)
|
||||
allSchemeList.Add(item);
|
||||
}
|
||||
|
||||
return allSchemeList;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 获取当前系统全部工器具和材料
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public List<TB_ToolAndMaterial> GetCurrentSystemToolAndMaterials()
|
||||
{
|
||||
var currentSystemToolAndMaterials = new List<TB_ToolAndMaterial>();
|
||||
foreach (var item in toolAndMaterialDic.Values)
|
||||
{
|
||||
if (item.systemID == GameManager.ProcessMgr.id)
|
||||
{
|
||||
currentSystemToolAndMaterials.Add(item);
|
||||
}
|
||||
}
|
||||
///// <summary>
|
||||
///// 获取当前系统全部工器具和材料
|
||||
///// </summary>
|
||||
///// <returns></returns>
|
||||
//public List<TB_ToolAndMaterial> GetCurrentSystemToolAndMaterials()
|
||||
//{
|
||||
// var currentSystemToolAndMaterials = new List<TB_ToolAndMaterial>();
|
||||
// foreach (var item in toolAndMaterialDic.Values)
|
||||
// {
|
||||
// if (item.systemID == GameManager.ProcessMgr.id)
|
||||
// {
|
||||
// currentSystemToolAndMaterials.Add(item);
|
||||
// }
|
||||
// }
|
||||
|
||||
return currentSystemToolAndMaterials;
|
||||
}
|
||||
// return currentSystemToolAndMaterials;
|
||||
//}
|
||||
|
||||
/// <summary>
|
||||
/// 获取D_Scheme
|
||||
|
|
@ -115,7 +116,6 @@ public class DataManager : BaseManager<DataManager>
|
|||
d_Scheme.id = schemeDic[id].id;
|
||||
d_Scheme.schemeName = schemeDic[id].schemeName;
|
||||
}
|
||||
|
||||
d_Scheme.processes = GetD_Processes(d_Scheme.id);
|
||||
return d_Scheme;
|
||||
}
|
||||
|
|
@ -205,6 +205,32 @@ public class DataManager : BaseManager<DataManager>
|
|||
return d_SubProcessSteps;
|
||||
}
|
||||
|
||||
|
||||
public List<int> GetSubProcessStepIDByToolID(int toolID)
|
||||
{
|
||||
List<TB_SubProcess> tb_subProcesss = new List<TB_SubProcess>();
|
||||
List<int> toolIDTemp = new List<int>();
|
||||
foreach (var item in subProcessDic.Values)
|
||||
{
|
||||
if (item.schemeId == GameManager.ProcessMgr.schemeID)
|
||||
tb_subProcesss.Add(item);
|
||||
}
|
||||
foreach (var item in tb_subProcesss)
|
||||
{
|
||||
if (string.IsNullOrEmpty(item.toolID))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
string[] subProcessStepToolID = item.toolID.Split(',');
|
||||
for (int i = 0; i < subProcessStepToolID.Length; i++)
|
||||
{
|
||||
if (int.Parse(subProcessStepToolID[i]) == toolID)
|
||||
toolIDTemp.Add(item.id);
|
||||
}
|
||||
}
|
||||
return toolIDTemp;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 根据系统Id 获取系统信息
|
||||
/// </summary>
|
||||
|
|
|
|||
|
|
@ -122,7 +122,7 @@ public class GameManager : SingletonAutoMono<GameManager>
|
|||
ToolAndmaterialMgr = ToolAndmaterialMgr.Instance;
|
||||
PacksackBagMgr = PacksackBagMgr.Instance;
|
||||
DataMgr.Init();
|
||||
ToolAndmaterialMgr.Init();
|
||||
//ToolAndmaterialMgr.Init();
|
||||
InitData();
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -12,10 +12,6 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
{
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 实操项目id
|
||||
/// </summary>
|
||||
public int id = 10002;
|
||||
|
||||
/// <summary>
|
||||
/// 模式
|
||||
|
|
@ -74,7 +70,7 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
/// <param name="id">方案id</param>
|
||||
public void Init(int id, E_ModeType mode, int countDown = 600) //TODO 考试断线重连应该考虑初始化问题
|
||||
{
|
||||
this.id = id;
|
||||
this.schemeID = id;
|
||||
this.mode = mode;
|
||||
coroutine = GameManager.MonoMgr.StartCoroutine(CountDown(countDown));
|
||||
d_Scheme = DataManager.Instance.GetSchemeData(id);
|
||||
|
|
@ -115,18 +111,22 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
}
|
||||
|
||||
/// <summary>
|
||||
///
|
||||
/// 切换
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public bool CheckSubProcessSteps(string subProcessStepName)
|
||||
public bool CheckSubProcessSteps(int subProcessStepID)
|
||||
{
|
||||
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.subProcessStepName.Equals(subProcessStepName))
|
||||
if (d_Scheme.CurrentProcess.CurrentSubProcess.CurrentSubProcessStep.id.Equals(subProcessStepID))
|
||||
{
|
||||
int spStepID = subProcessStepId + 1;
|
||||
int spStepcount = d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes.Count;
|
||||
if (spStepID <= d_Scheme.CurrentProcess.CurrentSubProcess.subProcessStepes[spStepcount - 1].id)
|
||||
{
|
||||
HandoverSubProcessStep(spStepID);
|
||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
|
||||
});
|
||||
Debug.Log("进入下一步子流程步骤");
|
||||
return true;
|
||||
}
|
||||
|
|
@ -137,6 +137,10 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
if (spID <= d_Scheme.CurrentProcess.subProcesses[spCount - 1].id)
|
||||
{
|
||||
HandoverSubProcess(spID, 0);
|
||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
|
||||
});
|
||||
Debug.Log("进入下一步子流程");
|
||||
return true;
|
||||
}
|
||||
|
|
@ -147,6 +151,10 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
if (pID <= d_Scheme.processes[pCount - 1].id)
|
||||
{
|
||||
HandoverProcess(pID, 0, 0);
|
||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
panel.Init($"{d_Scheme.CurrentProcess.processName}:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
|
||||
});
|
||||
Debug.Log("进入下一步流程");
|
||||
return true;
|
||||
}
|
||||
|
|
@ -162,6 +170,10 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
else
|
||||
{
|
||||
Debug.Log("按照流程走");
|
||||
GameManager.UIMgr.ShowPanel<UI_TopTipPanel>(E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
panel.Init($"<color=red>错误:</color>:<color=blue>{d_Scheme.CurrentProcess.CurrentSubProcess.subProcessName}</color>", $"{d_Scheme.CurrentProcess.CurrentSubProcess.tips}");
|
||||
});
|
||||
return false;
|
||||
}
|
||||
|
||||
|
|
@ -190,7 +202,7 @@ public class ProcessManager : BaseManager<ProcessManager>
|
|||
/// </summary>
|
||||
public void End()
|
||||
{
|
||||
id = -1;
|
||||
schemeID = -1;
|
||||
mode = E_ModeType.None;
|
||||
if (coroutine != null)
|
||||
GameManager.MonoMgr.StopCoroutine(coroutine);
|
||||
|
|
|
|||
|
|
@ -15,10 +15,10 @@ public class ToolAndmaterialMgr : BaseManager<ToolAndmaterialMgr>
|
|||
{
|
||||
}
|
||||
|
||||
public void Init()
|
||||
{
|
||||
toolAndMaterialList = GameManager.DataMgr.GetCurrentSystemToolAndMaterials();
|
||||
}
|
||||
//public void Init()
|
||||
//{
|
||||
// toolAndMaterialList = GameManager.DataMgr.GetCurrentSystemToolAndMaterials();
|
||||
//}
|
||||
|
||||
public string GetIconSpriteName(string objName)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,3 +1,4 @@
|
|||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
|
|
@ -5,33 +6,75 @@ using UnityEngine;
|
|||
public class Device_Mobile : MonoBehaviour
|
||||
{
|
||||
public int downIndex = 0;
|
||||
public int modelID = 5005;
|
||||
public List<int> subProcessID = new List<int>();
|
||||
private void Awake()
|
||||
{
|
||||
subProcessID = GameManager.DataMgr.GetSubProcessStepIDByToolID(modelID);
|
||||
}
|
||||
private void Start()
|
||||
{
|
||||
GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
|
||||
}
|
||||
|
||||
private void SwitchSubProcess(int arg0)
|
||||
{
|
||||
if (subProcessID.Contains(arg0))
|
||||
{
|
||||
Debug.Log("ÎÒÓ¦¸ÃÌáʾ");
|
||||
}
|
||||
}
|
||||
|
||||
private void OnMouseDown()
|
||||
{
|
||||
switch (downIndex)
|
||||
{
|
||||
case 0:
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps("查看任务单"))
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps(4001))
|
||||
downIndex++;
|
||||
break;
|
||||
case 1:
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps("工作预约"))
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps(4002))
|
||||
downIndex++;
|
||||
break;
|
||||
case 2:
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps("选择正确工作票"))
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps(4003))
|
||||
downIndex++;
|
||||
break;
|
||||
case 3:
|
||||
GameManager.ProcessMgr.CheckSubProcessSteps("1212");
|
||||
downIndex = 0;
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps(4004))
|
||||
downIndex++;
|
||||
break;
|
||||
case 4:
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps(4005))
|
||||
downIndex++;
|
||||
break;
|
||||
case 5:
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps(4006))
|
||||
downIndex++;
|
||||
break;
|
||||
case 6:
|
||||
if (GameManager.ProcessMgr.CheckSubProcessSteps(4007))
|
||||
downIndex++;
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
private void Update()
|
||||
{
|
||||
if (Input.GetKeyDown("r"))
|
||||
{
|
||||
GameManager.ProcessMgr.CheckSubProcessSteps(2);
|
||||
}
|
||||
}
|
||||
|
||||
private void OnMouseExit()
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
using TMPro;
|
||||
|
||||
public class UI_ProcessItem : BasePanel
|
||||
public class UI_ProcessItem : BaseItem
|
||||
{
|
||||
public int processID;
|
||||
public void Init(int processID, string processName)
|
||||
|
|
|
|||
|
|
@ -9,6 +9,11 @@ public class UI_SubProcessItem : BaseItem
|
|||
public int processID;
|
||||
public int subProcessID;
|
||||
public int subProcessStepID;
|
||||
|
||||
private void Start()
|
||||
{
|
||||
GameManager.EventMgr.AddEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
|
||||
}
|
||||
public void Init(D_SubProcess d_SubProcess)
|
||||
{
|
||||
this.processID = d_SubProcess.processId;
|
||||
|
|
@ -18,14 +23,29 @@ public class UI_SubProcessItem : BaseItem
|
|||
gameObject.name = subProcessID.ToString();
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// ¿ØÖÆ°´Å¥×´Ì¬
|
||||
/// </summary>
|
||||
/// <param name="subProcess"></param>
|
||||
private void SwitchSubProcess(int subProcess)
|
||||
{
|
||||
|
||||
}
|
||||
|
||||
protected override void OnClick(string btnName)
|
||||
{
|
||||
base.OnClick(btnName);
|
||||
switch (btnName)
|
||||
{
|
||||
case "subProcessBtn":
|
||||
GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
|
||||
//GameManager.ProcessMgr.HandoverProcess(processID, subProcessID, subProcessStepID);
|
||||
GameManager.EventMgr.EventTrigger<int>(Enum_EventType.SwitchSubProcess, subProcessID);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
private void OnDestroy()
|
||||
{
|
||||
GameManager.EventMgr.RemoveEventListener<int>(Enum_EventType.SwitchSubProcess, SwitchSubProcess);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ public class UI_MainTitlePanel : BasePanel
|
|||
|
||||
private void SwitchTitleImg()
|
||||
{
|
||||
var systemInfo = GameManager.DataMgr.GetSystemInfo(GameManager.ProcessMgr.id);
|
||||
var systemInfo = GameManager.DataMgr.GetSystemInfo(GameManager.Instance.systemId);
|
||||
GetControl<Image>("TopBgImg").sprite =
|
||||
GameManager.ResourcesMgr.Load<Sprite>(Const.UI_MainTitlePanel + systemInfo.titleName);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using DG.Tweening;
|
||||
using Sirenix.OdinInspector;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
using UnityEngine.EventSystems;
|
||||
|
|
@ -43,21 +44,21 @@ public class UI_SelectDevicePanel : BasePanel
|
|||
//按钮的父节点是标题的父节点content
|
||||
deviceItemBtn.transform.parent = titleItem.transform.parent;
|
||||
deviceItemBtn.GetComponentInChildren<TextMeshProUGUI>().text = x.schemeName;
|
||||
|
||||
var deviceBtnAComponent = deviceItemBtn.GetComponent<Button>();
|
||||
AddEventForDeviceBtn(deviceBtnAComponent, x.deviceMap, x.id);
|
||||
deviceItemBtn.name = x.id.ToString();
|
||||
AddEventForDeviceBtn(deviceBtnAComponent, x.deviceMap);
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void AddEventForDeviceBtn(Button deviceBtnAComponent, string mapName,int schemeID)
|
||||
private void AddEventForDeviceBtn(Button deviceBtnAComponent, string mapName)
|
||||
{
|
||||
GameManager.UIMgr.AddEventTriggerListener(deviceBtnAComponent, EventTriggerType.PointerEnter,
|
||||
_ =>
|
||||
{
|
||||
//deviceBtnAComponent.transform.DOScale(1.5f, 0.2f);
|
||||
deviceBtnAComponent.transform.DOScale(1.3f, 0.2f);
|
||||
this.GetControl<Image>("DeviceShowImg").sprite =
|
||||
GameManager.ResourcesMgr.Load<Sprite>(Const.UI_SelectDevicePanel + mapName);
|
||||
this.GetControl<Image>("DeviceShowImg").color = new Color(1, 1, 1, 1);
|
||||
|
|
@ -65,15 +66,19 @@ public class UI_SelectDevicePanel : BasePanel
|
|||
GameManager.UIMgr.AddEventTriggerListener(deviceBtnAComponent, EventTriggerType.PointerExit,
|
||||
_ =>
|
||||
{
|
||||
//deviceBtnAComponent.transform.DOScale(1f, 0.2f);
|
||||
deviceBtnAComponent.transform.DOScale(1f, 0.2f);
|
||||
this.GetControl<Image>("DeviceShowImg").color = new Color(1, 1, 1, 0);
|
||||
});
|
||||
deviceBtnAComponent.onClick.AddListener(() =>
|
||||
{
|
||||
GameManager.RunModelMgr.deviceId = schemeID;
|
||||
GameManager.RunModelMgr.deviceId = int.Parse(deviceBtnAComponent.name);
|
||||
GameManager.ProcessMgr.Init(GameManager.RunModelMgr.deviceId, E_ModeType.Study);
|
||||
GameManager.UIMgr.ShowPanel<UI_LoadingPanel>(E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
GameManager.UIMgr.ShowPanel<UI_MainTitlePanel>(E_UI_Layer.Bot, (panel) => { panel.Init(); });
|
||||
GameManager.UIMgr.ShowPanel<UI_MainTitlePanel>(E_UI_Layer.Bot, (panel) =>
|
||||
{
|
||||
panel.Init();
|
||||
});
|
||||
|
||||
panel.Init();
|
||||
GameManager.EventMgr.EventTrigger<float>(Enum_EventType.UpdateProgress, 0.1f);
|
||||
|
|
@ -100,4 +105,14 @@ public class UI_SelectDevicePanel : BasePanel
|
|||
}
|
||||
}
|
||||
|
||||
[Button]
|
||||
public void Test1()
|
||||
{
|
||||
foreach (var VARIABLE in allSchemeName)
|
||||
{
|
||||
Debug.LogError(VARIABLE.deviceMap + VARIABLE.schemeName);
|
||||
}
|
||||
|
||||
Debug.LogError(allDeviceTypes.Count);
|
||||
}
|
||||
}
|
||||
|
|
@ -9,11 +9,11 @@ public class UI_SessionPanel : BasePanel
|
|||
Debug.Log("1111111");
|
||||
}
|
||||
/// <summary>
|
||||
/// 初始化
|
||||
/// 初始化
|
||||
/// </summary>
|
||||
public void Init(string content)
|
||||
{
|
||||
GetControl<TextMeshProUGUI>("Text_DialogBox").text = content;//在开始时给content赋值
|
||||
GetControl<TextMeshProUGUI>("Text_DialogBox").text = content;//在开始时给content赋值
|
||||
}
|
||||
//public override void ShowMe()
|
||||
//{
|
||||
|
|
@ -25,7 +25,7 @@ public class UI_SessionPanel : BasePanel
|
|||
|
||||
//}
|
||||
/// <summary>
|
||||
/// 按钮点击
|
||||
/// 按钮点击
|
||||
/// </summary>
|
||||
/// <param name="btnName"></param>
|
||||
protected override void OnClick(string btnName)
|
||||
|
|
@ -33,8 +33,8 @@ public class UI_SessionPanel : BasePanel
|
|||
switch (btnName)
|
||||
{
|
||||
case "ContinueBtn":
|
||||
Debug.Log("点击继续按钮");
|
||||
GetControl<TextMeshProUGUI>("Text_DialogBox").text = "你好，我是xx供电公司员工，这是我的工作证。现在我们要对贵户高压电能计量装置进行安装";
|
||||
Debug.Log("点击继续按钮");
|
||||
GetControl<TextMeshProUGUI>("Text_DialogBox").text = "你好，我是xx供电公司员工，这是我的工作证。现在我们要对贵户高压电能计量装置进行安装";
|
||||
this.gameObject.SetActive(false);
|
||||
break;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -18,8 +18,6 @@ public class UI_TaskListPanel : BasePanel
|
|||
GameManager.ResourcesMgr.LoadAsync<UI_SubProcessItem>($"{Const.UI_Item}UI_TaskListPanel/subProcessItem", (stemp) =>
|
||||
{
|
||||
_subProcessItem = stemp;
|
||||
|
||||
GameManager.ProcessMgr.Init(schemeID, E_ModeType.Study);
|
||||
D_Scheme d_Scheme = GameManager.ProcessMgr.d_Scheme;
|
||||
for (int i = 0; i < d_Scheme.processes.Count; i++)
|
||||
{
|
||||
|
|
@ -28,7 +26,7 @@ public class UI_TaskListPanel : BasePanel
|
|||
for (int j = 0; j < d_Scheme.processes[i].subProcesses.Count; j++)
|
||||
{
|
||||
var s = Instantiate(_subProcessItem, _content);
|
||||
s.Init( d_Scheme.processes[i].subProcesses[j]);
|
||||
s.Init(d_Scheme.processes[i].subProcesses[j]);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -27,4 +27,9 @@ public enum Enum_EventType
|
|||
/// 切换场景
|
||||
/// </summary>
|
||||
SwitchScene,
|
||||
|
||||
/// <summary>
|
||||
/// 切换子流程
|
||||
/// </summary>
|
||||
SwitchSubProcess,
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ using UnityEngine.UI;
|
|||
public class BasePanel : MonoBehaviour
|
||||
{
|
||||
/// <summary>
|
||||
/// ??????????п??
|
||||
/// ??????????§α??
|
||||
/// </summary>
|
||||
private readonly Dictionary<string,List<UIBehaviour>> controlDic = new Dictionary<string, List<UIBehaviour>>();
|
||||
|
||||
|
|
|
|||
|
|
@ -36,9 +36,8 @@ public class OfficeTimelineControl : MonoBehaviour
|
|||
GameManager.UIMgr.ShowPanel<UI_MaskPanel>(E_UI_Layer.System, (panel) =>
|
||||
{
|
||||
panel.Init();
|
||||
GameManager.EventMgr.EventTrigger(Enum_EventType.HideMask);
|
||||
Invoke("DestroyPlayer", 1f);
|
||||
});
|
||||
Invoke(nameof(DestroyPlayer), 1f);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -47,14 +46,19 @@ public class OfficeTimelineControl : MonoBehaviour
|
|||
Destroy(playerModel);
|
||||
Destroy(aniCamera);
|
||||
playerController.SetActive(true);
|
||||
GameManager.UIMgr.ShowPanel<UI_TaskListPanel>(E_UI_Layer.Bot, (panel) =>
|
||||
if (GameManager.RunModelMgr.ModeType==E_ModeType.Study)
|
||||
{
|
||||
panel.Init(GameManager.RunModelMgr.deviceId);
|
||||
});
|
||||
GameManager.UIMgr.ShowPanel<UI_TaskListPanel>(E_UI_Layer.Bot, (panel) =>
|
||||
{
|
||||
panel.Init(GameManager.RunModelMgr.deviceId);
|
||||
});
|
||||
}
|
||||
|
||||
GameManager.UIMgr.ShowPanel<UI_MenuBar>(E_UI_Layer.Mid, (panel) =>
|
||||
{
|
||||
panel.Init();
|
||||
GameManager.EventMgr.EventTrigger(Enum_EventType.SwitchScene, GameManager.RunModelMgr.SceneType);
|
||||
GameManager.EventMgr.EventTrigger(Enum_EventType.HideMask);
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue