Merge branch 'feature/JNHJ' into develop_合作分支

ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型操动机构解体检修.unity

@@ -146575,7 +146575,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 663598648}
-  m_LocalRotation: {x: 0.2419219, y: -0, z: -0, w: 0.9702958}
+  m_LocalRotation: {x: 0.2419219, y: 0, z: 0, w: 0.9702957}
   m_LocalPosition: {x: 1.4908051, y: -1.6438493, z: -0.027914047}
   m_LocalScale: {x: 0.69, y: 0.68999994, z: 0.68999994}
   m_Children:
@@ -247872,7 +247872,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1128818594}
-  m_LocalRotation: {x: 0.38268346, y: 0, z: 0, w: 0.9238795}
+  m_LocalRotation: {x: 0.7933533, y: 0, z: 0, w: 0.6087614}
   m_LocalPosition: {x: -0.004177162, y: -0.00673, z: 0.00183}
   m_LocalScale: {x: 1.3483, y: 1.3483, z: 1.3483}
   m_Children:
@@ -325722,11 +325722,9 @@ MonoBehaviour:
   - "\u65AD\u8DEF\u5668\u7279\u6027\u6D4B\u8BD5\u4EEA"
   - "\u5FAE\u6C34\u6D4B\u91CF\u4EEA"
   - "\u56DE\u8DEF\u7535\u963B\u6D4B\u8BD5\u4EEA"
-  - "\u540A\u8F66"
   - "\u7EA2\u5916\u68C0\u6F0F\u4EEA"
   - "\u6C14\u4F53\u6D4B\u8BD5\u4EEA"
   - "\u901F\u5EA6\u4F20\u611F\u5668"
-  - "\u7EDD\u7F18\u6597\u81C2\u8F66"
   - "\u94A2\u5C3A"
   - "\u7EDD\u7F18\u6447\u8868"
 --- !u!1 &1473997748
@@ -341510,10 +341508,10 @@ MonoBehaviour:
     - Name: processFinishEvent
       Entry: 6
       Data: 
-  awakeStepID: 95
+  awakeStepID: 1
   awakePlay: 0
   autoEnterNextProcess: 1
-  currentStepID: 95
+  currentStepID: 1
   processes:
   - {fileID: 1010803243}
   - {fileID: 1146584211}
@@ -464743,49 +464741,6 @@ SkinnedMeshRenderer:
     m_Center: {x: -0.34753507, y: 0.016992733, z: 0.0055313557}
     m_Extent: {x: 0.22849149, y: 0.199232, z: 0.20904325}
   m_DirtyAABB: 0
---- !u!1 &2104920649
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2104920651}
-  - component: {fileID: 2104920650}
-  m_Layer: 0
-  m_Name: AnimationCoroutine(MonoSingleton)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!114 &2104920650
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2104920649}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 70637d401c1414e4f88ee56e881ffe21, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
---- !u!4 &2104920651
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2104920649}
-  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_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 12
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2105042240
 GameObject:
   m_ObjectHideFlags: 0

ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型液压油更换.unity

@@ -42240,24 +42240,15 @@ MonoBehaviour:
   m_GameObject: {fileID: 184026759}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 9c2355a4fc1fe2a44b6cdd09669b8c32, type: 3}
+  m_Script: {fileID: 11500000, guid: ecbdb8a1f82ec4e4daa1155c9c04b0fe, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  guid: e48ff152-fb10-4993-9113-aae11f99ce89
+  guid: d2e58c78-4a3b-43f2-8f14-1366bfd984e8
   operationName: "220\u5DE5\u4F5C\u7EC8\u7ED3"
   operationDescription: "220\u5DE5\u4F5C\u7EC8\u7ED3"
   operationDisActioveMode: 0
   operationDataStatus: 0
   isRegister: 1
-  targetObjs:
-  - {fileID: 1746195901}
-  - {fileID: 812198442}
-  - {fileID: 247905373}
-  - {fileID: 433711081}
-  isContronlCollider: 1
-  useTool: 0
-  choseToolNames: []
-  useToolIndependentAni: 0
 --- !u!1 &184930791
 GameObject:
   m_ObjectHideFlags: 0
@@ -104516,10 +104507,7 @@ MonoBehaviour:
   aniName: "1\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
   selection:
-  - {fileID: 247905372}
-  - {fileID: 1459057078}
-  - {fileID: 433711073}
-  - {fileID: 812198441}
+  - {fileID: 184026759}
 --- !u!1 &470866599
 GameObject:
   m_ObjectHideFlags: 0
@@ -244752,7 +244740,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1128818594}
-  m_LocalRotation: {x: 0.38268346, y: 0, z: 0, w: 0.9238795}
+  m_LocalRotation: {x: 0.7933533, y: 0, z: 0, w: 0.6087614}
   m_LocalPosition: {x: -0.004177162, y: -0.00673, z: 0.00183}
   m_LocalScale: {x: 1.3483, y: 1.3483, z: 1.3483}
   m_Children:
@@ -316779,7 +316767,7 @@ MonoBehaviour:
     - {fileID: 812556129}
     - {fileID: 879798477}
     - {fileID: 1852659644}
-    - {fileID: 184026761}
+    - {fileID: 0}
     - {fileID: 327644485}
     - {fileID: 1598630826}
     - {fileID: 348828665}
@@ -320704,12 +320692,6 @@ MonoBehaviour:
     opData: {fileID: 1852659644}
     opValue: 0
     toggleType: 
