فهرست منبع

(+)修改500kV断路器分组

zhangjx 5 ماه پیش
والد
کامیت
8fefd6ae72

+ 1 - 1
ModeDisplay/Assets/GameAssets/03.Models/断路器_110kV_LW35/断路器_110kV_LW35.FBX.meta

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

+ 1 - 1
ModeDisplay/Assets/Scenes/云南.meta → ModeDisplay/Assets/GameAssets/08.ModelPrefabs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 520cc34d804c7b644bb7419b0040430f
+guid: a9f491a473c3b784da2db161165147ae
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
ModeDisplay/Assets/GameAssets/10_Data.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ModeDisplay/Assets/GameAssets/05.UI/UI/字幕.meta
-guid: ddfbe00426d782741a3329dd41ec6d71
+guid: fdc380f0a97547a4c8a54d542e3ab005
 ========
 guid: 341e039c5959ec14f8e99b4a37c4574c
 >>>>>>>> feature/cjy:ModeDisplay/Assets/GameAssets/10_Data.meta

+ 0 - 16
ModeDisplay/Assets/GameAssets/10_Data_BACKUP_760.meta

@@ -1,16 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ModeDisplay/Assets/GameAssets/05.UI/UI/字幕.meta
-<<<<<<< HEAD
-guid: ddfbe00426d782741a3329dd41ec6d71
-=======
-guid: 6a8bd00fec6cc4b47935e7f5e1a98fd7
->>>>>>> feature/jinxin
-========
-guid: 341e039c5959ec14f8e99b4a37c4574c
->>>>>>>> feature/cjy:ModeDisplay/Assets/GameAssets/10_Data.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 12
ModeDisplay/Assets/GameAssets/10_Data_BASE_760.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ModeDisplay/Assets/GameAssets/05.UI/UI/字幕.meta
-guid: cf868020bba25a8418bfba5524e3a6b2
-========
-guid: 341e039c5959ec14f8e99b4a37c4574c
->>>>>>>> feature/cjy:ModeDisplay/Assets/GameAssets/10_Data.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 12
ModeDisplay/Assets/GameAssets/10_Data_LOCAL_760.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ModeDisplay/Assets/GameAssets/05.UI/UI/字幕.meta
-guid: ddfbe00426d782741a3329dd41ec6d71
-========
-guid: 341e039c5959ec14f8e99b4a37c4574c
->>>>>>>> feature/cjy:ModeDisplay/Assets/GameAssets/10_Data.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 12
ModeDisplay/Assets/GameAssets/10_Data_REMOTE_760.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ModeDisplay/Assets/GameAssets/05.UI/UI/字幕.meta
-guid: 6a8bd00fec6cc4b47935e7f5e1a98fd7
-========
-guid: 341e039c5959ec14f8e99b4a37c4574c
->>>>>>>> feature/cjy:ModeDisplay/Assets/GameAssets/10_Data.meta
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 8 - 8
ModeDisplay/Assets/Scenes/500kV_变压器-ODFPS型.unity

@@ -4276,7 +4276,7 @@ Transform:
   - {fileID: 3557621988978075007}
   - {fileID: 6328171629507766186}
   m_Father: {fileID: 1522069423064373868}
-  m_RootOrder: 19
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1464724949
 GameObject:
@@ -145108,7 +145108,6 @@ Transform:
   - {fileID: 6512237484373185695}
   - {fileID: 8561454204863394404}
   - {fileID: 6657862774502808857}
-  - {fileID: 6299667144069548781}
   - {fileID: 5565306357179866336}
   - {fileID: 1660682214660357561}
   - {fileID: 1447988929}
@@ -158597,7 +158596,7 @@ Transform:
   - {fileID: 7971020835622996450}
   - {fileID: 3692311373726388845}
   m_Father: {fileID: 1522069423064373868}
-  m_RootOrder: 18
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1660905430068737488
 MeshFilter:
@@ -519358,7 +519357,7 @@ Transform:
   - {fileID: 6595970773336301439}
   - {fileID: 363746119330066510}
   m_Father: {fileID: 1522069423064373868}
-  m_RootOrder: 17
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &5565377516699417890
 MeshRenderer:
@@ -587626,8 +587625,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 872287337051711991}
-  m_LocalRotation: {x: 0, y: 0.079780355, z: -0, w: 0.9968125}
-  m_LocalPosition: {x: 1.9050457, y: 2.4629712, z: 7.32529}
+  m_LocalRotation: {x: -0, y: 0.079780355, z: -0, w: 0.9968125}
+  m_LocalPosition: {x: 0.29175198, y: -0.008300781, z: 1.5069795}
   m_LocalScale: {x: 1.3859177, y: 1.3859177, z: 1.3859177}
   m_Children:
   - {fileID: 2454127612300403208}
@@ -587648,8 +587647,8 @@ Transform:
   - {fileID: 3107144963306138601}
   - {fileID: 2112428351526257607}
   - {fileID: 7483561263935893497}
-  m_Father: {fileID: 1522069423064373868}
-  m_RootOrder: 16
+  m_Father: {fileID: 8384223251513416385}
+  m_RootOrder: 112
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6299850378132995454
 GameObject:
