@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cfbd5b91ae13fd2498bd192513957395
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 1c705e6b67a5eee48a62b9b461e50092
+guid: 2269e702abad5b44c97a0c91011f4c00
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
-guid: ef81344c14125184bbe28c5539f0c929
+guid: a008b72e2b8480e47986db427538be72
+guid: 50c6f7dfe8ff3a04eacc78958828e26d
-guid: d2326dc7238d5a8449d4b7a824bb2a6e
+guid: 928793c814e2e53478f1fdf9b636bd25
folderAsset: yes
DefaultImporter:
-guid: adbce02fab4bd8b428d3fc2dc72f5e21
+guid: 002dabfb23b051a45817c654e1c676f6
AudioImporter:
serializedVersion: 6
-guid: 682393de65860f64bb25c1b945fe1ac2
+guid: d37dd6bbff76fad4db32cca21f8c7849
-guid: e7ec8309147ecf341a6ae4019a531ece
+guid: 6e1b7d915e49c63498eb41f326b8476e
@@ -1,6 +1,6 @@
<<<<<<<< HEAD:ModeDisplay/Assets/GameAssets/05.UI/UI/字幕.meta
-guid: ddfbe00426d782741a3329dd41ec6d71
+guid: 629a2435c3ead8343bb9b3523728edc3
========
guid: 341e039c5959ec14f8e99b4a37c4574c
>>>>>>>> feature/cjy:ModeDisplay/Assets/GameAssets/10_Data.meta
@@ -1,16 +0,0 @@
-fileFormatVersion: 2
-<<<<<<<< HEAD:ModeDisplay/Assets/GameAssets/05.UI/UI/字幕.meta
-<<<<<<< HEAD
-=======
-guid: 6a8bd00fec6cc4b47935e7f5e1a98fd7
->>>>>>> feature/jinxin
-========
-guid: 341e039c5959ec14f8e99b4a37c4574c
->>>>>>>> feature/cjy:ModeDisplay/Assets/GameAssets/10_Data.meta
-folderAsset: yes
-DefaultImporter:
- externalObjects: {}
- userData:
- assetBundleName:
- assetBundleVariant:
@@ -1,12 +0,0 @@
-guid: cf868020bba25a8418bfba5524e3a6b2
<<<<<<<< HEAD:ModeDisplay/Assets/StreamingAssets/SubTitles/内部结构.meta
-guid: e4b14be36dbac8f48ae337ee78697af3
+guid: 66287c5e814592f43bc8fbf4df92725a
guid: dce6f5c5e357fcb419002d413bebe333
>>>>>>>> feature/LQD:ModeDisplay/Assets/GameAssets/15.LineRenderer.meta
@@ -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", "内部结构设备配置");
/// 表格后缀