-  - OpDataName: "220\u5DE5\u4F5C\u7EC8\u7ED3"
-    Description: "220\u5DE5\u4F5C\u7EC8\u7ED3"
-    guid: e48ff152-fb10-4993-9113-aae11f99ce89
-    opData: {fileID: 184026761}
-    opValue: 0
-    toggleType: 
   - OpDataName: "26+2\u62C6\u9664\u5BFC\u7535\u652F\u6491\u5EA7"
     Description: "26+2\u62C6\u9664\u5BFC\u7535\u652F\u6491\u5EA7"
     guid: 34fff264-d8ab-438d-839b-9a8e93f30dd0
@@ -320908,6 +320890,12 @@ MonoBehaviour:
     opData: {fileID: 741870121}
     opValue: 0
     toggleType: 
+  - OpDataName: "220\u5DE5\u4F5C\u7EC8\u7ED3"
+    Description: "220\u5DE5\u4F5C\u7EC8\u7ED3"
+    guid: d2e58c78-4a3b-43f2-8f14-1366bfd984e8
+    opData: {fileID: 184026761}
+    opValue: 0
+    toggleType: 
 --- !u!1 &1466627767
 GameObject:
   m_ObjectHideFlags: 0
@@ -321936,22 +321924,7 @@ MonoBehaviour:
   operationDataStatus: 0
   isRegister: 1
   choseToolNames:
-  - "\u5F00\u53E3\u6273\u624B"
-  - "\u540A\u5E26"
   - "\u516D\u89D2\u6273\u624B"
-  - "\u4E07\u7528\u8868"
-  - "\u6C14\u4F53\u56DE\u6536\u88C5\u7F6E"
-  - "\u5DE5\u9891\u8010\u538B\u88C5\u7F6E"
-  - "\u65AD\u8DEF\u5668\u7279\u6027\u6D4B\u8BD5\u4EEA"
-  - "\u5FAE\u6C34\u6D4B\u91CF\u4EEA"
-  - "\u56DE\u8DEF\u7535\u963B\u6D4B\u8BD5\u4EEA"
-  - "\u540A\u8F66"
-  - "\u7EA2\u5916\u68C0\u6F0F\u4EEA"
-  - "\u6C14\u4F53\u6D4B\u8BD5\u4EEA"
-  - "\u901F\u5EA6\u4F20\u611F\u5668"
-  - "\u7EDD\u7F18\u6597\u81C2\u8F66"
-  - "\u94A2\u5C3A"
-  - "\u7EDD\u7F18\u6447\u8868"
 --- !u!1 &1473997748
 GameObject:
   m_ObjectHideFlags: 0
@@ -365252,7 +365225,7 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1669969931}
-  m_LocalRotation: {x: 0.2419219, y: -0, z: -0, w: 0.9702958}
+  m_LocalRotation: {x: 0.2419219, y: 0, z: 0, w: 0.9702957}
   m_LocalPosition: {x: 1.4908051, y: -1.6438493, z: -0.027914047}
   m_LocalScale: {x: 0.69, y: 0.68999994, z: 0.68999994}
   m_Children:
@@ -428121,12 +428094,7 @@ MonoBehaviour:
   serializationData:
     SerializedFormat: 2
     SerializedBytes: 
-    ReferencedUnityObjects:
-    - {fileID: 420994230}
-    - {fileID: 813746567}
-    - {fileID: 919132148455779431}
-    - {fileID: 750316766}
-    - {fileID: 1642319631}
+    ReferencedUnityObjects: []
     SerializedBytesString: 
     Prefab: {fileID: 0}
     PrefabModificationsReferencedUnityObjects: []
@@ -428151,22 +428119,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 5
-    - Name: 
-      Entry: 10
       Data: 0
-    - Name: 
-      Entry: 10
-      Data: 1
-    - Name: 
-      Entry: 10
-      Data: 2
-    - Name: 
-      Entry: 10
-      Data: 3
-    - Name: 
-      Entry: 10
-      Data: 4
     - Name: 
       Entry: 13
       Data: 

ChivaTechFramework/Assets/Scenes/云南电网-变电检修仿真培训/500kV断路器-LW13型解体大修.unity

@@ -67987,7 +67987,7 @@ PrefabInstance:
     - target: {fileID: 919132149155446097, guid: 09b7988ce0ae7fd44ba3a1b4f39e699d,
         type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 09b7988ce0ae7fd44ba3a1b4f39e699d, type: 3}
@@ -106667,7 +106667,8 @@ MonoBehaviour:
   m_CurrentAniData: {fileID: 663551917}
   aniName: "1\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
-  selection: []
+  selection:
+  - {fileID: 1317357275}
 --- !u!1 &470866599
 GameObject:
   m_ObjectHideFlags: 0
@@ -109171,7 +109172,7 @@ PrefabInstance:
     - target: {fileID: 919132149155446097, guid: 09b7988ce0ae7fd44ba3a1b4f39e699d,
         type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 09b7988ce0ae7fd44ba3a1b4f39e699d, type: 3}
@@ -242761,7 +242762,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1085988662
 Transform:
   m_ObjectHideFlags: 0
@@ -253712,7 +253713,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1136108130
 Transform:
   m_ObjectHideFlags: 0
@@ -325460,7 +325461,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1459057079
 Transform:
   m_ObjectHideFlags: 0