提交

2024-06-12 19:56:30 +08:00 · 2024-06-12 19:56:30 +08:00 · fcb3bc2f8b
parent 151bdeaf79
commit fcb3bc2f8b
3 changed files with 130 additions and 149 deletions
--- a/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab
+++ b/SXElectricityInformationAcquisition/Assets/Resources/Prefabs/APP.prefab
@ -1,5 +1,80 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1 &762934268493445016
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7548714267217366021}
+  - component: {fileID: 2423060538799405539}
+  - component: {fileID: 2847223488417195132}
+  m_Layer: 5
+  m_Name: Image
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &7548714267217366021
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 762934268493445016}
+  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: 6780964861112113625}
+  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: 162.6, y: 2.7}
+  m_SizeDelta: {x: 232, y: 68}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2423060538799405539
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 762934268493445016}
+  m_CullTransparentMesh: 1
+--- !u!114 &2847223488417195132
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 762934268493445016}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 0
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: ca9aafed1e90c004d8db5d816e0a98c9, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
 --- !u!1 &2254929100106748975
 GameObject:
  m_ObjectHideFlags: 0
@ -57,10 +132,10 @@ Canvas:
  m_OverridePixelPerfect: 0
  m_SortingBucketNormalizedSize: 0
  m_VertexColorAlwaysGammaSpace: 0
-  m_AdditionalShaderChannelsFlag: 0
+  m_AdditionalShaderChannelsFlag: 25
  m_UpdateRectTransformForStandalone: 0
  m_SortingLayerID: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
  m_TargetDisplay: 0
 --- !u!114 &8119939561368072965
 MonoBehaviour:
@ -251,11 +326,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
      propertyPath: m_SizeDelta.x
-      value: 50
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
      propertyPath: m_SizeDelta.y
-      value: 50
+      value: 100
      objectReference: {fileID: 0}
    - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
      propertyPath: m_LocalPosition.x
@ -287,11 +362,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
      propertyPath: m_AnchoredPosition.x
-      value: 208
+      value: 105
      objectReference: {fileID: 0}
    - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
      propertyPath: m_AnchoredPosition.y
-      value: 131
+      value: 377
      objectReference: {fileID: 0}
    - target: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
@ -305,15 +380,46 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
+    - target: {fileID: 5550690678067872105, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
+      propertyPath: m_Sprite
+      value: 
+      objectReference: {fileID: 21300000, guid: 072d5fe14b735484dbf6d54b33d9f594, type: 3}
    - target: {fileID: 5668293590267392201, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
      propertyPath: m_Name
      value: ToolsPackMenuButton
      objectReference: {fileID: 0}
    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_RemovedGameObjects:
+    - {fileID: 1243956777439765201, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
+    m_AddedGameObjects:
+    - targetCorrespondingSourceObject: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7548714267217366021}
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5668293590267392201, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 7118155868843819662}
  m_SourcePrefab: {fileID: 100100000, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
+--- !u!1 &2731501972977552647 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5668293590267392201, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
+  m_PrefabInstance: {fileID: 7728718399313411534}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &7118155868843819662
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2731501972977552647}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bafb9b27cc714c247934b57270a01a0b, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  defaultSprite: {fileID: 21300000, guid: 072d5fe14b735484dbf6d54b33d9f594, type: 3}
+  clickSprite: {fileID: 21300000, guid: 57d1a67bc63627f49a9a0a3bc6623162, type: 3}
+  clickGameSprite: {fileID: 762934268493445016}
 --- !u!224 &6780964861112113625 stripped
 RectTransform:
  m_CorrespondingSourceObject: {fileID: 3844737018674783255, guid: a274f0401c998f044950f6e58c63fcec, type: 3}
--- a/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
+++ b/SXElectricityInformationAcquisition/Assets/Scenes/工具间Scenes/工具间.unity
@ -1951,49 +1951,14 @@ PrefabInstance:
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 1925723017623505205, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_SortingOrder
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1925723017623505205, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_AdditionalShaderChannelsFlag
-      value: 25
-      objectReference: {fileID: 0}
-    - target: {fileID: 2758999772048604327, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_Sprite
-      value: 
-      objectReference: {fileID: 21300000, guid: 072d5fe14b735484dbf6d54b33d9f594, type: 3}
    - target: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
      propertyPath: m_Name
      value: APP (1)
      objectReference: {fileID: 0}
-    - target: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 100
-      objectReference: {fileID: 0}
-    - target: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 105
-      objectReference: {fileID: 0}
-    - target: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 377
-      objectReference: {fileID: 0}
    m_RemovedComponents: []
-    m_RemovedGameObjects:
-    - {fileID: 8791730669612261151, guid: fa12b84946083d14cb4447029910be28, type: 3}
-    m_AddedGameObjects:
-    - targetCorrespondingSourceObject: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 661256883}
-    m_AddedComponents:
-    - targetCorrespondingSourceObject: {fileID: 2731501972977552647, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 1444351049}
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: fa12b84946083d14cb4447029910be28, type: 3}
 --- !u!1 &569542176
 GameObject:
