Merge branch 'feature/lxd' into develop

ModeDisplay/Assets/GameAssets/01.Animation.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cfbd5b91ae13fd2498bd192513957395
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ModeDisplay/Assets/GameAssets/02.Prefabs/内部结构拆解/500kV_变压器-ODFPS型.prefab

@@ -18344,7 +18344,7 @@ Transform:
   - {fileID: 7877086617946619584}
   - {fileID: 6776619143929915342}
   m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 10
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &498006563474713149
 GameObject:
@@ -47980,6 +47980,9 @@ Transform:
   - {fileID: 8689117512446802219}
   - {fileID: 6768287415700292519}
   - {fileID: 34968645366875073}
+  - {fileID: 8954736216610227968}
+  - {fileID: 927004038380871225}
+  - {fileID: 8137486563275146943}
   m_Father: {fileID: 7568276451473858708}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -48107,7 +48110,6 @@ Transform:
   - {fileID: 779307138759336434}
   - {fileID: 1587765261372513784}
   - {fileID: 6128974739135353716}
-  - {fileID: 8954736216610227968}
   - {fileID: 1475404057196375991}
   - {fileID: 5343129335660387895}
   - {fileID: 2351715014715822247}
@@ -48116,8 +48118,6 @@ Transform:
   - {fileID: 4503605834769981855}
   - {fileID: 5724114199563008316}
   - {fileID: 2773328754862445892}
-  - {fileID: 927004038380871225}
-  - {fileID: 8137486563275146943}
   m_Father: {fileID: 8092737674106781052}
   m_RootOrder: 40
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -70753,7 +70753,7 @@ Transform:
   - {fileID: 1680892149823683958}
   - {fileID: 961433536662275778}
   m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 12
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1677228851499092279
 GameObject:
@@ -130583,7 +130583,7 @@ Transform:
   - {fileID: 6569518773995033867}
   - {fileID: 2101905126093743579}
   m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3185547525467490893
 GameObject:
@@ -211065,8 +211065,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5183869630947010318}
-  m_LocalRotation: {x: 0.7071068, y: -0.0000002980232, z: 0.7071068, w: 0.0000002980232}
-  m_LocalPosition: {x: 0.0047450066, y: 2.1741412, z: -3.447154}
+  m_LocalRotation: {x: 0.7071068, y: -0.00000035762787, z: 0.7071068, w: 0.00000035762787}
+  m_LocalPosition: {x: 0.10544586, y: -0.041641206, z: 0.21393692}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 775838069085935928}
@@ -211075,8 +211075,8 @@ Transform:
   - {fileID: 63633705802731086}
   - {fileID: 5192149906855396955}
   - {fileID: 3995023877895906264}
-  m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 13
+  m_Father: {fileID: 1175781921438669816}
+  m_RootOrder: 99
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5184425603856527999
 GameObject:
@@ -238312,8 +238312,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5793776273046837164}
-  m_LocalRotation: {x: 0.7071068, y: -0.0000002980232, z: 0.7071068, w: 0.0000002980232}
-  m_LocalPosition: {x: 0.0047450066, y: 4.26773, z: -3.447154}
+  m_LocalRotation: {x: 0.7071068, y: -0.00000035762787, z: 0.7071068, w: 0.00000035762787}
+  m_LocalPosition: {x: 0.10544586, y: 2.051949, z: 0.21393692}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2005010616359799401}
@@ -238322,8 +238322,8 @@ Transform:
   - {fileID: 6040271599269035145}
   - {fileID: 5505657757090090159}
   - {fileID: 7478668491578900856}
-  m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 4
+  m_Father: {fileID: 1175781921438669816}
+  m_RootOrder: 98
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5795254003441529894
 GameObject:
@@ -268076,8 +268076,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6575202555099827219}
-  m_LocalRotation: {x: 0.7071068, y: -0.0000002980232, z: 0.7071068, w: 0.0000002980232}
-  m_LocalPosition: {x: 0.0047450066, y: 0.010817766, z: -3.447154}
+  m_LocalRotation: {x: 0.7071068, y: -0.00000035762787, z: 0.7071068, w: 0.00000035762787}
+  m_LocalPosition: {x: 0.10544586, y: -2.204965, z: 0.2139368}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 4245717356517711832}
@@ -268086,8 +268086,8 @@ Transform:
   - {fileID: 4171602527934688582}
   - {fileID: 5021086110944741049}
   - {fileID: 5836144699534105545}
-  m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 14
+  m_Father: {fileID: 1175781921438669816}
+  m_RootOrder: 100
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6577948285966081750
 GameObject:
@@ -274040,7 +274040,7 @@ Transform:
   - {fileID: 9034518025448319220}
   - {fileID: 6701629245194029229}
   m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6705911497617642538
 GameObject:
@@ -280589,7 +280589,7 @@ Transform:
   - {fileID: 1115387212296482417}
   - {fileID: 380901814905744758}
   m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 9
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6846261522326531383
 GameObject:
@@ -352210,7 +352210,7 @@ Transform:
   - {fileID: 4582860724142829181}
   - {fileID: 142879037404564306}
   m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8546226538883884878
 GameObject:
@@ -363069,7 +363069,7 @@ Transform:
   - {fileID: 3155679451083083952}
   - {fileID: 1870813912215404264}
   m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 11
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8839095572842382495
 GameObject:
@@ -377754,7 +377754,7 @@ Transform:
   - {fileID: 5783721780971832323}
   - {fileID: 5812310383610437689}
   m_Father: {fileID: 1175781921458925452}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &9204893205784343004
 GameObject:

ModeDisplay/Assets/Scripts/MoveItem/MoveItem.cs

@@ -64,6 +64,28 @@ public class MoveItem : MonoBehaviour
         }
     }
 
+    /// <summary>
+    /// 设置初始状态
+    /// </summary>
+    /// <param name="position"></param>
+    public void SetInitState(Vector3 position)
+    {
+        transform.position = position;
+    }
+
+    /// <summary>
+    /// 设置最终状态
+    /// </summary>
+    public void SetFianlState()
+    {
+        if (m_UserGlobalDirection)
+        {
+            transform.position = transform.position + m_Direction;
+        }else
+        {
+            transform.position = transform.position + transform.TransformDirection(m_Direction);
+        }
+    }
 
 #if UNITY_EDITOR
     private void OnDrawGizmos()

ModeDisplay/Assets/Scripts/MoveItem/MoveItemManager.cs

@@ -317,13 +317,13 @@ public class MoveItemManager : MonoBehaviour
 
     /// <summary>
     /// 设置初始状态
-    /// </summary>
+    /// </summary>`
     private void SetInitState()
     {
         foreach (var info in moveItemInfos)
         {
             MoveItem moveItem = info.moveItem;
-            moveItem.transform.position = info.initPosition;
+            moveItem.SetInitState(info.initPosition);
             moveItem.OpenHighter(false);
             moveItem.gameObject.SetActive(true);
         }
@@ -337,7 +337,7 @@ public class MoveItemManager : MonoBehaviour
         foreach (var info in moveItemInfos)
         {
             MoveItem moveItem = info.moveItem;
-            moveItem.transform.position = info.initPosition + moveItem.transform.TransformDirection(moveItem.m_Direction);
+            moveItem.SetFianlState();
             moveItem.OpenHighter(false);
             moveItem.gameObject.SetActive(false);
         }

ModeDisplay/Assets/StreamingAssets/Config/Audios/原理.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fbdbdcc1ed0433a45998830f11e641ff
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: