diff --git a/Assets/lua/app/ui/activity/seven_day/seven_day_ui.lua.bytes b/Assets/lua/app/ui/activity/seven_day/seven_day_ui.lua.bytes index 253d48423..5330f5534 100644 Binary files a/Assets/lua/app/ui/activity/seven_day/seven_day_ui.lua.bytes and b/Assets/lua/app/ui/activity/seven_day/seven_day_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 4e73c8fcb..b69be3f37 100644 Binary files a/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes and b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/activity/seven_day/seven_day_data.lua.bytes b/Assets/lua/app/userdata/activity/seven_day/seven_day_data.lua.bytes index 5a15e30e5..777935866 100644 Binary files a/Assets/lua/app/userdata/activity/seven_day/seven_day_data.lua.bytes and b/Assets/lua/app/userdata/activity/seven_day/seven_day_data.lua.bytes differ diff --git a/Assets/prefabs/ui/main_city/main_ui.prefab b/Assets/prefabs/ui/main_city/main_ui.prefab index 717061358..cc2227864 100644 --- a/Assets/prefabs/ui/main_city/main_ui.prefab +++ b/Assets/prefabs/ui/main_city/main_ui.prefab @@ -196,6 +196,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3759312271480939732} + - component: {fileID: 194478480071948654} + - component: {fileID: 1536300789990723014} + - component: {fileID: 4350369814996921751} m_Layer: 5 m_Name: arrow_node m_TagString: Untagged @@ -223,6 +226,47 @@ RectTransform: m_AnchoredPosition: {x: 73, y: 306} m_SizeDelta: {x: 46, y: 30} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &194478480071948654 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257711046301672784} + m_CullTransparentMesh: 1 +--- !u!114 &1536300789990723014 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257711046301672784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &4350369814996921751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 257711046301672784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &751691943515882629 GameObject: m_ObjectHideFlags: 0 @@ -1625,7 +1669,6 @@ GameObject: - component: {fileID: 7530826278446483045} - component: {fileID: 2349232285570761603} - component: {fileID: 6546940311411841878} - - component: {fileID: 5478110205316689214} m_Layer: 5 m_Name: arrow m_TagString: Untagged @@ -1640,7 +1683,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5294495763243238445} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] @@ -1674,7 +1717,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: @@ -1690,19 +1733,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!114 &5478110205316689214 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5294495763243238445} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} - m_Name: - m_EditorClassIdentifier: - IsShowClickAnimation: 1 --- !u!1 &5385636119876016052 GameObject: m_ObjectHideFlags: 0 @@ -4333,6 +4363,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1699708307813134699} + - component: {fileID: 2339444749042050008} + - component: {fileID: 7515323960719163493} + - component: {fileID: 9005961485382989712} m_Layer: 5 m_Name: arrow_node m_TagString: Untagged @@ -4360,6 +4393,47 @@ RectTransform: m_AnchoredPosition: {x: -73, y: 306} m_SizeDelta: {x: 46, y: 30} m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2339444749042050008 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8938921301978850777} + m_CullTransparentMesh: 1 +--- !u!114 &7515323960719163493 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8938921301978850777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &9005961485382989712 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8938921301978850777} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 --- !u!1 &8973501236370705617 GameObject: m_ObjectHideFlags: 0 @@ -4610,16 +4684,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &1059977412716825216 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 1518043736896497656} - m_PrefabAsset: {fileID: 0} --- !u!224 &4460309012350241894 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 1518043736896497656} m_PrefabAsset: {fileID: 0} +--- !u!1 &1059977412716825216 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 1518043736896497656} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4803769959397203555 PrefabInstance: m_ObjectHideFlags: 0 @@ -4888,16 +4962,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4f7cf840d6e73e14781807788b817568, type: 3} ---- !u!1 &6842980704613305899 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} - m_PrefabInstance: {fileID: 4995549557732434771} - m_PrefabAsset: {fileID: 0} --- !u!224 &7900683791719762125 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 2951863086470196126, guid: 4f7cf840d6e73e14781807788b817568, type: 3} m_PrefabInstance: {fileID: 4995549557732434771} m_PrefabAsset: {fileID: 0} +--- !u!1 &6842980704613305899 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1991971382385470840, guid: 4f7cf840d6e73e14781807788b817568, type: 3} + m_PrefabInstance: {fileID: 4995549557732434771} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7717335971750466713 PrefabInstance: m_ObjectHideFlags: 0 @@ -5943,16 +6017,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} ---- !u!224 &2195415561721556952 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8461932745927490369, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} - m_PrefabInstance: {fileID: 7717335971750466713} - m_PrefabAsset: {fileID: 0} --- !u!1 &4044924788262064527 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} m_PrefabInstance: {fileID: 7717335971750466713} m_PrefabAsset: {fileID: 0} +--- !u!224 &2195415561721556952 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8461932745927490369, guid: 1a4d05e9cc9c18e47a5e28181be5197e, type: 3} + m_PrefabInstance: {fileID: 7717335971750466713} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8329023202578667452 PrefabInstance: m_ObjectHideFlags: 0 @@ -6058,13 +6132,13 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} ---- !u!1 &2354727283849138858 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} - m_PrefabInstance: {fileID: 8329023202578667452} - m_PrefabAsset: {fileID: 0} --- !u!224 &502275081594006781 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 8461932745927490369, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} m_PrefabInstance: {fileID: 8329023202578667452} m_PrefabAsset: {fileID: 0} +--- !u!1 &2354727283849138858 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5997397792976241942, guid: ffd4741b3d6d4b24791c2c141760266c, type: 3} + m_PrefabInstance: {fileID: 8329023202578667452} + m_PrefabAsset: {fileID: 0}