@ -2189,81 +2154,6 @@ RectTransform:
  m_AnchoredPosition: {x: 0, y: 0}
  m_SizeDelta: {x: 0, y: 0}
  m_Pivot: {x: 0, y: 0}
--- !u!1 &661256882
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 661256883}
-  - component: {fileID: 661256885}
-  - component: {fileID: 661256884}
-  m_Layer: 5
-  m_Name: Image
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
--- !u!224 &661256883
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 661256882}
-  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: 1444351044}
-  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: 162.6, y: 2.7}
-  m_SizeDelta: {x: 232, y: 68}
-  m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &661256884
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 661256882}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 0
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: ca9aafed1e90c004d8db5d816e0a98c9, type: 3}
-  m_Type: 0
-  m_PreserveAspect: 0
-  m_FillCenter: 1
-  m_FillMethod: 4
-  m_FillAmount: 1
-  m_FillClockwise: 1
-  m_FillOrigin: 0
-  m_UseSpriteMesh: 0
-  m_PixelsPerUnitMultiplier: 1
--- !u!222 &661256885
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 661256882}
-  m_CullTransparentMesh: 1
 --- !u!1 &665983587
 GameObject:
  m_ObjectHideFlags: 0
@ -4979,31 +4869,6 @@ MeshCollider:
  m_Convex: 0
  m_CookingOptions: 30
  m_Mesh: {fileID: -4455670081757447873, guid: 156cca832bad49447b16a92685b1fa5b, type: 3}
--- !u!1 &1444351043 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 2731501972977552647, guid: fa12b84946083d14cb4447029910be28, type: 3}
-  m_PrefabInstance: {fileID: 520819557}
-  m_PrefabAsset: {fileID: 0}
--- !u!224 &1444351044 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-  m_PrefabInstance: {fileID: 520819557}
-  m_PrefabAsset: {fileID: 0}
--- !u!114 &1444351049
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1444351043}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: bafb9b27cc714c247934b57270a01a0b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  defaultSprite: {fileID: 21300000, guid: 072d5fe14b735484dbf6d54b33d9f594, type: 3}
-  clickSprite: {fileID: 21300000, guid: 57d1a67bc63627f49a9a0a3bc6623162, type: 3}
-  clickGameSprite: {fileID: 661256882}
 --- !u!1 &1445069121
 GameObject:
  m_ObjectHideFlags: 0
--- a/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs
+++ b/SXElectricityInformationAcquisition/Assets/Scripts/ProcessMode/AnimationProcessManager.cs
@ -17,6 +17,7 @@ namespace DefaultNamespace.ProcessMode
        private int currentActionIndex; // 当前动作索引，确保动作顺序
        private int currentActionGameIndex; // 当前动作索引，确保动作顺序
        private List<IncorrectClick> incorrectClicks; // 错误点击的记录列表
+        public AnimationProcess CurrentProcess => processes[currentMode.ToString()];


        public void AddProcess(string type)
@ -174,7 +175,7 @@ namespace DefaultNamespace.ProcessMode
        /// </summary>
        /// <param name="mode">当前的流程模式</param>
        /// <param name="nextStepOrAction">下一个步骤或动作</param>
-        private void PrepareNextStep(ProcessMode mode, object nextStepOrAction)
+        public void PrepareNextStep(ProcessMode mode, object nextStepOrAction)
        {
            switch (mode)
            {
@ -259,7 +260,16 @@ namespace DefaultNamespace.ProcessMode
                }
            }
        }
-
+        /// <summary>
+        /// 设置当前模式
+        /// </summary>
+        /// <param name="mode">模式</param>
+        public void SetCurrentMode(ProcessMode mode)
+        {
+            currentMode = mode;
+            currentStepIndex = 0;
+            currentActionIndex = 0;
+        }

        private void ShowTrainingStep(object nextStepOrAction)
        {