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/Scripts/CameraSurround.cs

@@ -37,9 +37,7 @@ public class CameraSurround : MonoBehaviour
             {
                 if (tmpBounds.size.x > tmpBounds.size.z)
                 {
-                    transform.position = tmpBounds.center +
-((tmpBounds.center + new Vector3(0.2f, 0, 1)) - tmpBounds.center).normalized
-* a / 2 * 1.9f;
+                    transform.position = tmpBounds.center +((tmpBounds.center + new Vector3(0.2f, 0, 1)) - tmpBounds.center).normalized * a / 2 * 1.9f;
                 }
                 else
                 {
@@ -50,9 +48,7 @@ public class CameraSurround : MonoBehaviour
             }
             else
             {
-                transform.position = tmpBounds.center +
-             (transform.position - tmpBounds.center).normalized
-             * a / 2 * 1.9f;
+                transform.position = tmpBounds.center + (transform.position - tmpBounds.center).normalized * a / 2 * 1.9f;
             }
         }
 

ModeDisplay/Assets/Scripts/DeviceController.cs

@@ -68,7 +68,7 @@ public class DeviceController : MonoBehaviour
                     tmpMark.SetState(false);
                     m_OperationPartMarkStruct.Push(tmpMark);
                     UIKit.GetPanel<PartListPanel>().SetPartItemState(tmpMark, false);
-                    CameraSurround.instance.SetCameraPosition(true);
+                    CameraSurround.instance.SetCameraPosition();
                 }
             }
         }
@@ -91,6 +91,11 @@ public class DeviceController : MonoBehaviour
         return tmpMark;
     }
 
+    public void OnDisable()
+    {
+        UIKit.ClosePanel<PartLabelPanel>();
+    }
+
     public PartInfo GetDevicePartInfos(PartMark partMark)
     {
         //最父级

ModeDisplay/Assets/Scripts/MoveItem/MoveItemManager.cs

@@ -19,6 +19,7 @@ public class MoveItemManager : MonoBehaviour
     {
         return !string.IsNullOrEmpty(value);
     }
+
     [TabGroup("配置相关")]
     [TableList]
     public List<MoveItemInfo> moveItemInfos;
@@ -26,7 +27,6 @@ public class MoveItemManager : MonoBehaviour
     [LabelText("播完反向播放")]
     public bool m_Reverse;
 
-    
     [TabGroup("UI相关")]
     [LabelText("播放按钮")]
     public Button m_PlayButton;

ModeDisplay/Assets/Scripts/UI/QFramework/PartListPanel.cs

@@ -129,7 +129,7 @@ namespace QFramework
                 }
             }
 
-            CameraSurround.instance.SetCameraPosition(true);
+            CameraSurround.instance.SetCameraPosition();
         }
 
         /// <summary>

ModeDisplay/Assets/Scripts/UI/QFramework/PartListPanel/PartItem.cs

@@ -72,13 +72,13 @@ namespace QFramework
             SelectBtn.onClick.AddListener(() => 
             {
                 OnSelectToggleChange(true, true);
-                CameraSurround.instance.SetCameraPosition(true);
+                CameraSurround.instance.SetCameraPosition();
             });
             //取消选中按钮
             UnSelectBtn.onClick.AddListener(() => 
             {
                 OnSelectToggleChange(false, true);
-                CameraSurround.instance.SetCameraPosition(false);
+                CameraSurround.instance.SetCameraPosition();
             });
 
             ClickBtn.onClick.AddListener(OnClickBtnClick);
@@ -169,7 +169,6 @@ namespace QFramework
             }
             else
             {
-                Debug.Log("关闭父级");
                 SetParentUnSelectState();
             }
 
@@ -198,7 +197,6 @@ namespace QFramework
         {
             if (m_ParentPartItem != null && m_ParentPartItem.ChildPartItemIsSelect())
             {
-                Debug.LogError(m_ParentPartItem.name + "子级已经都关闭");
                 m_ParentPartItem.OnSelectToggleChange(false);
             }
         }

ModeDisplay/Assets/StreamingAssets/AssetBundles.meta

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

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

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