diff --git a/Assets/lua/app/config/attr.lua.bytes b/Assets/lua/app/config/attr.lua.bytes index dbcf10dba..b45e3847b 100644 Binary files a/Assets/lua/app/config/attr.lua.bytes and b/Assets/lua/app/config/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/cn/attr.lua.bytes b/Assets/lua/app/config/strings/cn/attr.lua.bytes index 72e987fb2..9f65f6bc7 100644 Binary files a/Assets/lua/app/config/strings/cn/attr.lua.bytes and b/Assets/lua/app/config/strings/cn/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/de/attr.lua.bytes b/Assets/lua/app/config/strings/de/attr.lua.bytes index 4943a558c..58fb3c1c3 100644 Binary files a/Assets/lua/app/config/strings/de/attr.lua.bytes and b/Assets/lua/app/config/strings/de/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/en/attr.lua.bytes b/Assets/lua/app/config/strings/en/attr.lua.bytes index b9c87d9a2..2370748a5 100644 Binary files a/Assets/lua/app/config/strings/en/attr.lua.bytes and b/Assets/lua/app/config/strings/en/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/es/attr.lua.bytes b/Assets/lua/app/config/strings/es/attr.lua.bytes index 7a7ba3f96..49ec59994 100644 Binary files a/Assets/lua/app/config/strings/es/attr.lua.bytes and b/Assets/lua/app/config/strings/es/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/fr/attr.lua.bytes b/Assets/lua/app/config/strings/fr/attr.lua.bytes index 2d09fa963..fdc5ab7cd 100644 Binary files a/Assets/lua/app/config/strings/fr/attr.lua.bytes and b/Assets/lua/app/config/strings/fr/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/id/attr.lua.bytes b/Assets/lua/app/config/strings/id/attr.lua.bytes index d721bf70f..b865564be 100644 Binary files a/Assets/lua/app/config/strings/id/attr.lua.bytes and b/Assets/lua/app/config/strings/id/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ja/attr.lua.bytes b/Assets/lua/app/config/strings/ja/attr.lua.bytes index 3a24bdca1..a7b81c840 100644 Binary files a/Assets/lua/app/config/strings/ja/attr.lua.bytes and b/Assets/lua/app/config/strings/ja/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ko/attr.lua.bytes b/Assets/lua/app/config/strings/ko/attr.lua.bytes index 4d48248b6..441cf2e7f 100644 Binary files a/Assets/lua/app/config/strings/ko/attr.lua.bytes and b/Assets/lua/app/config/strings/ko/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/pt/attr.lua.bytes b/Assets/lua/app/config/strings/pt/attr.lua.bytes index a33e569e2..80e426eaf 100644 Binary files a/Assets/lua/app/config/strings/pt/attr.lua.bytes and b/Assets/lua/app/config/strings/pt/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/ru/attr.lua.bytes b/Assets/lua/app/config/strings/ru/attr.lua.bytes index 85ff07870..86bbe97d8 100644 Binary files a/Assets/lua/app/config/strings/ru/attr.lua.bytes and b/Assets/lua/app/config/strings/ru/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/th/attr.lua.bytes b/Assets/lua/app/config/strings/th/attr.lua.bytes index 1bc78d2f0..3730246b8 100644 Binary files a/Assets/lua/app/config/strings/th/attr.lua.bytes and b/Assets/lua/app/config/strings/th/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/vi/attr.lua.bytes b/Assets/lua/app/config/strings/vi/attr.lua.bytes index 035c5c2a3..a20d9d27b 100644 Binary files a/Assets/lua/app/config/strings/vi/attr.lua.bytes and b/Assets/lua/app/config/strings/vi/attr.lua.bytes differ diff --git a/Assets/lua/app/config/strings/zh/attr.lua.bytes b/Assets/lua/app/config/strings/zh/attr.lua.bytes index f309891f8..013439192 100644 Binary files a/Assets/lua/app/config/strings/zh/attr.lua.bytes and b/Assets/lua/app/config/strings/zh/attr.lua.bytes differ diff --git a/Assets/lua/app/module/summon/summon_manager.lua.bytes b/Assets/lua/app/module/summon/summon_manager.lua.bytes index 5b7be3ef2..78e583bf5 100644 Binary files a/Assets/lua/app/module/summon/summon_manager.lua.bytes and b/Assets/lua/app/module/summon/summon_manager.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_seven_day_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_seven_day_cell.lua.bytes index ec425af68..0897ac341 100644 Binary files a/Assets/lua/app/ui/main_city/cell/side_bar_seven_day_cell.lua.bytes and b/Assets/lua/app/ui/main_city/cell/side_bar_seven_day_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_seven_day_cell_2.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_seven_day_cell_2.lua.bytes index 92554abc6..ddc4227a6 100644 Binary files a/Assets/lua/app/ui/main_city/cell/side_bar_seven_day_cell_2.lua.bytes and b/Assets/lua/app/ui/main_city/cell/side_bar_seven_day_cell_2.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/cell/summon_shop_cell.lua.bytes b/Assets/lua/app/ui/summon/cell/summon_shop_cell.lua.bytes index 3c56f25a7..c1ff5727e 100644 Binary files a/Assets/lua/app/ui/summon/cell/summon_shop_cell.lua.bytes and b/Assets/lua/app/ui/summon/cell/summon_shop_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes index 9f7ec30dd..e2d61e388 100644 Binary files a/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_shop_box_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_shop_box_ui.lua.bytes index 99292f870..10ff0849b 100644 Binary files a/Assets/lua/app/ui/summon/summon_shop_box_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_shop_box_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/summon/summon_shop_ui.lua.bytes b/Assets/lua/app/ui/summon/summon_shop_ui.lua.bytes index 596c8c989..4f4d26bb1 100644 Binary files a/Assets/lua/app/ui/summon/summon_shop_ui.lua.bytes and b/Assets/lua/app/ui/summon/summon_shop_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes index c99558d21..d816ea488 100644 Binary files a/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes and b/Assets/lua/app/ui/talent/talent_main_ui.lua.bytes differ diff --git a/Assets/lua/app/userdata/sign/sign_week_data.lua.bytes b/Assets/lua/app/userdata/sign/sign_week_data.lua.bytes index 060897179..e879c0c24 100644 Binary files a/Assets/lua/app/userdata/sign/sign_week_data.lua.bytes and b/Assets/lua/app/userdata/sign/sign_week_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/talent/talent_data.lua.bytes b/Assets/lua/app/userdata/talent/talent_data.lua.bytes index 442794088..c688ae586 100644 Binary files a/Assets/lua/app/userdata/talent/talent_data.lua.bytes and b/Assets/lua/app/userdata/talent/talent_data.lua.bytes differ diff --git a/Assets/prefabs/ui/common/currency_cell.prefab b/Assets/prefabs/ui/common/currency_cell.prefab index 87500eaf5..7c460f9c9 100644 --- a/Assets/prefabs/ui/common/currency_cell.prefab +++ b/Assets/prefabs/ui/common/currency_cell.prefab @@ -690,7 +690,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 4ab1c4c9276157d4e9a5c3b3c29ccfab, type: 3} + m_Sprite: {fileID: 21300000, guid: 5065219a9ba54e745b022463cac9dfbf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/prefabs/ui/summon/cell/summon_shop_cell.prefab b/Assets/prefabs/ui/summon/cell/summon_shop_cell.prefab index e655f637e..598df04aa 100644 --- a/Assets/prefabs/ui/summon/cell/summon_shop_cell.prefab +++ b/Assets/prefabs/ui/summon/cell/summon_shop_cell.prefab @@ -807,7 +807,7 @@ MonoBehaviour: m_fontColor32: serializedVersion: 2 rgba: 4285164255 - m_fontColor: {r: 0.8745098, g: 0.41568628, b: 0.41568628, a: 1} + m_fontColor: {r: 1, g: 1, b: 1, a: 1} m_enableVertexGradient: 0 m_colorMode: 3 m_fontColorGradient: diff --git a/Assets/prefabs/ui/summon/summon_shop_box_ui.prefab b/Assets/prefabs/ui/summon/summon_shop_box_ui.prefab index 03bdede44..3dc2394ec 100644 --- a/Assets/prefabs/ui/summon/summon_shop_box_ui.prefab +++ b/Assets/prefabs/ui/summon/summon_shop_box_ui.prefab @@ -1880,10 +1880,10 @@ MonoBehaviour: hashName: 627505955 objectType: 0 gameObject: {fileID: 6910680105803097448} - - name: summon_shop_box_ui.content.info_node.summon_shop_cell - hashName: 2477611672 + - name: summon_shop_box_ui.content.info_node.reward_cell + hashName: 3877842471 objectType: 1 - gameObject: {fileID: 5561514276413126352} + gameObject: {fileID: 7167949276673568418} - name: summon_shop_box_ui.content.info_node.data_node.tx_name hashName: 1579166692 objectType: 0 @@ -2153,7 +2153,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6555925568945685597} + - {fileID: 2154226841424087932} - {fileID: 5020902832740443867} m_Father: {fileID: 3389846184421536484} m_RootOrder: 2 @@ -2502,128 +2502,112 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1001 &45520653845058345 +--- !u!1001 &4486626501723405096 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 3649236046540359187} m_Modifications: - - target: {fileID: 5588913328215746041, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} - propertyPath: m_Name - value: summon_shop_cell - objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMax.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchorMin.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.x - value: 162 + value: 150 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_SizeDelta.y - value: 226 + value: 150 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} - propertyPath: m_LocalScale.x - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} - propertyPath: m_LocalScale.y - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} - propertyPath: m_LocalScale.z - value: 0.7 - objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.x value: -193 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} + - target: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} - propertyPath: m_ConstrainProportionsScale - value: 1 + - target: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + propertyPath: m_Name + value: reward_cell objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} ---- !u!1 &5561514276413126352 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 5588913328215746041, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} - m_PrefabInstance: {fileID: 45520653845058345} - m_PrefabAsset: {fileID: 0} ---- !u!224 &6555925568945685597 stripped + m_SourcePrefab: {fileID: 100100000, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} +--- !u!224 &2154226841424087932 stripped RectTransform: - m_CorrespondingSourceObject: {fileID: 6510774986662762356, guid: 070b9c9bedde948069e67a0241bdfd8e, type: 3} - m_PrefabInstance: {fileID: 45520653845058345} + m_CorrespondingSourceObject: {fileID: 2568998946116628564, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 4486626501723405096} + m_PrefabAsset: {fileID: 0} +--- !u!1 &7167949276673568418 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6717709196054680970, guid: acb32db3e8df6a64c9fe1f002bc9c871, type: 3} + m_PrefabInstance: {fileID: 4486626501723405096} m_PrefabAsset: {fileID: 0} --- !u!1001 &5577408846719510656 PrefabInstance: diff --git a/Assets/prefabs/ui/talent/talent_ui.prefab b/Assets/prefabs/ui/talent/talent_ui.prefab index 1ff35d5ef..434be496e 100644 --- a/Assets/prefabs/ui/talent/talent_ui.prefab +++ b/Assets/prefabs/ui/talent/talent_ui.prefab @@ -984,7 +984,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} 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: @@ -1260,7 +1260,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} 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: @@ -1638,7 +1638,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} 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: @@ -2071,7 +2071,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} 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: