Эх сурвалжийг харах

【+】
1.设备配置文件夹-》内部结构设备配置

lxd 1 сар өмнө
parent
commit
4a98bacc5b
18 өөрчлөгдсөн 26 нэмэгдсэн , 62 устгасан
  1. 8 0
      ModeDisplay/Assets/GameAssets/01.Animation.meta
  2. 1 1
      ModeDisplay/Assets/GameAssets/04.TimeLines/开关柜_10kV_KYN28机械原理.playable.meta
  3. 1 1
      ModeDisplay/Assets/GameAssets/04.TimeLines/真空断路器-VS1机械原理.playable.meta
  4. 8 0
      ModeDisplay/Assets/GameAssets/08.Animators.meta
  5. 1 1
      ModeDisplay/Assets/GameAssets/09.Audios/开关柜机械原理.meta
  6. 1 1
      ModeDisplay/Assets/GameAssets/09.Audios/开关柜机械原理/1.检修位置到试验位置,首先将断路器vs1+放到移.mp3.meta
  7. 1 1
      ModeDisplay/Assets/GameAssets/09.Audios/真空断路器机械原理.meta
  8. 1 1
      ModeDisplay/Assets/GameAssets/09.Audios/真空断路器机械原理/试验位置___2__00_00_02,050+--.mp3.meta
  9. 1 1
      ModeDisplay/Assets/GameAssets/10_Data.meta
  10. 0 16
      ModeDisplay/Assets/GameAssets/10_Data_BACKUP_760.meta
  11. 0 12
      ModeDisplay/Assets/GameAssets/10_Data_BASE_760.meta
  12. 0 12
      ModeDisplay/Assets/GameAssets/10_Data_LOCAL_760.meta
  13. 0 12
      ModeDisplay/Assets/GameAssets/10_Data_REMOTE_760.meta
  14. 1 1
      ModeDisplay/Assets/GameAssets/15.LineRenderer.meta
  15. 2 2
      ModeDisplay/Assets/Scripts/Global/GlobalConfig.cs
  16. 0 0
      ModeDisplay/Assets/StreamingAssets/Config/内部结构设备配置.meta
  17. 0 0
      ModeDisplay/Assets/StreamingAssets/Config/内部结构设备配置/隔离开关_500kV_GW12.xlsx
  18. 0 0
      ModeDisplay/Assets/StreamingAssets/Config/内部结构设备配置/隔离开关_500kV_GW12.xlsx.meta

+ 8 - 0
ModeDisplay/Assets/GameAssets/01.Animation.meta

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

+ 1 - 1
ModeDisplay/Assets/GameAssets/04.TimeLines/开关柜_10kV_KYN28机械原理.playable.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 1c705e6b67a5eee48a62b9b461e50092
+guid: 2269e702abad5b44c97a0c91011f4c00
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

+ 1 - 1
ModeDisplay/Assets/GameAssets/04.TimeLines/真空断路器-VS1机械原理.playable.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ef81344c14125184bbe28c5539f0c929
+guid: a008b72e2b8480e47986db427538be72
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

+ 8 - 0
ModeDisplay/Assets/GameAssets/08.Animators.meta

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

+ 1 - 1
ModeDisplay/Assets/GameAssets/09.Audios/开关柜机械原理.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: d2326dc7238d5a8449d4b7a824bb2a6e
+guid: 928793c814e2e53478f1fdf9b636bd25
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
ModeDisplay/Assets/GameAssets/09.Audios/开关柜机械原理/1.检修位置到试验位置,首先将断路器vs1+放到移.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: adbce02fab4bd8b428d3fc2dc72f5e21
+guid: 002dabfb23b051a45817c654e1c676f6
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

+ 1 - 1
ModeDisplay/Assets/GameAssets/09.Audios/真空断路器机械原理.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 682393de65860f64bb25c1b945fe1ac2
+guid: d37dd6bbff76fad4db32cca21f8c7849
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 1 - 1
ModeDisplay/Assets/GameAssets/09.Audios/真空断路器机械原理/试验位置___2__00_00_02,050+--.mp3.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e7ec8309147ecf341a6ae4019a531ece
+guid: 6e1b7d915e49c63498eb41f326b8476e
 AudioImporter:
   externalObjects: {}
   serializedVersion: 6

+ 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: 629a2435c3ead8343bb9b3523728edc3
 ========
 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: 

+ 1 - 1
ModeDisplay/Assets/GameAssets/15.LineRenderer.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
 <<<<<<<< HEAD:ModeDisplay/Assets/StreamingAssets/SubTitles/内部结构.meta
-guid: e4b14be36dbac8f48ae337ee78697af3
+guid: 66287c5e814592f43bc8fbf4df92725a
 ========
 guid: dce6f5c5e357fcb419002d413bebe333
 >>>>>>>> feature/LQD:ModeDisplay/Assets/GameAssets/15.LineRenderer.meta

+ 2 - 2
ModeDisplay/Assets/Scripts/Global/GlobalConfig.cs

@@ -40,9 +40,9 @@ public static class GlobalConfig
     public static string faultTablePath = Path.Combine(Application.streamingAssetsPath, "Config", "缺陷配置");
 
     /// <summary>
-    /// 设备配置表根目录
+    /// 内部结构设备配置表根目录
     /// </summary>
-    public static string partTablePath = Path.Combine(Application.streamingAssetsPath, "Config", "设备配置");
+    public static string partTablePath = Path.Combine(Application.streamingAssetsPath, "Config", "内部结构设备配置");
 
     /// <summary>
     /// 表格后缀

+ 0 - 0
ModeDisplay/Assets/StreamingAssets/Config/设备配置.meta → ModeDisplay/Assets/StreamingAssets/Config/内部结构设备配置.meta


+ 0 - 0
ModeDisplay/Assets/StreamingAssets/Config/设备配置/隔离开关_500kV_GW12.xlsx → ModeDisplay/Assets/StreamingAssets/Config/内部结构设备配置/隔离开关_500kV_GW12.xlsx


+ 0 - 0
ModeDisplay/Assets/StreamingAssets/Config/设备配置/隔离开关_500kV_GW12.xlsx.meta → ModeDisplay/Assets/StreamingAssets/Config/内部结构设备配置/隔离开关_500kV_GW12.xlsx.meta