From 8d9b16604b73224c736b9b4806f119b2bf04b28c Mon Sep 17 00:00:00 2001 From: chenxi Date: Fri, 16 Jun 2023 21:53:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B5=84=E6=BA=90=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...fx_m20029_02 1.mat => sfx_m20029_02_1.mat} | 2 +- ...02 1.mat.meta => sfx_m20029_02_1.mat.meta} | 0 ...fx_m20029_04 1.mat => sfx_m20029_04_1.mat} | 2 +- ...04 1.mat.meta => sfx_m20029_04_1.mat.meta} | 0 .../ui/activity/gold_pig/gold_pig_ui.prefab | 6 +-- .../ui/dungeon/dungeon_difficulty_ui.prefab | 52 +++++++++---------- .../ui/login/maintenance_notice_ui.prefab | 2 +- .../prefabs/ui/main_city/dungeon_comp.prefab | 30 +++++------ Assets/prefabs/ui/main_city/main_comp.prefab | 4 +- Assets/prefabs/ui/main_city/main_ui.prefab | 4 +- .../prefabs/ui/setting/game_setting_ui.prefab | 4 +- 11 files changed, 53 insertions(+), 53 deletions(-) rename Assets/arts/effects/material/battle/sfx_m20029/{sfx_m20029_02 1.mat => sfx_m20029_02_1.mat} (98%) rename Assets/arts/effects/material/battle/sfx_m20029/{sfx_m20029_02 1.mat.meta => sfx_m20029_02_1.mat.meta} (100%) rename Assets/arts/effects/material/battle/sfx_m20029/{sfx_m20029_04 1.mat => sfx_m20029_04_1.mat} (98%) rename Assets/arts/effects/material/battle/sfx_m20029/{sfx_m20029_04 1.mat.meta => sfx_m20029_04_1.mat.meta} (100%) diff --git a/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02 1.mat b/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02_1.mat similarity index 98% rename from Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02 1.mat rename to Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02_1.mat index 1d29886ac..6b5e5f9ef 100644 --- a/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02 1.mat +++ b/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02_1.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: sfx_m20029_02 1 + m_Name: sfx_m20029_02_1 m_Shader: {fileID: 4800000, guid: 35c4043aca0de3b4ebc13b2a4b500c5b, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 diff --git a/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02 1.mat.meta b/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02_1.mat.meta similarity index 100% rename from Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02 1.mat.meta rename to Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_02_1.mat.meta diff --git a/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04 1.mat b/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04_1.mat similarity index 98% rename from Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04 1.mat rename to Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04_1.mat index 3808b8c94..5eb3c32ab 100644 --- a/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04 1.mat +++ b/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04_1.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: sfx_m20029_04 1 + m_Name: sfx_m20029_04_1 m_Shader: {fileID: 4800000, guid: 35c4043aca0de3b4ebc13b2a4b500c5b, type: 3} m_ShaderKeywords: _MASK_UV_SPEED_CUSTOM m_LightmapFlags: 4 diff --git a/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04 1.mat.meta b/Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04_1.mat.meta similarity index 100% rename from Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04 1.mat.meta rename to Assets/arts/effects/material/battle/sfx_m20029/sfx_m20029_04_1.mat.meta diff --git a/Assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab b/Assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab index 8f683aac9..8eb22659b 100644 --- a/Assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab +++ b/Assets/prefabs/ui/activity/gold_pig/gold_pig_ui.prefab @@ -983,7 +983,7 @@ GameObject: - component: {fileID: 7634883283183604951} - component: {fileID: 6961470645725400636} - component: {fileID: 8436288170052815293} - m_Layer: 0 + m_Layer: 5 m_Name: time_tx m_TagString: Untagged m_Icon: {fileID: 0} @@ -1396,7 +1396,7 @@ GameObject: - component: {fileID: 687216677247454730} - component: {fileID: 7823183880774295903} - component: {fileID: 2308491604199296439} - m_Layer: 0 + m_Layer: 5 m_Name: time_bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -1633,7 +1633,7 @@ GameObject: - component: {fileID: 4717906892622564970} - component: {fileID: 575382495645843816} - component: {fileID: 5006476849585128240} - m_Layer: 0 + m_Layer: 5 m_Name: icon m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/dungeon/dungeon_difficulty_ui.prefab b/Assets/prefabs/ui/dungeon/dungeon_difficulty_ui.prefab index 9e89ad565..3da7ea1a3 100644 --- a/Assets/prefabs/ui/dungeon/dungeon_difficulty_ui.prefab +++ b/Assets/prefabs/ui/dungeon/dungeon_difficulty_ui.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u96BE\u5EA6" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -199,7 +199,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -408,7 +408,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 000 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} @@ -534,7 +534,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -682,7 +682,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -765,7 +765,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 000 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} @@ -900,7 +900,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u9996\u901A" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1112,7 +1112,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5F00\u59CB" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1238,7 +1238,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1317,7 +1317,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1676,7 +1676,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1764,7 +1764,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1923,7 +1923,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5F00\u59CB" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2208,7 +2208,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u4ECA\u65E5\u5269\u4F59\u6B21\u657000000" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2362,7 +2362,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u901A\u5173\u4E0A\u4E00\u5173\u89E3\u9501" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2496,7 +2496,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 000 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2712,7 +2712,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -3023,7 +3023,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -3106,7 +3106,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 100 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -3306,7 +3306,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "boss\u6297\u6027\uFF1A" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -3448,7 +3448,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -3525,7 +3525,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -3683,7 +3683,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u8FD9\u662F\u526F\u672C" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -4290,7 +4290,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -4406,7 +4406,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -4504,7 +4504,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5956\u52B1" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} diff --git a/Assets/prefabs/ui/login/maintenance_notice_ui.prefab b/Assets/prefabs/ui/login/maintenance_notice_ui.prefab index e5db9b960..09185899b 100644 --- a/Assets/prefabs/ui/login/maintenance_notice_ui.prefab +++ b/Assets/prefabs/ui/login/maintenance_notice_ui.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 2202819348856804819} - component: {fileID: 4941455864927666895} - component: {fileID: 1129392283994635623} - m_Layer: 0 + m_Layer: 5 m_Name: content_tx m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/main_city/dungeon_comp.prefab b/Assets/prefabs/ui/main_city/dungeon_comp.prefab index cfc2d4d7e..86e48edb6 100644 --- a/Assets/prefabs/ui/main_city/dungeon_comp.prefab +++ b/Assets/prefabs/ui/main_city/dungeon_comp.prefab @@ -60,7 +60,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 0, g: 0, b: 0, a: 0.9019608} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -227,7 +227,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00:00:00 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -361,7 +361,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5F00\u542F\u65F6\u95F4\u5DF4\u62C9\u5DF4\u62C9\u5DF4\u62C9" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -488,7 +488,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -579,7 +579,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -667,7 +667,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -825,7 +825,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u4ECA\u65E5\u5269\u4F590\u6B21" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1031,7 +1031,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5F00\u59CB" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1157,7 +1157,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1234,7 +1234,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0.7372549} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1471,7 +1471,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0000000000 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1605,7 +1605,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00:00:00 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} @@ -1739,7 +1739,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u8FD9\u662F\u6807\u9898" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1985,7 +1985,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -2154,7 +2154,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab index 658c40e02..b9c916e06 100644 --- a/Assets/prefabs/ui/main_city/main_comp.prefab +++ b/Assets/prefabs/ui/main_city/main_comp.prefab @@ -665,7 +665,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1165,7 +1165,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index dbf28ebb7..dea809fb9 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -1663,7 +1663,7 @@ GameObject: - component: {fileID: 7427886148868494453} - component: {fileID: 3194657544111682895} - component: {fileID: 8191960039231862908} - m_Layer: 0 + m_Layer: 5 m_Name: line_2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -3661,7 +3661,7 @@ GameObject: - component: {fileID: 4661127000006697023} - component: {fileID: 1386399875459108104} - component: {fileID: 6936252840893456730} - m_Layer: 0 + m_Layer: 5 m_Name: line_1 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/setting/game_setting_ui.prefab b/Assets/prefabs/ui/setting/game_setting_ui.prefab index 5e4ccce50..5bbb24fb4 100644 --- a/Assets/prefabs/ui/setting/game_setting_ui.prefab +++ b/Assets/prefabs/ui/setting/game_setting_ui.prefab @@ -868,7 +868,7 @@ GameObject: - component: {fileID: 5194828609398610944} - component: {fileID: 686973319189616997} - component: {fileID: 7024869463434462269} - m_Layer: 0 + m_Layer: 5 m_Name: text m_TagString: Untagged m_Icon: {fileID: 0} @@ -4039,7 +4039,7 @@ GameObject: - component: {fileID: 2656669318643348252} - component: {fileID: 3990284629230349705} - component: {fileID: 4820275088709085044} - m_Layer: 0 + m_Layer: 5 m_Name: text m_TagString: Untagged m_Icon: {fileID: 0}