Kaynağa Gözat

【内部结构场景调整】

CHIVA\bj 4 ay önce
ebeveyn
işleme
29b7bb6610

+ 1 - 1
ModeDisplay/Assets/GameAssets/03.Models/09.10kV开关柜-KYN28型/开关柜_10kV_KYN28.FBX.meta

@@ -176,7 +176,7 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations: []
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
     globalScale: 1

+ 1 - 1
ModeDisplay/Assets/GameAssets/03.Models/10.10kV开关柜中的真空断路器-VS1型/开关柜_10kV_KYN28.FBX.meta

@@ -181,7 +181,7 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations: []
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
     globalScale: 1

+ 1 - 1
ModeDisplay/Assets/GameAssets/03.Models/10.10kV开关柜中的真空断路器-VS1型/真空断路器_VS1型.FBX.meta

@@ -146,7 +146,7 @@ ModelImporter:
     extraExposedTransformPaths: []
     extraUserProperties: []
     clipAnimations: []
-    isReadable: 0
+    isReadable: 1
   meshes:
     lODScreenPercentages: []
     globalScale: 1

+ 0 - 8
ModeDisplay/Assets/Scenes/云南.meta

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

+ 15 - 0
ModeDisplay/Assets/Scenes/内部结构/05.110kV断路器-LW35型.unity

@@ -2261,6 +2261,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 8954847376970719806, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8954847377543025883, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8954847377636127617, guid: 344aa4d1090904f4e89b56776b0917a3,
         type: 3}
       propertyPath: m_Name
@@ -2321,6 +2331,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8954847377972553116, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 344aa4d1090904f4e89b56776b0917a3, type: 3}
 --- !u!1 &1940266591

+ 15 - 0
ModeDisplay/Assets/Scenes/内部结构/06.500kV隔离开关-GW12型.unity

@@ -14760,6 +14760,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 8954847376970719806, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8954847377543025883, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8954847377636127617, guid: 344aa4d1090904f4e89b56776b0917a3,
         type: 3}
       propertyPath: m_Name
@@ -14820,6 +14830,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8954847377972553116, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 344aa4d1090904f4e89b56776b0917a3, type: 3}
 --- !u!1 &396893751

+ 15 - 0
ModeDisplay/Assets/Scenes/内部结构/07.220kV隔离开关-GW4A型.unity

@@ -128,6 +128,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 8954847376970719806, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8954847377543025883, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8954847377636127617, guid: 344aa4d1090904f4e89b56776b0917a3,
         type: 3}
       propertyPath: m_Name
@@ -188,6 +198,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8954847377972553116, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 344aa4d1090904f4e89b56776b0917a3, type: 3}
 --- !u!1 &33252190

+ 15 - 0
ModeDisplay/Assets/Scenes/内部结构/10.10kV开关柜中的真空断路器-VS1型.unity

@@ -932,6 +932,16 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 0}
     m_Modifications:
+    - target: {fileID: 8954847376970719806, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8954847377543025883, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 8954847377636127617, guid: 344aa4d1090904f4e89b56776b0917a3,
         type: 3}
       propertyPath: m_Name
@@ -992,6 +1002,11 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8954847377972553116, guid: 344aa4d1090904f4e89b56776b0917a3,
+        type: 3}
+      propertyPath: m_Intensity
+      value: 1
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 344aa4d1090904f4e89b56776b0917a3, type: 3}
 --- !u!4 &213442507820415

+ 1 - 1
ModeDisplay/Assets/Scripts/MoveItem/MoveItem.cs

