提交6.17

SXElectricityInformationAcquisition/Assets/Framework/GameLauncher.cs

@@ -25,8 +25,8 @@ public class GameLauncher : MonoBehaviour
             SimulationOnEditor = false;
 #endif
         // ³õʼ»¯¿ØÖÆ̨
-        if (Application.isEditor || Debug.isDebugBuild)
+        //if (Application.isEditor || Debug.isDebugBuild)
-            DeveloperConsole.Initialize();
+        //    DeveloperConsole.Initialize();
         
         // ³õʼ»¯¿ò¼Ü
         MotionEngine.Initialize(this, HandleMotionFrameworkLog);
@@ -46,8 +46,8 @@ public class GameLauncher : MonoBehaviour
     void OnGUI()
     {
         // »æÖÆ¿ØÖÆ̨
-        if (Application.isEditor || Debug.isDebugBuild)
+        //if (Application.isEditor || Debug.isDebugBuild)
-            DeveloperConsole.Draw();
+        //    DeveloperConsole.Draw();
     }
 
     private  void CreateGameModules()

SXElectricityInformationAcquisition/Assets/JunctionBox.cs

@@ -1,4 +1,6 @@
+using DefaultNamespace.ProcessMode;
 using DG.Tweening;
+using MotionFramework;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -46,19 +48,19 @@ public class JunctionBox : MonoBehaviour
                     {
                         case "쌈窟분李蕨뺄욥001":
                             hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.06131744f, -0.0075f, 0.0089f), 1f);
-                            Debug.Log(hit.collider.gameObject.name);
+                            Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                             break;
                         case "쌈窟분李蕨뺄욥002":
                             hit.collider.gameObject.transform.DOLocalMove(new Vector3(0.02013969f, -0.0075f, 0.0089f), 1f);
-                            Debug.Log(hit.collider.gameObject.name);
+                            Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                             break;
                         case "쌈窟분李蕨뺄욥003":
                             hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.02001452f, -0.0075f, 0.0089f), 1f);
-                            Debug.Log(hit.collider.gameObject.name);
+                            Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                             break;
                         case "쌈窟분李蕨뺄욥004":
                             hit.collider.gameObject.transform.DOLocalMove(new Vector3(-0.06075525f, -0.0075f, 0.0089f), 1f);
-                            Debug.Log(hit.collider.gameObject.name);
+                            Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                             break;
                     }
                 }

SXElectricityInformationAcquisition/Assets/Scenes/现场 _Test.unity

@@ -1690,13 +1690,18 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 362740763354511596, guid: a6c750f9e3102bc499c6f13f30606383, type: 3}
+    - {fileID: 3375279720214638783, guid: a6c750f9e3102bc499c6f13f30606383, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents:
     - targetCorrespondingSourceObject: {fileID: 7324125482692298847, guid: a6c750f9e3102bc499c6f13f30606383, type: 3}
       insertIndex: -1
       addedObject: {fileID: 588400116}
+    - targetCorrespondingSourceObject: {fileID: 7324125482692298847, guid: a6c750f9e3102bc499c6f13f30606383, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 588400117}
   m_SourcePrefab: {fileID: 100100000, guid: a6c750f9e3102bc499c6f13f30606383, type: 3}
 --- !u!1 &75778635
 GameObject:
@@ -11727,6 +11732,18 @@ MonoBehaviour:
   TapeOBJ: {fileID: 588400109}
   TapeMar: {fileID: 2100000, guid: ddf175dcba94e8d46bc6b6d68d61c395, type: 2}
   TapeMarCol: {fileID: 1061297897}
+--- !u!114 &588400117
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 588400109}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a2ec57d86080374dbadae4c9f35d207, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &591808734
 GameObject:
   m_ObjectHideFlags: 0
@@ -16713,6 +16730,74 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 743497538}
   m_CullTransparentMesh: 1
