diff --git a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset index 6268bfde6..711b23619 100644 --- a/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset +++ b/Assets/arts/fonts/tmpfonts/default/tmpfont/font_sdf.asset @@ -87,7 +87,8 @@ MonoBehaviour: m_FontFeatureTable: m_GlyphPairAdjustmentRecords: [] fallbackFontAssets: [] - m_FallbackFontAssetTable: [] + m_FallbackFontAssetTable: + - {fileID: 11400000, guid: fb372181bb5896149b689946854b5451, type: 2} m_CreationSettings: sourceFontFileName: sourceFontFileGUID: diff --git a/Assets/prefabs/ui/arena/arena_buy_ticket_ui.prefab b/Assets/prefabs/ui/arena/arena_buy_ticket_ui.prefab index e0c480018..39ee09f39 100644 --- a/Assets/prefabs/ui/arena/arena_buy_ticket_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_buy_ticket_ui.prefab @@ -430,7 +430,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} @@ -1112,7 +1112,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} diff --git a/Assets/prefabs/ui/arena/arena_formation_ui.prefab b/Assets/prefabs/ui/arena/arena_formation_ui.prefab index dac6d7e71..0ad876c2b 100644 --- a/Assets/prefabs/ui/arena/arena_formation_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_formation_ui.prefab @@ -58,7 +58,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} @@ -135,7 +135,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} @@ -231,7 +231,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaa + 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/arena/arena_match_ui.prefab b/Assets/prefabs/ui/arena/arena_match_ui.prefab index 4d9207f50..7bcb2cac5 100644 --- a/Assets/prefabs/ui/arena/arena_match_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_match_ui.prefab @@ -57,7 +57,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} @@ -134,7 +134,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} @@ -212,7 +212,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} @@ -295,7 +295,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2} @@ -514,7 +514,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} @@ -589,7 +589,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} @@ -672,7 +672,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: start + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -806,7 +806,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1012,7 +1012,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1140,7 +1140,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} @@ -1215,7 +1215,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} @@ -1298,7 +1298,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} @@ -1562,7 +1562,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} @@ -1645,7 +1645,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2108,7 +2108,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} @@ -2191,7 +2191,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2414,7 +2414,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: s000 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2548,7 +2548,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: s000 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2682,7 +2682,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2808,7 +2808,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} @@ -3026,7 +3026,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} @@ -3180,7 +3180,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} @@ -3314,7 +3314,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} @@ -4367,6 +4367,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1882688869272361315} m_Modifications: + - target: {fileID: 1523163585315954956, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 1577557829990810887, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + - target: {fileID: 5818499705208461115, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - target: {fileID: 6290902110419108821, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_Name value: arena_grading_cell @@ -4482,6 +4494,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 4913380882724635054} m_Modifications: + - target: {fileID: 1523163585315954956, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 1577557829990810887, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + - target: {fileID: 5818499705208461115, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - target: {fileID: 6290902110419108821, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_Name value: arena_grading_cell diff --git a/Assets/prefabs/ui/arena/arena_rank_ui.prefab b/Assets/prefabs/ui/arena/arena_rank_ui.prefab index b55fd96c8..ac08ac37b 100644 --- a/Assets/prefabs/ui/arena/arena_rank_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_rank_ui.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -276,7 +276,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} @@ -402,7 +402,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} @@ -739,7 +739,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -865,7 +865,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} @@ -940,7 +940,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} @@ -1090,7 +1090,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} @@ -1222,7 +1222,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} @@ -1305,7 +1305,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u67E5\u770B" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1431,7 +1431,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} @@ -1697,7 +1697,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} @@ -1774,7 +1774,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} @@ -1870,7 +1870,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} @@ -2389,6 +2389,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1674644185451290948} m_Modifications: + - target: {fileID: 1523163585315954956, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 1577557829990810887, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + - target: {fileID: 5818499705208461115, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - target: {fileID: 6290902110419108821, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_Name value: arena_grading_cell @@ -2504,6 +2516,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 8492507277643277752} m_Modifications: + - target: {fileID: 1523163585315954956, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 1577557829990810887, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + - target: {fileID: 5818499705208461115, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - target: {fileID: 6290902110419108821, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_Name value: arena_grading_cell diff --git a/Assets/prefabs/ui/arena/arena_recent_battle_ui.prefab b/Assets/prefabs/ui/arena/arena_recent_battle_ui.prefab index f9de131d4..0a1f884ff 100644 --- a/Assets/prefabs/ui/arena/arena_recent_battle_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_recent_battle_ui.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaa + 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: +000 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -410,7 +410,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} @@ -544,7 +544,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -880,7 +880,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} @@ -1007,7 +1007,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} @@ -1277,7 +1277,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} @@ -1360,7 +1360,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} @@ -1494,7 +1494,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1628,7 +1628,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1868,7 +1868,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} @@ -1944,7 +1944,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} @@ -2187,7 +2187,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2313,7 +2313,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} @@ -2389,7 +2389,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} @@ -2472,7 +2472,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2606,7 +2606,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2740,7 +2740,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2867,7 +2867,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} @@ -3083,7 +3083,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -3217,7 +3217,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} @@ -3351,7 +3351,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -3485,7 +3485,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -3866,7 +3866,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaaaaaaaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -4000,7 +4000,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -4134,7 +4134,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -4435,7 +4435,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} @@ -4544,7 +4544,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} diff --git a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab index 0ccd4bce0..fb6e47c65 100644 --- a/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab +++ b/Assets/prefabs/ui/arena/arena_season_reward_ui.prefab @@ -57,7 +57,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} @@ -322,7 +322,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} @@ -533,7 +533,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} @@ -629,7 +629,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -866,7 +866,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} @@ -1142,7 +1142,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} @@ -1306,7 +1306,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} @@ -1381,7 +1381,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} @@ -1700,7 +1700,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} @@ -1903,7 +1903,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2281,7 +2281,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaaaaaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -3302,6 +3302,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2255247634504634080} m_Modifications: + - target: {fileID: 1523163585315954956, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_text + value: + objectReference: {fileID: 0} + - target: {fileID: 1577557829990810887, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + - target: {fileID: 5818499705208461115, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - target: {fileID: 6290902110419108821, guid: 89633b703e8121b4a8b3e94fcd3d60ff, type: 3} propertyPath: m_Name value: arena_grading_cell diff --git a/Assets/prefabs/ui/arena/cell/arena_grading_cell.prefab b/Assets/prefabs/ui/arena/cell/arena_grading_cell.prefab index f45138fa4..2240b13ac 100644 --- a/Assets/prefabs/ui/arena/cell/arena_grading_cell.prefab +++ b/Assets/prefabs/ui/arena/cell/arena_grading_cell.prefab @@ -57,7 +57,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} @@ -132,7 +132,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} @@ -215,7 +215,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u5014\u5F3A\u9ED1\u94C1" + 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/battle/battle_arena_pause_ui.prefab b/Assets/prefabs/ui/battle/battle_arena_pause_ui.prefab index a5ea34ae3..85f5cdd6d 100644 --- a/Assets/prefabs/ui/battle/battle_arena_pause_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_arena_pause_ui.prefab @@ -191,7 +191,7 @@ GameObject: - component: {fileID: 5841676959962843802} - component: {fileID: 3408752794356770305} - component: {fileID: 8466271802849543926} - m_Layer: 0 + m_Layer: 5 m_Name: desc m_TagString: Untagged m_Icon: {fileID: 0} @@ -557,7 +557,7 @@ GameObject: - component: {fileID: 8392250597869700003} - component: {fileID: 913735232607546097} - component: {fileID: 1762719092356955994} - m_Layer: 0 + m_Layer: 5 m_Name: desc m_TagString: Untagged m_Icon: {fileID: 0} @@ -1376,7 +1376,7 @@ GameObject: - component: {fileID: 1169321492090100802} - component: {fileID: 222887780921793874} - component: {fileID: 4394298179544909240} - m_Layer: 0 + m_Layer: 5 m_Name: desc m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/battle/battle_result_ui.prefab b/Assets/prefabs/ui/battle/battle_result_ui.prefab index b482fafc8..b452c1712 100644 --- a/Assets/prefabs/ui/battle/battle_result_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_result_ui.prefab @@ -334,7 +334,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6c44c307d57c9417085df33db10b886d, 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} @@ -521,7 +521,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00/00 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1129,7 +1129,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} @@ -1351,7 +1351,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} @@ -1940,7 +1940,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -3636,7 +3636,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -3764,7 +3764,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} @@ -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} diff --git a/Assets/prefabs/ui/battle/battle_ui.prefab b/Assets/prefabs/ui/battle/battle_ui.prefab index 82b1a0d3a..e3e605a71 100644 --- a/Assets/prefabs/ui/battle/battle_ui.prefab +++ b/Assets/prefabs/ui/battle/battle_ui.prefab @@ -509,7 +509,7 @@ GameObject: - component: {fileID: 3247906884017061954} - component: {fileID: 8270324867677734112} - component: {fileID: 4521883917549239013} - m_Layer: 0 + m_Layer: 5 m_Name: arrow_3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1032,7 +1032,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} @@ -1739,7 +1739,7 @@ GameObject: - component: {fileID: 1922811422285423445} - component: {fileID: 3190300419712494265} - component: {fileID: 5216378216961828427} - m_Layer: 0 + m_Layer: 5 m_Name: line_r m_TagString: Untagged m_Icon: {fileID: 0} @@ -2262,7 +2262,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} @@ -2704,7 +2704,7 @@ GameObject: - component: {fileID: 8629954059421539487} - component: {fileID: 8283506358486552717} - component: {fileID: 4712503308534494813} - m_Layer: 0 + m_Layer: 5 m_Name: line_d m_TagString: Untagged m_Icon: {fileID: 0} @@ -3527,7 +3527,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} @@ -4559,7 +4559,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} @@ -5057,7 +5057,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} @@ -7064,7 +7064,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} @@ -8638,7 +8638,7 @@ GameObject: - component: {fileID: 349216184434194791} - component: {fileID: 4423732782546572253} - component: {fileID: 6754080632720639260} - m_Layer: 0 + m_Layer: 5 m_Name: line_t m_TagString: Untagged m_Icon: {fileID: 0} @@ -8859,7 +8859,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} @@ -10128,7 +10128,7 @@ GameObject: - component: {fileID: 4917119677511439897} - component: {fileID: 3852509710768040098} - component: {fileID: 608536999379254756} - m_Layer: 0 + m_Layer: 5 m_Name: tips_desc m_TagString: Untagged m_Icon: {fileID: 0} @@ -10451,7 +10451,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} @@ -10885,7 +10885,7 @@ GameObject: - component: {fileID: 7263658211180818412} - component: {fileID: 5104796035551228898} - component: {fileID: 4148799344992535685} - m_Layer: 0 + m_Layer: 5 m_Name: arrow_1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -11254,7 +11254,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} @@ -11571,7 +11571,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} @@ -11695,7 +11695,7 @@ GameObject: - component: {fileID: 3133595275052545921} - component: {fileID: 2834532319749896721} - component: {fileID: 9047084066153142636} - m_Layer: 0 + m_Layer: 5 m_Name: arrow_4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13374,7 +13374,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} @@ -13861,7 +13861,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} @@ -14963,7 +14963,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} @@ -15329,7 +15329,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} @@ -16043,7 +16043,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} @@ -17810,7 +17810,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} @@ -17842,7 +17842,7 @@ GameObject: - component: {fileID: 8668075338766591353} - component: {fileID: 1415289766015924829} - component: {fileID: 932738283292268044} - m_Layer: 0 + m_Layer: 5 m_Name: line_l m_TagString: Untagged m_Icon: {fileID: 0} @@ -19117,7 +19117,7 @@ GameObject: - component: {fileID: 5202005870568827164} - component: {fileID: 4371727525594228442} - component: {fileID: 7548490523865558190} - m_Layer: 0 + m_Layer: 5 m_Name: arrow_2 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/battle/battle_ui_pvp.prefab b/Assets/prefabs/ui/battle/battle_ui_pvp.prefab index e8c7f582b..b761febcb 100644 --- a/Assets/prefabs/ui/battle/battle_ui_pvp.prefab +++ b/Assets/prefabs/ui/battle/battle_ui_pvp.prefab @@ -299,7 +299,7 @@ GameObject: - component: {fileID: 8184946947556548167} - component: {fileID: 2521096586411274723} - component: {fileID: 3062448277255538634} - m_Layer: 0 + m_Layer: 5 m_Name: arrow m_TagString: Untagged m_Icon: {fileID: 0} @@ -789,7 +789,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} @@ -1406,7 +1406,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} @@ -2044,7 +2044,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} @@ -2951,7 +2951,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} @@ -3117,7 +3117,7 @@ GameObject: - component: {fileID: 1223488105846188985} - component: {fileID: 571880143061672486} - component: {fileID: 606355750347733632} - m_Layer: 0 + m_Layer: 5 m_Name: mask m_TagString: Untagged m_Icon: {fileID: 0} @@ -3532,7 +3532,7 @@ GameObject: - component: {fileID: 3681124372796104399} - component: {fileID: 2891130306653956343} - component: {fileID: 2888545484343618235} - m_Layer: 0 + m_Layer: 5 m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -4023,7 +4023,7 @@ GameObject: - component: {fileID: 5970241264587453406} - component: {fileID: 7815350991732014000} - component: {fileID: 3034231713638443008} - m_Layer: 0 + m_Layer: 5 m_Name: arrow m_TagString: Untagged m_Icon: {fileID: 0} @@ -4183,7 +4183,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} @@ -6541,7 +6541,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} @@ -6644,7 +6644,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} @@ -6747,7 +6747,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} @@ -7391,7 +7391,7 @@ GameObject: - component: {fileID: 3245168990449107782} - component: {fileID: 4581684095767965167} - component: {fileID: 7882159088863018039} - m_Layer: 0 + m_Layer: 5 m_Name: hp_progress m_TagString: Untagged m_Icon: {fileID: 0} @@ -7555,7 +7555,7 @@ GameObject: - component: {fileID: 235425779446792635} - component: {fileID: 527628003773673236} - component: {fileID: 1886324048903664605} - m_Layer: 0 + m_Layer: 5 m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} @@ -9224,7 +9224,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} @@ -10038,7 +10038,7 @@ GameObject: - component: {fileID: 5040235474271999284} - component: {fileID: 3122741996021399361} - component: {fileID: 578596856611973383} - m_Layer: 0 + m_Layer: 5 m_Name: hp_progress m_TagString: Untagged m_Icon: {fileID: 0} @@ -10186,7 +10186,7 @@ GameObject: - component: {fileID: 5624424925027681260} - component: {fileID: 4382450311284069018} - component: {fileID: 5306716811456153761} - m_Layer: 0 + m_Layer: 5 m_Name: touch_mask m_TagString: Untagged m_Icon: {fileID: 0} @@ -10232,7 +10232,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} @@ -10711,7 +10711,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} @@ -11103,7 +11103,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} @@ -11490,7 +11490,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} @@ -12022,7 +12022,7 @@ GameObject: - component: {fileID: 2744520647660456755} - component: {fileID: 3583552486904914542} - component: {fileID: 151750136120775634} - m_Layer: 0 + m_Layer: 5 m_Name: hp_progress_yellow m_TagString: Untagged m_Icon: {fileID: 0} @@ -13177,7 +13177,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} @@ -13489,7 +13489,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} @@ -14362,7 +14362,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} @@ -15180,7 +15180,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} @@ -15346,7 +15346,7 @@ GameObject: - component: {fileID: 903644506443071379} - component: {fileID: 3910740180215610678} - component: {fileID: 996388168902569676} - m_Layer: 0 + m_Layer: 5 m_Name: round_text m_TagString: Untagged m_Icon: {fileID: 0} @@ -16855,7 +16855,7 @@ GameObject: - component: {fileID: 8978367444389602144} - component: {fileID: 6890305511306401530} - component: {fileID: 1977343458378322507} - m_Layer: 0 + m_Layer: 5 m_Name: hp_progress_yellow m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/commerce/buy_vit_ui.prefab b/Assets/prefabs/ui/commerce/buy_vit_ui.prefab index 658e903a7..cd6b6c025 100644 --- a/Assets/prefabs/ui/commerce/buy_vit_ui.prefab +++ b/Assets/prefabs/ui/commerce/buy_vit_ui.prefab @@ -355,7 +355,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} @@ -1202,7 +1202,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} diff --git a/Assets/prefabs/ui/main_city/main_comp.prefab b/Assets/prefabs/ui/main_city/main_comp.prefab index 61d38e4cf..197780bc4 100644 --- a/Assets/prefabs/ui/main_city/main_comp.prefab +++ b/Assets/prefabs/ui/main_city/main_comp.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -668,7 +668,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1260,7 +1260,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 00/00 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1445,7 +1445,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -2878,7 +2878,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} @@ -4533,7 +4533,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} @@ -4929,7 +4929,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} @@ -5986,7 +5986,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -6418,7 +6418,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} @@ -6635,7 +6635,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u6536\u96C6\u5956\u52B1" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -7383,7 +7383,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} @@ -8165,7 +8165,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -9289,7 +9289,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u901A\u884C\u8BC1" + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -9548,7 +9548,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaa + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -9690,7 +9690,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} @@ -9918,7 +9918,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} @@ -10862,7 +10862,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} @@ -11310,7 +11310,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6c44c307d57c9417085df33db10b886d, 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} @@ -11743,7 +11743,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} @@ -13573,7 +13573,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: aaaaaaaaaaaa + 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/shop/introduct_pop_ui.prefab b/Assets/prefabs/ui/shop/introduct_pop_ui.prefab index 8fbaec66e..7302d6ca1 100644 --- a/Assets/prefabs/ui/shop/introduct_pop_ui.prefab +++ b/Assets/prefabs/ui/shop/introduct_pop_ui.prefab @@ -1169,7 +1169,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: $1.99 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: b0c1339d1d91a8846affd442449dbf31, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 2e0b5790ea0ce0a4eb6bf1b8b43a6bda, type: 2}