@@ -52,7 +52,7 @@ public class MoveItem : MonoBehaviour
         {
             if (m_IsHighterHide)
             {
-                highlighter.FlashingOn(Color.green, Color.yellow,4f);
+                highlighter.FlashingOn(Color.yellow, new Color(1,1,0,0),4f);
             }
             else
             {

+ 2 - 0
ModeDisplay/Assets/Scripts/UI/QFramework/PartListPanel.cs

@@ -180,6 +180,8 @@ namespace QFramework
         /// </summary>
         private void OnAutoDisassemblyBtnClick()
         {
+            AudioHelper.AudioStop();
+
             DeviceController.instance.gameObject.SetActive(false);
 
             ResLoader resLoader = ResLoader.Allocate();

+ 49 - 19
ModeDisplay/ProjectSettings/EditorBuildSettings.asset

@@ -11,64 +11,94 @@ EditorBuildSettings:
   - enabled: 1
     path: Assets/Scenes/AsyncLoad.unity
     guid: 1dd9e366d4f9e8b418bc56a692130e37
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u4E8C\u6B21\u56DE\u8DEF\u539F\u7406/10kV\u771F\u7A7A\u65AD\u8DEF\u5668-\u4E8C\u6B21\u56DE\u8DEF\u539F\u7406.unity"
     guid: 5deccb2431fb08742aa9dbd3a2e46f91
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u4E8C\u6B21\u56DE\u8DEF\u539F\u7406/110kV\u65AD\u8DEF\u5668-\u4E8C\u6B21\u56DE\u8DEF\u539F\u7406.unity"
     guid: b5d3e4c84f1c80c488c56e8a400268c3
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u4E8C\u6B21\u56DE\u8DEF\u539F\u7406/220kV\u65AD\u8DEF\u5668-\u4E8C\u6B21\u56DE\u8DEF\u539F\u7406.unity"
     guid: 148afc223ea5b494990609f6807117ee
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u673A\u68B0\u8054\u52A8\u7279\u6027/10kV\u5F00\u5173\u67DC-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
     guid: 6b5e63f030b810f47bc4c6cd1addcb62
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u673A\u68B0\u8054\u52A8\u7279\u6027/10kV\u771F\u7A7A\u65AD\u8DEF\u5668-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
     guid: 3e493696fa555b7438178088e8cd77f8
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u673A\u68B0\u8054\u52A8\u7279\u6027/110kV\u65AD\u8DEF\u5668-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
     guid: 656481d869b911f44b221000ad9d440c
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u673A\u68B0\u8054\u52A8\u7279\u6027/110kV\u9694\u79BB\u5F00\u5173-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
     guid: 4b5148bc31300864b8625a340191d226
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u673A\u68B0\u8054\u52A8\u7279\u6027/220kV\u53D8\u538B\u5668-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
     guid: 82c44ae0c22a66e4cb3cd3757a64c75a
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u673A\u68B0\u8054\u52A8\u7279\u6027/220kV\u65AD\u8DEF\u5668-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
     guid: 621bf6548d8fd9c4fa4d0aecae820a8f
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u673A\u68B0\u8054\u52A8\u7279\u6027/220kV\u9694\u79BB\u5F00\u5173-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
     guid: b1f56951a06a9524297f0a99a543f962
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u673A\u68B0\u8054\u52A8\u7279\u6027/500kV\u65AD\u8DEF\u5668-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
     guid: b62e0a3c466ac9e4bb75a5f5dab536f6
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u673A\u68B0\u8054\u52A8\u7279\u6027/500kV\u9694\u79BB\u5F00\u5173-\u673A\u68B0\u8054\u52A8\u7279\u6027.unity"
     guid: 40cbdb3f83227594db74194e3c2ba0d0
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u71C3\u5F27\u7184\u5F27\u7279\u6027/10kV\u5F00\u5173\u67DC-\u71C3\u5F27\u7184\u5F27\u7279\u6027.unity"
     guid: baf33622a9bbdbc418caa93786c13323
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u71C3\u5F27\u7184\u5F27\u7279\u6027/10kV\u771F\u7A7A\u65AD\u8DEF\u5668-\u71C3\u5F27\u7184\u5F27\u7279\u6027.unity"
     guid: e5a564aa1bf68a548ba91f53dacc554d
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u71C3\u5F27\u7184\u5F27\u7279\u6027/110kV\u65AD\u8DEF\u5668-\u71C3\u5F27\u7184\u5F27\u7279\u6027.unity"
     guid: 7f3d235f59be28c499ca8b98e8635ed2
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u71C3\u5F27\u7184\u5F27\u7279\u6027/220kV\u65AD\u8DEF\u5668-\u71C3\u5F27\u7184\u5F27\u7279\u6027.unity"
     guid: 2906985582b4a464090b66b04ca3de1a
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u71C3\u5F27\u7184\u5F27\u7279\u6027/500kV\u65AD\u8DEF\u5668-\u71C3\u5F27\u7184\u5F27\u7279\u6027.unity"
     guid: be345e34bd9aba145807ed4dc2db9ea4
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u7535\u78C1\u7279\u6027/220kV\u53D8\u538B\u5668-\u7535\u78C1\u7279\u6027.unity"
     guid: 85b66b558a7ddaf45b598a4ec4e303e9
   - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u7535\u78C1\u7279\u6027/500kV\u53D8\u538B\u5668-\u7535\u78C1\u7279\u6027_old.unity"
     guid: 08b60b4abc7dea64a809b148d418db97
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/\u8FD0\u884C\u539F\u7406/\u7535\u78C1\u7279\u6027/500kV\u53D8\u538B\u5668-\u7535\u78C1\u7279\u6027.unity"
     guid: 4988fbb6cfcde4d4c8c078efadd2e8d8
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/01.500kV_\u53D8\u538B\u5668-ODFPS\u578B.unity"
+    guid: 852eb4b617a0df34b99d9fab3930b2d5
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/02.220kV_\u53D8\u538B\u5668-SFPSZ10\u578B.unity"
+    guid: 9511eb1e944bba341924c3264cc56a1e
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/03.500kV\u65AD\u8DEF\u5668-LW13\u578B.unity"
+    guid: 53b1c86e86c121c45bfa3f7c9a1af6c7
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/04.220kV\u65AD\u8DEF\u5668-LW25\u578B.unity"
+    guid: 3ec56c2508e263346b363d74e97ae991
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/05.110kV\u65AD\u8DEF\u5668-LW35\u578B.unity"
+    guid: 5345154bff89b394bb7434f77bef5310
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/06.500kV\u9694\u79BB\u5F00\u5173-GW12\u578B.unity"
+    guid: bf5fe4af08be3d04280497449c870777
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/07.220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B.unity"
+    guid: 875e143f1dfc31549a28a0979e5bbcb3
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/08.110kV\u9694\u79BB\u5F00\u5173-GW22\u578B.unity"
+    guid: 30b36bbf5805ace4291d4f6d7eba045f
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/09.10kV\u5F00\u5173\u67DC-KYN28\u578B.unity"
+    guid: 6d0852bc4bc8ccc408828edfdc667301
+  - enabled: 1
+    path: "Assets/Scenes/\u5185\u90E8\u7ED3\u6784/10.10kV\u5F00\u5173\u67DC\u4E2D\u7684\u771F\u7A7A\u65AD\u8DEF\u5668-VS1\u578B.unity"
+    guid: 8d701a502e7919d42b49880bb3864ab1
   m_configObjects: {}