+--- !u!1 &743853154
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 743853157}
+  - component: {fileID: 743853156}
+  - component: {fileID: 743853155}
+  m_Layer: 0
+  m_Name: EventSystem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &743853155
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 743853154}
+  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 &743853156
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 743853154}
+  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 &743853157
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 743853154}
+  serializedVersion: 2
+  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_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &745633548
 GameObject:
   m_ObjectHideFlags: 0
@@ -20455,6 +20540,18 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ElectricCheckPenOBJ: {fileID: 926201691}
   ElectricCheckPenSpr: {fileID: 1311284676}
+--- !u!114 &926201699
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 926201691}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a2ec57d86080374dbadae4c9f35d207, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &935258159
 GameObject:
   m_ObjectHideFlags: 0
@@ -23183,6 +23280,18 @@ MonoBehaviour:
   interactiveObjects:
   - {fileID: 1799387243}
   - {fileID: 274585741}
+--- !u!114 &1112936946
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1112936940}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a2ec57d86080374dbadae4c9f35d207, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1126864704
 GameObject:
   m_ObjectHideFlags: 0
@@ -24753,83 +24862,6 @@ Transform:
   m_Children: []
   m_Father: {fileID: 1886732940}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1199227227
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1091812145067508994, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_Name
-      value: APP
-      objectReference: {fileID: 0}
-    - target: {fileID: 6026879024415736155, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 54
-      objectReference: {fileID: 0}
-    - target: {fileID: 6780964861112113625, guid: fa12b84946083d14cb4447029910be28, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 389
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: fa12b84946083d14cb4447029910be28, type: 3}
 --- !u!1 &1203342266
 GameObject:
   m_ObjectHideFlags: 0
@@ -31130,7 +31162,9 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 6106586016319151649, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3}
+    - {fileID: 1570257037484163098, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects:
     - targetCorrespondingSourceObject: {fileID: 7063737413586441568, guid: 87ec8db29445cbe4b81cdbb1df57859f, type: 3}
@@ -34721,6 +34755,18 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4743931306071556718, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
   m_PrefabInstance: {fileID: 4441233656616589334}
   m_PrefabAsset: {fileID: 0}
+--- !u!114 &1624776713
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1624776703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a2ec57d86080374dbadae4c9f35d207, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1625037053
 GameObject:
   m_ObjectHideFlags: 0
@@ -35234,13 +35280,18 @@ PrefabInstance:
       propertyPath: m_Enabled
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 9162861833251026421, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
+    - {fileID: 4099257815890991978, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents:
     - targetCorrespondingSourceObject: {fileID: 7845117050773395189, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1112936945}
+    - targetCorrespondingSourceObject: {fileID: 7845117050773395189, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1112936946}
   m_SourcePrefab: {fileID: 100100000, guid: 58e406f71b32d884392695381bfd0ac5, type: 3}
 --- !u!1 &1663724730
 GameObject:
@@ -37655,13 +37706,18 @@ PrefabInstance:
       propertyPath: m_Color.r
       value: 166
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 6531800841171930545, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
+    - {fileID: 7308894285963904777, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents:
     - targetCorrespondingSourceObject: {fileID: 1874366132397452923, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
       insertIndex: -1
       addedObject: {fileID: 926201698}
+    - targetCorrespondingSourceObject: {fileID: 1874366132397452923, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 926201699}
   m_SourcePrefab: {fileID: 100100000, guid: 0c77eb1a5e567f3428d41ab7cc3c3cda, type: 3}
 --- !u!1 &1781163734
 GameObject:
@@ -42739,6 +42795,9 @@ PrefabInstance:
     - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 400cb0c2fa9055941bbe043d16a34353, type: 3}
       insertIndex: -1
       addedObject: {fileID: 2018635917}
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 400cb0c2fa9055941bbe043d16a34353, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 2018635918}
   m_SourcePrefab: {fileID: 100100000, guid: 400cb0c2fa9055941bbe043d16a34353, type: 3}
 --- !u!4 &2018635914 stripped
 Transform:
@@ -42793,6 +42852,18 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.10971069, y: 0.10256955, z: 0.09324905}
   m_Center: {x: -0.003829956, y: 0.0022774898, z: 0.044976857}
+--- !u!114 &2018635918
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2018635915}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a2ec57d86080374dbadae4c9f35d207, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &2024319182
 GameObject:
   m_ObjectHideFlags: 0