@@ -779956,6 +779955,7 @@ Transform:
   - {fileID: 2960072168666458917}
   - {fileID: 7300122036527527170}
   - {fileID: 7545798543915047410}
+  - {fileID: 6299667144069548781}
   m_Father: {fileID: 1522069423064373868}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 9 - 9
ModeDisplay/Assets/Scenes/500kV断路器-LW13型.unity

@@ -961,7 +961,6 @@ Transform:
   - {fileID: 5814629465607567042}
   - {fileID: 2912418168720550511}
   - {fileID: 7847442434109293652}
-  - {fileID: 6556753860044724108}
   - {fileID: 6723898802343830741}
   - {fileID: 3093812012997438172}
   - {fileID: 1290153493160133005}
@@ -63752,7 +63751,7 @@ Transform:
   m_LocalScale: {x: 1, y: 0.5867547, z: 1}
   m_Children: []
   m_Father: {fileID: 1839724117}
-  m_RootOrder: 7
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!33 &1290353488914094966
 MeshFilter:
@@ -146994,7 +146993,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1839724117}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &3093968113733146517
 Transform:
@@ -310212,7 +310211,7 @@ Transform:
   m_LocalScale: {x: 1, y: 0.5867547, z: 1}
   m_Children: []
   m_Father: {fileID: 1839724117}
-  m_RootOrder: 8
+  m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6497958847879211944
 GameObject:
@@ -313762,11 +313761,11 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7216391247190479795}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 1.3626652, y: 0.00040911246, z: 0.1014812}
+  m_LocalPosition: {x: -0.020190358, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
-  m_Father: {fileID: 1839724117}
-  m_RootOrder: 4
+  m_Father: {fileID: 7049682635089807645}
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!4 &6557670454280249482
 Transform:
@@ -321352,7 +321351,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1839724117}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6725475077671015207
 GameObject:
@@ -335800,6 +335799,7 @@ Transform:
   - {fileID: 277772605167425983}
   - {fileID: 2424417876758549162}
   - {fileID: 4586984328528113741}
+  - {fileID: 6556753860044724108}
   - {fileID: 8380103425887061209}
   m_Father: {fileID: 7131449634143533108}
   m_RootOrder: 3
@@ -401807,7 +401807,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 7049682635089807645}
-  m_RootOrder: 3
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!23 &8381020180057580397
 MeshRenderer:

+ 8 - 0
ModeDisplay/Assets/StreamingAssets/AssetBundles.meta

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

+ 8 - 2
ModeDisplay/ProjectSettings/EditorBuildSettings.asset

@@ -20,7 +20,7 @@ EditorBuildSettings:
   - enabled: 0
     path: "Assets/Scenes/500kV\u9694\u79BB\u5F00\u5173-GW12\u578B.unity"
     guid: 099a6a03a5680ab41b5d00dd6aa59b1a
-  - enabled: 1
+  - enabled: 0
     path: "Assets/Scenes/220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B.unity"
     guid: 875e143f1dfc31549a28a0979e5bbcb3
   - enabled: 0
@@ -29,7 +29,7 @@ EditorBuildSettings:
   - enabled: 0
     path: "Assets/Scenes/220kV_\u53D8\u538B\u5668V20250702.unity"
     guid: 8d8debc55df7b4246a5f630745b2c544
-  - enabled: 0
+  - enabled: 1
     path: "Assets/Scenes/110kV\u65AD\u8DEF\u5668-LW35\u578B.unity"
     guid: 5345154bff89b394bb7434f77bef5310
   - enabled: 0
@@ -38,4 +38,10 @@ EditorBuildSettings:
   - enabled: 0
     path: "Assets/Scenes/\u8BA4\u77E5/10.10kV\u5F00\u5173\u67DC\u4E2D\u7684\u771F\u7A7A\u65AD\u8DEF\u5668-VS1\u578B.unity"
     guid: 8d701a502e7919d42b49880bb3864ab1
+  - enabled: 0
+    path: "Assets/Scenes/220kV\u65AD\u8DEF\u5668-LW25\u578B.unity"
+    guid: 3ec56c2508e263346b363d74e97ae991
+  - enabled: 0
+    path: "Assets/Scenes/500kV\u65AD\u8DEF\u5668-LW13\u578B.unity"
+    guid: 53b1c86e86c121c45bfa3f7c9a1af6c7
   m_configObjects: {}

+ 2 - 2
ModeDisplay/ProjectSettings/ProjectSettings.asset

@@ -13,11 +13,11 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: Chiva
-  productName: "220kV\u9694\u79BB\u5F00\u5173-GW4A\u578B\u6A21\u578B\u5C55\u793A"
+  productName: "110kV\u65AD\u8DEF\u5668-LW35\u578B\u6A21\u578B\u5C55\u793A"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
-  m_ShowUnitySplashScreen: 0
+  m_ShowUnitySplashScreen: 1
   m_ShowUnitySplashLogo: 1
   m_SplashScreenOverlayOpacity: 1
   m_SplashScreenAnimation: 1