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

# Conflicts:
#	ChivaTechFramework/Assets/StreamingAssets/AssetBundles.meta

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

@@ -20231,12 +20231,12 @@ MonoBehaviour:
     SerializedFormat: 2
     SerializedBytes: 
     ReferencedUnityObjects:
-    - {fileID: 1233345943139593677}
     - {fileID: 7685693525508452220}
-    - {fileID: 2602033480859940694}
     - {fileID: 5515789258038939549}
     - {fileID: 1277856609}
     - {fileID: 7587296253661822984}
+    - {fileID: 1233345943139593677}
+    - {fileID: 2602033480859940694}
     - {fileID: 1364313743}
     - {fileID: 7207507423063151934}
     SerializedBytesString: 
@@ -20250,7 +20250,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 5
+      Data: 6
     - Name: 
       Entry: 7
       Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
@@ -20263,19 +20263,13 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 4
+      Data: 2
     - Name: 
       Entry: 10
       Data: 0
     - Name: 
       Entry: 10
       Data: 1
-    - Name: 
-      Entry: 10
-      Data: 2
-    - Name: 
-      Entry: 10
-      Data: 3
     - Name: 
       Entry: 13
       Data: 
@@ -20296,7 +20290,7 @@ MonoBehaviour:
       Data: 1
     - Name: mSimpleMoveItem
       Entry: 10
-      Data: 4
+      Data: 2
     - Name: reverse
       Entry: 5
       Data: false
@@ -20316,6 +20310,37 @@ MonoBehaviour:
     - Name: 
       Entry: 12
       Data: 1
+    - Name: 
+      Entry: 10
+      Data: 3
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: activeObjs
+      Entry: 5
+      Data: false
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 6|AniDriver_ActiveObjs, Assembly-CSharp
+    - Name: animationSequence
+      Entry: 3
+      Data: 0
+    - Name: objs
+      Entry: 7
+      Data: 7|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+        mscorlib
+    - Name: 
+      Entry: 12
+      Data: 2
+    - Name: 
+      Entry: 10
+      Data: 4
     - Name: 
       Entry: 10
       Data: 5
@@ -20333,7 +20358,7 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 6|AniDriver_SimpleMoveRot, Assembly-CSharp
+      Data: 8|AniDriver_SimpleMoveRot, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 1
@@ -20348,13 +20373,13 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 7|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 9|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 8|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 10|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
@@ -33273,8 +33298,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 793900516}
-  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.53010315, y: 3.3412428, z: -12.400152}
+  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: 1876573649}
@@ -44299,7 +44324,8 @@ MonoBehaviour:
   m_CurrentAniData: {fileID: 259342772}
   aniName: "01\u73B0\u573A\u52D8\u5BDF\r"
   currentStepID: 1
-  selection: []
+  selection:
+  - {fileID: 793900516}
 --- !u!1 &1054472723
 GameObject:
   m_ObjectHideFlags: 0
@@ -46359,11 +46385,11 @@ MonoBehaviour:
     SerializedBytes: 
     ReferencedUnityObjects:
     - {fileID: 2359187157819248424}
-    - {fileID: 2999566475504178374}
-    - {fileID: 938508353804989265}
     - {fileID: 873476100318726140}
     - {fileID: 871622494}
     - {fileID: 2044556959260572218}
+    - {fileID: 2999566475504178374}
+    - {fileID: 938508353804989265}
     - {fileID: 1377925682}
     - {fileID: 6741399994519334343}
     SerializedBytesString: 
@@ -46377,7 +46403,7 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 5
+      Data: 6
     - Name: 
       Entry: 7
       Data: 1|AniDriver_ActiveObjs, Assembly-CSharp
@@ -46390,19 +46416,13 @@ MonoBehaviour:
         mscorlib
     - Name: 
       Entry: 12
-      Data: 4
+      Data: 2
     - Name: 
       Entry: 10
       Data: 0
     - Name: 
       Entry: 10
       Data: 1
-    - Name: 
-      Entry: 10
-      Data: 2
-    - Name: 
-      Entry: 10
-      Data: 3
     - Name: 
       Entry: 13
       Data: 
@@ -46423,7 +46443,7 @@ MonoBehaviour:
       Data: 1
     - Name: mSimpleMoveItem
       Entry: 10
-      Data: 4
+      Data: 2
     - Name: reverse
       Entry: 5
       Data: false
@@ -46443,6 +46463,37 @@ MonoBehaviour:
     - Name: 
       Entry: 12
       Data: 1
+    - Name: 
+      Entry: 10
+      Data: 3
+    - Name: 
+      Entry: 13
+      Data: 
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: activeObjs
+      Entry: 5
+      Data: false
+    - Name: 
+      Entry: 8
+      Data: 
+    - Name: 
+      Entry: 7
+      Data: 6|AniDriver_ActiveObjs, Assembly-CSharp
+    - Name: animationSequence
+      Entry: 3
+      Data: 0
+    - Name: objs
+      Entry: 7
+      Data: 7|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+        mscorlib
+    - Name: 
+      Entry: 12
+      Data: 2
+    - Name: 
+      Entry: 10
+      Data: 4
     - Name: 
       Entry: 10
       Data: 5
@@ -46460,7 +46511,7 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 6|AniDriver_SimpleMoveRot, Assembly-CSharp
+      Data: 8|AniDriver_SimpleMoveRot, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 1
@@ -46475,13 +46526,13 @@ MonoBehaviour:
       Data: 
     - Name: 
       Entry: 7
-      Data: 7|AniDriver_ActiveObjs, Assembly-CSharp
+      Data: 9|AniDriver_ActiveObjs, Assembly-CSharp
     - Name: animationSequence
       Entry: 3
       Data: 0
     - Name: objs
       Entry: 7
-      Data: 8|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
+      Data: 10|System.Collections.Generic.List`1[[UnityEngine.GameObject, UnityEngine.CoreModule]],
         mscorlib
     - Name: 
       Entry: 12
@@ -48616,8 +48667,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1180459709}
-  m_LocalRotation: {x: -0.0011059176, y: 0.9914098, z: -0.13045388, w: 0.009345025}
-  m_LocalPosition: {x: 0.1817322, y: 2.5086818, z: 7.1058097}
+  m_LocalRotation: {x: 0.0017149672, y: -0.9991754, z: -0.040473104, w: -0.0027412076}
+  m_LocalPosition: {x: 0.39175078, y: 2.8050203, z: 8.010706}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
@@ -77189,8 +77240,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1894765633}
-  m_LocalRotation: {x: 1.1641531e-10, y: -0, z: 0.0000000037252899, w: 1}
-  m_LocalPosition: {x: 0.0000000030267984, y: 0.000000011175871, z: -0.050000075}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -0.1}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1421786357}

ChivaTechFramework/Assets/StreamingAssets/AssetBundles.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: f5bff2dffb2f741409030f00fa36ba89
+guid: e30d14f111cbd1b48802fe8c4654bf73
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}