diff --git a/Assets/arts/effects/models/Sphere_tom_0002-3.FBX b/Assets/arts/effects/models/sphere_tom_0002_3.FBX similarity index 100% rename from Assets/arts/effects/models/Sphere_tom_0002-3.FBX rename to Assets/arts/effects/models/sphere_tom_0002_3.FBX diff --git a/Assets/arts/effects/models/Sphere_tom_0002-3.FBX.meta b/Assets/arts/effects/models/sphere_tom_0002_3.FBX.meta similarity index 100% rename from Assets/arts/effects/models/Sphere_tom_0002-3.FBX.meta rename to Assets/arts/effects/models/sphere_tom_0002_3.FBX.meta diff --git a/Assets/prefabs/ui/bounty/bounty_main_ui.prefab b/Assets/prefabs/ui/bounty/bounty_main_ui.prefab index 97aec23e6..04f06f6ba 100644 --- a/Assets/prefabs/ui/bounty/bounty_main_ui.prefab +++ b/Assets/prefabs/ui/bounty/bounty_main_ui.prefab @@ -2547,7 +2547,7 @@ GameObject: - component: {fileID: 3732721124798958740} - component: {fileID: 6587938878064410669} - component: {fileID: 884866485903116753} - m_Layer: 0 + m_Layer: 5 m_Name: bg_4 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/common/hero_cell.prefab b/Assets/prefabs/ui/common/hero_cell.prefab index 3bd1e94ad..a87eb5708 100644 --- a/Assets/prefabs/ui/common/hero_cell.prefab +++ b/Assets/prefabs/ui/common/hero_cell.prefab @@ -840,7 +840,7 @@ GameObject: - component: {fileID: 4885259659328398088} - component: {fileID: 4007319684377000845} - component: {fileID: 7782727585219865578} - m_Layer: 0 + m_Layer: 5 m_Name: dec m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/common/message_box.prefab b/Assets/prefabs/ui/common/message_box.prefab index 16213421f..735906343 100644 --- a/Assets/prefabs/ui/common/message_box.prefab +++ b/Assets/prefabs/ui/common/message_box.prefab @@ -256,7 +256,7 @@ GameObject: - component: {fileID: 3270613892521539612} - component: {fileID: 8754930572931908129} - component: {fileID: 4752099959868423494} - m_Layer: 0 + m_Layer: 5 m_Name: bg_2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1513,7 +1513,7 @@ GameObject: - component: {fileID: 3161288776437297628} - component: {fileID: 9063726392972117621} - component: {fileID: 2907489567658645789} - m_Layer: 0 + m_Layer: 5 m_Name: line_img m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/hero/hero_detail_ui.prefab b/Assets/prefabs/ui/hero/hero_detail_ui.prefab index 1644fa70f..bab0cf2be 100644 --- a/Assets/prefabs/ui/hero/hero_detail_ui.prefab +++ b/Assets/prefabs/ui/hero/hero_detail_ui.prefab @@ -4660,7 +4660,7 @@ GameObject: - component: {fileID: 6306019015938117602} - component: {fileID: 2326150237526586076} - component: {fileID: 5039050154340744362} - m_Layer: 0 + m_Layer: 5 m_Name: bg_1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5437,7 +5437,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/idle/idle_drop_ui.prefab b/Assets/prefabs/ui/idle/idle_drop_ui.prefab index 874af8b3a..f19c1922a 100644 --- a/Assets/prefabs/ui/idle/idle_drop_ui.prefab +++ b/Assets/prefabs/ui/idle/idle_drop_ui.prefab @@ -179,7 +179,7 @@ GameObject: - component: {fileID: 2374291485168383990} - component: {fileID: 7889504456860879318} - component: {fileID: 8370875507356587544} - m_Layer: 0 + m_Layer: 5 m_Name: time_dec m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/idle/idle_quick_drop_ui.prefab b/Assets/prefabs/ui/idle/idle_quick_drop_ui.prefab index 60e69472b..18953f58e 100644 --- a/Assets/prefabs/ui/idle/idle_quick_drop_ui.prefab +++ b/Assets/prefabs/ui/idle/idle_quick_drop_ui.prefab @@ -1692,7 +1692,7 @@ GameObject: - component: {fileID: 758361608683712964} - component: {fileID: 2297742076330956749} - component: {fileID: 3386557799625179306} - m_Layer: 0 + m_Layer: 5 m_Name: line_img m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/mail/mail_ui.prefab b/Assets/prefabs/ui/mail/mail_ui.prefab index b574cad8c..37ed70214 100644 --- a/Assets/prefabs/ui/mail/mail_ui.prefab +++ b/Assets/prefabs/ui/mail/mail_ui.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8599431933218491982} - component: {fileID: 8956605612634524907} - component: {fileID: 8344347649017717296} - m_Layer: 0 + m_Layer: 5 m_Name: img_3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -1715,7 +1715,7 @@ GameObject: - component: {fileID: 9162892671307415469} - component: {fileID: 1692073640265036207} - component: {fileID: 8304920091416406656} - m_Layer: 0 + m_Layer: 5 m_Name: line_1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -2335,7 +2335,7 @@ GameObject: - component: {fileID: 361526074445244080} - component: {fileID: 1540599493283783261} - component: {fileID: 342700308188417555} - m_Layer: 0 + m_Layer: 5 m_Name: line_2 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/main_city/chapter_comp.prefab b/Assets/prefabs/ui/main_city/chapter_comp.prefab index 94c21d522..44188ee77 100644 --- a/Assets/prefabs/ui/main_city/chapter_comp.prefab +++ b/Assets/prefabs/ui/main_city/chapter_comp.prefab @@ -1229,7 +1229,7 @@ GameObject: - component: {fileID: 3180571760892473508} - component: {fileID: 2506412288112681353} - component: {fileID: 8969758610318463893} - m_Layer: 0 + m_Layer: 5 m_Name: bg m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 8d176bf86..cfaf0e038 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -6481,6 +6481,10 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 8909275691251908681, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} + propertyPath: m_Material + value: + objectReference: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} - target: {fileID: 8948910253495964729, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} propertyPath: m_Layer value: 5 diff --git a/Assets/prefabs/ui/setting/account_delete_ui.prefab b/Assets/prefabs/ui/setting/account_delete_ui.prefab index 82747c375..f63823b94 100644 --- a/Assets/prefabs/ui/setting/account_delete_ui.prefab +++ b/Assets/prefabs/ui/setting/account_delete_ui.prefab @@ -242,7 +242,7 @@ GameObject: - component: {fileID: 2803354640743852975} - component: {fileID: 4256089847539201819} - component: {fileID: 4351789992757987905} - m_Layer: 0 + m_Layer: 5 m_Name: line_img 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 3c3dc05ea..4958a67c7 100644 --- a/Assets/prefabs/ui/setting/game_setting_ui.prefab +++ b/Assets/prefabs/ui/setting/game_setting_ui.prefab @@ -553,7 +553,7 @@ GameObject: - component: {fileID: 8413788933690009932} - component: {fileID: 716613596956073156} - component: {fileID: 7900145122003050000} - m_Layer: 0 + m_Layer: 5 m_Name: delete_btn m_TagString: Untagged m_Icon: {fileID: 0} @@ -2867,7 +2867,7 @@ GameObject: - component: {fileID: 4092530555851946761} - component: {fileID: 2399751130884676767} - component: {fileID: 945793567498757219} - m_Layer: 0 + m_Layer: 5 m_Name: line_img m_TagString: Untagged m_Icon: {fileID: 0} @@ -3380,7 +3380,7 @@ GameObject: - component: {fileID: 6170264028509949211} - component: {fileID: 5907902595382637284} - component: {fileID: 3597702785930511532} - m_Layer: 0 + m_Layer: 5 m_Name: dec_img m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/shop/shop_comp.prefab b/Assets/prefabs/ui/shop/shop_comp.prefab index 5fbd77d59..728233167 100644 --- a/Assets/prefabs/ui/shop/shop_comp.prefab +++ b/Assets/prefabs/ui/shop/shop_comp.prefab @@ -4826,7 +4826,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/task/task_main_ui.prefab b/Assets/prefabs/ui/task/task_main_ui.prefab index 52a257237..ed8c417a1 100644 --- a/Assets/prefabs/ui/task/task_main_ui.prefab +++ b/Assets/prefabs/ui/task/task_main_ui.prefab @@ -199,7 +199,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 7/10 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -1234,7 +1234,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 22 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} @@ -3025,7 +3025,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 1500/2000 + m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} @@ -4028,7 +4028,7 @@ GameObject: - component: {fileID: 1594777999222045530} - component: {fileID: 2602550201923722890} - component: {fileID: 4548724399866026536} - m_Layer: 0 + m_Layer: 5 m_Name: bg_2 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/tips/help_tips.prefab b/Assets/prefabs/ui/tips/help_tips.prefab index dc1ec1356..abe731d5f 100644 --- a/Assets/prefabs/ui/tips/help_tips.prefab +++ b/Assets/prefabs/ui/tips/help_tips.prefab @@ -86,7 +86,7 @@ GameObject: - component: {fileID: 2617844004920798486} - component: {fileID: 2296537736435550197} - component: {fileID: 6795071978768645940} - m_Layer: 0 + m_Layer: 5 m_Name: line_2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -447,7 +447,7 @@ GameObject: - component: {fileID: 1030614013984921557} - component: {fileID: 885008338180051237} - component: {fileID: 6997479806264691654} - m_Layer: 0 + m_Layer: 5 m_Name: line_1 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/prefabs/ui/tips/hero_fragment_tips.prefab b/Assets/prefabs/ui/tips/hero_fragment_tips.prefab index bfe351971..1c9cf8312 100644 --- a/Assets/prefabs/ui/tips/hero_fragment_tips.prefab +++ b/Assets/prefabs/ui/tips/hero_fragment_tips.prefab @@ -252,7 +252,7 @@ GameObject: - component: {fileID: 752781333676841086} - component: {fileID: 6832376699332779432} - component: {fileID: 1070892013070885521} - m_Layer: 0 + m_Layer: 5 m_Name: close_btn m_TagString: Untagged m_Icon: {fileID: 0} @@ -1030,7 +1030,7 @@ GameObject: - component: {fileID: 3874643551289376575} - component: {fileID: 6685309345062798972} - component: {fileID: 5238847718583667600} - m_Layer: 0 + m_Layer: 5 m_Name: bg_qlt m_TagString: Untagged m_Icon: {fileID: 0}