@@ -236767,13 +236838,18 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 0
       objectReference: {fileID: 0}
-    m_RemovedComponents: []
+    m_RemovedComponents:
+    - {fileID: 2686997889178815087, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+    - {fileID: 5512499863435223851, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
     m_AddedComponents:
     - targetCorrespondingSourceObject: {fileID: 5376740296190089428, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
       insertIndex: -1
       addedObject: {fileID: 1624776704}
+    - targetCorrespondingSourceObject: {fileID: 5376740296190089428, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 1624776713}
   m_SourcePrefab: {fileID: 100100000, guid: 244b99f7130c1e04bb9ca35f14861f25, type: 3}
 --- !u!64 &4459080182946570877
 MeshCollider:
@@ -237293,6 +237369,7 @@ MonoBehaviour:
   guimen: {fileID: 708227703}
   mensuo01: {fileID: 601364445}
   guimenbox: {fileID: 522830941}
+  fengy: {fileID: 1143738318}
 --- !u!114 &6121626523908351181
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -237815,6 +237892,6 @@ SceneRoots:
   - {fileID: 1505150131}
   - {fileID: 1986025700}
   - {fileID: 1516723168}
-  - {fileID: 1199227227}
   - {fileID: 912118588}
   - {fileID: 654503842}
+  - {fileID: 743853157}

SXElectricityInformationAcquisition/Assets/Screwdriver.cs

@@ -1,4 +1,6 @@
+using DefaultNamespace.ProcessMode;
 using DG.Tweening;
+using MotionFramework;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -120,22 +122,22 @@ public class Screwdriver : MonoBehaviour
                 if (hit.collider.gameObject.name == "맨_미땍쭁介_Rup")
                 {
                     StartCoroutine(Rscrew());
-                    Debug.Log(hit.collider.gameObject.name);
+                    Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
                 if (hit.collider.gameObject.name == "미땍쭁介_Ldown")
                 {
                     StartCoroutine(Lscrew());
-                    Debug.Log(hit.collider.gameObject.name);
+                    Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
                 if (hit.collider.gameObject.name == "옳미땍쭁介_R")
                 {
                     Debug.Log(hit.collider.gameObject.name);
-                    StartCoroutine(IERconcentratorScrew());
+                    StartCoroutine(IERconcentratorScrew()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
                 if (hit.collider.gameObject.name == "옳미땍쭁介_L")
                 {
                     Debug.Log(hit.collider.gameObject.name);
-                    StartCoroutine(IELconcentratorScrew());
+                    StartCoroutine(IELconcentratorScrew()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
                 for (int i = 0; i < ScrewObj.Length; i++)
                 {
@@ -143,19 +145,19 @@ public class Screwdriver : MonoBehaviour
                     {
                         Debug.Log(hit.collider.gameObject.name);
                         ScrewObj[i].gameObject.SetActive(false);
-                        StartCoroutine(IEHubSegmentRowScrews());
+                        ScrewdriverTrans.gameObject.transform.localPosition = new Vector3(3.1215f, 2.1383f, -1.3484f);
                     }
                 }
                 if (hit.collider.gameObject.name == "미땍쭁介_Rdown")
                 {
                     Debug.Log(hit.collider.gameObject.name);
-                    StartCoroutine(right());
+                    StartCoroutine(right()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
                 if (hit.collider.gameObject.name == "섞든포미땍쭁介_Ldown")
                 {
                     Debug.Log(hit.collider.gameObject.name);
-                    StartCoroutine(left());
+                    StartCoroutine(left()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
-                   
+
                 }
             }
         }
@@ -361,26 +363,16 @@ public class Screwdriver : MonoBehaviour
         yield return new WaitForSeconds(1);
         ConcentratorObj.gameObject.SetActive(false);
     }
-
-    /// <summary>
-    /// 螺丝刀移动到集中器旁动画
-    /// </summary>
-    /// <returns></returns>
-    IEnumerator IEHubSegmentRowScrews()
-    {
-        ScrewdriverTrans.gameObject.transform.position = new Vector3(3.1215f, 2.1383f, -1.3484f);
-        yield return new WaitForSeconds(1);
-    }
     IEnumerator right()
     {
-        StartCoroutine(IEHubSegmentRowScrews());
+        ScrewdriverTrans.gameObject.transform.localPosition = new Vector3(3.1215f, 2.1383f, -1.3484f);
         yield return new WaitForSeconds(0.5f);
         ConcentratorScrewObj[0].SetActive(false);
         ConcentratorScrewObj[1].SetActive(false);
     }
     IEnumerator left()
     {
-        StartCoroutine(IEHubSegmentRowScrews());
+        ScrewdriverTrans.gameObject.transform.localPosition = new Vector3(3.1215f, 2.1383f, -1.3484f);
         yield return new WaitForSeconds(0.5f);
         ConcentratorScrewObj[2].SetActive(false);
         ConcentratorScrewObj[3].SetActive(false);

SXElectricityInformationAcquisition/Assets/Scripts/SceneGameClickComponent.cs

@@ -0,0 +1,11 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SceneGameClickComponent : MonoBehaviour
+{
+    private void OnMouseDown()
+    {
+        this.gameObject.SetActive(false);   
+    }
+}

SXElectricityInformationAcquisition/Assets/Scripts/SceneGameClickComponent.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 8a2ec57d86080374dbadae4c9f35d207
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

SXElectricityInformationAcquisition/Assets/Seal.cs

@@ -58,14 +58,14 @@ public class Seal : MonoBehaviour
                 if (hit.collider.gameObject.name == "集中器_封印_L碰撞")
                 {
                     Sealcol[0].gameObject.SetActive(true);
-                    Debug.Log(hit.collider.gameObject.name);
+                    Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
                 if (hit.collider.gameObject.name == "集中器_封印R碰撞 ")
                 {
                     Sealcol[1].gameObject.SetActive(true);
                     CabinetDoorLatch.GetComponent<BoxCollider>().enabled = true;
                     SparentoverCol.GetComponent<BoxCollider>().enabled = true;
-                    Debug.Log(hit.collider.gameObject.name);
+                    Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
             }
         }

SXElectricityInformationAcquisition/Assets/StreamingAssets/DataConfig/SceneStepData.json

@@ -49,7 +49,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "用钳刀打开接线盒封印",
+          "description": "更换集中器",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -64,7 +64,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "用螺丝刀打开接线盒",
+          "description": "更换集中器",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -79,7 +79,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "，将拨片调整至断电状态（带电作业调整横向滑块，断电作业调整竖向滑块，系统默认断电作业），开始作业；",
+          "description": "，更换集中器",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -96,7 +96,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "打开集中器封印，去除螺丝;",
+          "description": "更换集中器",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -113,7 +113,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "将集中器连接线的螺丝全部拧开，拧开两个固定该线的螺丝后，线消失。重复操作，直至全部线拆除;",
+          "description": "更换集中器",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -138,7 +138,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "线失去固定后，向前弯曲;",
+          "description": "更换集中器",
           "score": 0,
           "isSequential": true,
           "targetObjects": [
@@ -152,7 +152,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "取出胶带将头部缠绕;",
+          "description": "更换集中器",
           "score": 0,
           "isSequential": true,
           "targetObjects": [
@@ -166,7 +166,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "拆除固定集中器的螺丝,取下集中器;",
+          "description": "更换集中器",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -181,7 +181,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "取出新的集中器，移动至原先集中器位置;",
+          "description": "更换集中器",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -195,7 +195,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "通过鼠标点击取下需要连接上去的线头胶带，再点击集中器需要连接的端点，进行连线，练好一根线，上一个螺丝，直至全部螺丝上完。",
+          "description": "更换集中器",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -220,7 +220,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "安装完成后，UI出现申请测试，点击临时用电测试申请，确认后进行通电调试。",
+          "description": "现场调试",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -234,7 +234,7 @@
       "score": 0,
       "actions": [
         {
-          "description": "安装完成后，如果运行灯闪烁亮，则安装成功，反之失败。",
+          "description": "现场调试",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -244,11 +244,11 @@
       ]
     },
     {
-      "stepDescription": "盖_透明外壳还原",
+      "stepDescription": "加装封印",
       "score": 0,
       "actions": [
         {
-          "description": "点击盖_透明外壳还原操作",
+          "description": "加装封印",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -257,16 +257,16 @@
           ]
         },
         {
-          "description": "点击盖_透明外壳还原操作",
+          "description": "加装封印",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
             "盖_透明外壳"
           ]
         },
-        
+
         {
-          "description": "点击柜门卡栓还原关门",
+          "description": "加装封印",
           "score": 0,
           "isSequential": false,
           "targetObjects": [
@@ -274,7 +274,7 @@
           ]
         },
         {
-          "description": "柜门加装封印。",
+          "description": "加装封印",
           "score": 0,
           "isSequential": false,
           "targetObjects": [

SXElectricityInformationAcquisition/Assets/concentrator.cs

@@ -1,4 +1,6 @@
+using DefaultNamespace.ProcessMode;
 using DG.Tweening;
+using MotionFramework;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -67,7 +69,7 @@ public class concentrator : MonoBehaviour
                 if (hit.collider.gameObject.name == "新的集中器碰撞")
                 {
                     StartCoroutine(Newconcentrator());
-                    Debug.Log(hit.collider.gameObject.name);
+                    Debug.Log(hit.collider.gameObject.name); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
                 for (int i = 0; i < ScrewObj.Length; i++)
                 {
@@ -82,7 +84,7 @@ public class concentrator : MonoBehaviour
                 {
                     if (isplaying)
                     {
-                        StartCoroutine(IEElectricWire());
+                        StartCoroutine(IEElectricWire()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                         isplaying = false;
                     }
                 }

SXElectricityInformationAcquisition/Assets/taoruiqi/AdhesiveTape.cs

@@ -1,4 +1,6 @@
+using DefaultNamespace.ProcessMode;
 using DG.Tweening;
+using MotionFramework;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -52,7 +54,7 @@ using UnityEngine;
             {
                 if (hit.collider.gameObject.name == "pCylinder170")
                 {
-                    StartCoroutine(Tape());
+                    StartCoroutine(Tape()); MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
             }
         }
@@ -80,6 +82,8 @@ using UnityEngine;
         yield return new WaitForSeconds(1f);
 
         StartCoroutine(TapeBack());
+        yield return new WaitForSeconds(1.5f);
+        TapeOBJ.gameObject.SetActive(false);
     }
 
     /// <summary>

SXElectricityInformationAcquisition/Assets/taoruiqi/Pliers.cs

@@ -1,4 +1,6 @@
+using DefaultNamespace.ProcessMode;
 using DG.Tweening;
+using MotionFramework;
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
@@ -84,26 +86,31 @@ public class Pliers : MonoBehaviour
                     {
                         StartCoroutine(PliersIE());
                         Debug.Log(hit.collider.gameObject.name);
+                        MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                     }
                     if (hit.collider.gameObject.name == "接线盒_封印R")
                     {
                         StartCoroutine(JunctionBoxRight());
                         Debug.Log(hit.collider.gameObject.name);
+                        MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                     }
                     if (hit.collider.gameObject.name == "接线盒_封印L")
                     {
                         StartCoroutine(JunctionBoxLeft());
                         Debug.Log(hit.collider.gameObject.name);
+                        MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                     }
                     if (hit.collider.gameObject.name == "集中器_封印R")
                     {
                         StartCoroutine(RightRconcentrator());
                         Debug.Log(hit.collider.gameObject.name);
+                        MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                     }
                     if (hit.collider.gameObject.name == "集中器_封印_L")
                     {
                         StartCoroutine(LeftRconcentrator());
                         Debug.Log(hit.collider.gameObject.name);
+                        MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                     }
                 }
             }

SXElectricityInformationAcquisition/Assets/taoruiqi/Script/ElectricCheckPen.cs

@@ -42,17 +42,19 @@ public class ElectricCheckPen : MonoBehaviour
             bool raycast = Physics.Raycast(ray, out hit);
             if (raycast)
             {
-                MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
+              
                 if (hit.collider.gameObject.name == "±äµçÏä_ÃÅ")
                 {
                     ElectricCheckPenOBJ.gameObject.transform.DOMove(new Vector3(303.038f, 2.655f, 163.822f), 2f);
                     Debug.Log(hit.collider.gameObject.name);
+                    MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
                 if (hit.collider.gameObject.name == "²å×ù")
                 {
                     StartCoroutine(socket());
                     //Warninglight();
                     Debug.Log(hit.collider.gameObject.name);
+                    MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
             }
         }

SXElectricityInformationAcquisition/Assets/taoruiqi/Script/Field observation.cs

@@ -76,11 +76,10 @@ public class Fieldobservation : MonoBehaviour
     /// </summary>
     public BoxCollider guimenbox;
 
-
+    public GameObject fengy;
     //public HighlightEffect _highlight;
     void Start()
     {
-       
     }
 
     void Update()
@@ -95,12 +94,10 @@ public class Fieldobservation : MonoBehaviour
                 if (hit.collider.gameObject.name == "¸Ç_͸Ã÷Íâ¿Ç")
                 {
                     StartCoroutine(IEparentoverSeal());
-                    if (isbox)
+                    
-                    {
                         BOXseal[0].enabled = true;
                         BOXseal[1].enabled = true;
-                        isbox = false;
+                        //isbox = false;
-                    }
 
                     MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
 
@@ -128,21 +125,17 @@ public class Fieldobservation : MonoBehaviour
                 if (hit.collider.gameObject.name == "¹ñÃÅ¿¨Ë¨")
                 {
                     StartCoroutine(IEguimenkashuan());
-                    if (isbox)
+                    //if (isbox)
-                    {
+                    //{
                         guimenbox.GetComponent<BoxCollider>().enabled = true;
                         isbox = false;
-                    }
+                   // }
                     MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
                 if (hit.collider.gameObject.name == "µç¹ñÃÅ·âÓ¡boxÅöײ")
                 {
-                    StartCoroutine(IEguimenkashuan());
+                    fengy.gameObject.SetActive(true);
-                    if (isbox)
+                    fengy.transform.localPosition = new Vector3(0.6371536f, 0.02661133f, -0.01525164f);
-                    {
-                        guimenbox.GetComponent<BoxCollider>().enabled = true;
-                        isbox = false;
-                    }
                     MotionEngine.GetModule<AnimationProcessManager>().HandleClick(hit.collider.gameObject);
                 }
             }
@@ -167,16 +160,15 @@ public class Fieldobservation : MonoBehaviour
     /// <returns></returns>
     IEnumerator IEparentoverSeal()
     {
-        Transparentover.transform.DOLocalRotate(new Vector3(0, 0, 0), 1f);
+        Transparentover.transform.localPosition=new Vector3(0, 0, 0);
-        yield return new WaitForSeconds(1);
+        yield return new WaitForSeconds(1f);
-        screw[0].gameObject.SetActive(true);
         screw[0].gameObject.SetActive(true);
         yield return new WaitForSeconds(0.5f);
-        screw[0].gameObject.transform.DOLocalMove(new Vector3(-0.07357633f, -0.01137948f, 0.003414989f), 1f);
+        screw[0].transform.localPosition = new Vector3(-0.07357633f, -0.01137948f, 0.003414989f);
         screw[1].gameObject.SetActive(true);
-        yield return new WaitForSeconds(0.5f);
+        yield return new WaitForSeconds(1.5f);
-        screw[1].gameObject.transform.DOLocalMove(new Vector3(-0.07394123f, 0.013731f, 0.003414989f), 1f);
+        screw[1].transform.localPosition = new Vector3(0.07394123f, 0.013731f, 0.003414989f); 
-       
+
     }
 
     /// <summary>