diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index 9fa219165..6e89e361d 100644 Binary files a/Assets/lua/app/common/bi_report.lua.bytes and b/Assets/lua/app/common/bi_report.lua.bytes differ diff --git a/Assets/lua/app/common/pay_manager.lua.bytes b/Assets/lua/app/common/pay_manager.lua.bytes index b07fbf3f6..fbd3b734d 100644 Binary files a/Assets/lua/app/common/pay_manager.lua.bytes and b/Assets/lua/app/common/pay_manager.lua.bytes differ diff --git a/Assets/lua/app/common/white_res_manager.lua.bytes b/Assets/lua/app/common/white_res_manager.lua.bytes index 0cae74b3b..7ea98c9e5 100644 Binary files a/Assets/lua/app/common/white_res_manager.lua.bytes and b/Assets/lua/app/common/white_res_manager.lua.bytes differ diff --git a/Assets/lua/app/global/global_const.lua.bytes b/Assets/lua/app/global/global_const.lua.bytes index 19ce56295..56552893c 100644 Binary files a/Assets/lua/app/global/global_const.lua.bytes and b/Assets/lua/app/global/global_const.lua.bytes differ diff --git a/Assets/lua/app/module/activity/act_sprint/act_sprint_const.lua.bytes b/Assets/lua/app/module/activity/act_sprint/act_sprint_const.lua.bytes index 4f142eb51..a8e107667 100644 Binary files a/Assets/lua/app/module/activity/act_sprint/act_sprint_const.lua.bytes and b/Assets/lua/app/module/activity/act_sprint/act_sprint_const.lua.bytes differ diff --git a/Assets/lua/app/module/shop/shop_const.lua.bytes b/Assets/lua/app/module/shop/shop_const.lua.bytes index 92f09e3bc..c52ff375c 100644 Binary files a/Assets/lua/app/module/shop/shop_const.lua.bytes and b/Assets/lua/app/module/shop/shop_const.lua.bytes differ diff --git a/Assets/lua/app/module/shop/shop_manager.lua.bytes b/Assets/lua/app/module/shop/shop_manager.lua.bytes index 1ea1c41bb..9dc52f8ef 100644 Binary files a/Assets/lua/app/module/shop/shop_manager.lua.bytes and b/Assets/lua/app/module/shop/shop_manager.lua.bytes differ diff --git a/Assets/lua/app/module/sign/sign_const.lua.bytes b/Assets/lua/app/module/sign/sign_const.lua.bytes index 2e9aa58f0..e8b6af1a8 100644 Binary files a/Assets/lua/app/module/sign/sign_const.lua.bytes and b/Assets/lua/app/module/sign/sign_const.lua.bytes differ diff --git a/Assets/lua/app/module/sign/sign_manager.lua.bytes b/Assets/lua/app/module/sign/sign_manager.lua.bytes index ea88da28f..a5582b7ec 100644 Binary files a/Assets/lua/app/module/sign/sign_manager.lua.bytes and b/Assets/lua/app/module/sign/sign_manager.lua.bytes differ diff --git a/Assets/lua/app/proto/proto_msg_type.lua.bytes b/Assets/lua/app/proto/proto_msg_type.lua.bytes index 524d0c65e..e9473cee2 100644 Binary files a/Assets/lua/app/proto/proto_msg_type.lua.bytes and b/Assets/lua/app/proto/proto_msg_type.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua.bytes b/Assets/lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua.bytes index 6ffecc6b9..2a41edc4f 100644 Binary files a/Assets/lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua.bytes and b/Assets/lua/app/ui/activity/act_sprint_summon_all/act_main_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/common/act_base_ui.lua.bytes b/Assets/lua/app/ui/activity/common/act_base_ui.lua.bytes index 4cbb9fb55..1cd8c69d1 100644 Binary files a/Assets/lua/app/ui/activity/common/act_base_ui.lua.bytes and b/Assets/lua/app/ui/activity/common/act_base_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/common/cell/act_page_btn_cell.lua.bytes b/Assets/lua/app/ui/activity/common/cell/act_page_btn_cell.lua.bytes new file mode 100644 index 000000000..7cd6e22c7 Binary files /dev/null and b/Assets/lua/app/ui/activity/common/cell/act_page_btn_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/common/cell/act_page_btn_cell.lua.bytes.meta b/Assets/lua/app/ui/activity/common/cell/act_page_btn_cell.lua.bytes.meta new file mode 100644 index 000000000..c7cce930c --- /dev/null +++ b/Assets/lua/app/ui/activity/common/cell/act_page_btn_cell.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9017f786fa1de43589436b820b159d96 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes b/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes new file mode 100644 index 000000000..1f4e96f00 Binary files /dev/null and b/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes.meta b/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes.meta new file mode 100644 index 000000000..87ff38fb6 --- /dev/null +++ b/Assets/lua/app/ui/activity/common/comp/act_page_btns_comp.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6343aef3435b24dfcac79fe51f7b9c66 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/ui/arena/arena_recent_battle_ui.lua.bytes b/Assets/lua/app/ui/arena/arena_recent_battle_ui.lua.bytes index 64b5b4e79..57a77ef4c 100644 Binary files a/Assets/lua/app/ui/arena/arena_recent_battle_ui.lua.bytes and b/Assets/lua/app/ui/arena/arena_recent_battle_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/arena/cell/arena_rank_cell.lua.bytes b/Assets/lua/app/ui/arena/cell/arena_rank_cell.lua.bytes index 6e4cb632d..6235b857e 100644 Binary files a/Assets/lua/app/ui/arena/cell/arena_rank_cell.lua.bytes and b/Assets/lua/app/ui/arena/cell/arena_rank_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/common/cell/bounty_reward_cell.lua.bytes b/Assets/lua/app/ui/common/cell/bounty_reward_cell.lua.bytes index fe6dfcf90..321179a2a 100644 Binary files a/Assets/lua/app/ui/common/cell/bounty_reward_cell.lua.bytes and b/Assets/lua/app/ui/common/cell/bounty_reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/dungeon_rune/cell/rank_cell.lua.bytes b/Assets/lua/app/ui/dungeon_rune/cell/rank_cell.lua.bytes index e9c52d362..42dc24b5c 100644 Binary files a/Assets/lua/app/ui/dungeon_rune/cell/rank_cell.lua.bytes and b/Assets/lua/app/ui/dungeon_rune/cell/rank_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/dungeon_rune/dungeon_rune_rank_ui.lua.bytes b/Assets/lua/app/ui/dungeon_rune/dungeon_rune_rank_ui.lua.bytes index 76591a968..d211b3a59 100644 Binary files a/Assets/lua/app/ui/dungeon_rune/dungeon_rune_rank_ui.lua.bytes and b/Assets/lua/app/ui/dungeon_rune/dungeon_rune_rank_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/fund/cell/fund_chapter_cell.lua.bytes b/Assets/lua/app/ui/fund/cell/fund_chapter_cell.lua.bytes index 925090698..2ec945168 100644 Binary files a/Assets/lua/app/ui/fund/cell/fund_chapter_cell.lua.bytes and b/Assets/lua/app/ui/fund/cell/fund_chapter_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/cell/daily_cell.lua.bytes b/Assets/lua/app/ui/shop/cell/daily_cell.lua.bytes index 531c979ea..efcdb9106 100644 Binary files a/Assets/lua/app/ui/shop/cell/daily_cell.lua.bytes and b/Assets/lua/app/ui/shop/cell/daily_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/cell/daily_main_cell.lua.bytes b/Assets/lua/app/ui/shop/cell/daily_main_cell.lua.bytes index 932a2a7c0..93dc51415 100644 Binary files a/Assets/lua/app/ui/shop/cell/daily_main_cell.lua.bytes and b/Assets/lua/app/ui/shop/cell/daily_main_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/shop_comp.lua.bytes b/Assets/lua/app/ui/shop/shop_comp.lua.bytes index 49d56f31c..4288d170a 100644 Binary files a/Assets/lua/app/ui/shop/shop_comp.lua.bytes and b/Assets/lua/app/ui/shop/shop_comp.lua.bytes differ diff --git a/Assets/lua/app/ui/sign/sign_main_ui.lua.bytes b/Assets/lua/app/ui/sign/sign_main_ui.lua.bytes index dc3ec27ea..e3df634dc 100644 Binary files a/Assets/lua/app/ui/sign/sign_main_ui.lua.bytes and b/Assets/lua/app/ui/sign/sign_main_ui.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 1fb6e9793..76fc6342f 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/userdata/chapter/chapter_data.lua.bytes b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes index a7e09e5af..903bd638f 100644 Binary files a/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes and b/Assets/lua/app/userdata/chapter/chapter_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/shop/shop_data.lua.bytes b/Assets/lua/app/userdata/shop/shop_data.lua.bytes index c6045b0e9..6b0eefdde 100644 Binary files a/Assets/lua/app/userdata/shop/shop_data.lua.bytes and b/Assets/lua/app/userdata/shop/shop_data.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 e879c0c24..4cc624b2a 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/prefabs/ui/activity/act_sprint/act_main_ui.prefab b/Assets/prefabs/ui/activity/act_sprint/act_main_ui.prefab index dcbb363f2..36c438139 100644 --- a/Assets/prefabs/ui/activity/act_sprint/act_main_ui.prefab +++ b/Assets/prefabs/ui/activity/act_sprint/act_main_ui.prefab @@ -248,9 +248,9 @@ RectTransform: m_Father: {fileID: 4349531562817866669} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 831, y: -61.5} m_SizeDelta: {x: 82, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2057813994765677949 @@ -706,9 +706,9 @@ RectTransform: m_Father: {fileID: 4349531562817866669} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 615, y: -61.5} m_SizeDelta: {x: 82, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &666668222579064595 @@ -1084,9 +1084,9 @@ RectTransform: m_Father: {fileID: 4349531562817866669} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 723, y: -61.5} m_SizeDelta: {x: 82, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4828405043808660680 @@ -1172,6 +1172,7 @@ RectTransform: m_Children: - {fileID: 2483068536922459637} - {fileID: 7164646245563373147} + - {fileID: 7758145191226327219} m_Father: {fileID: 8461932745927490369} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1753,6 +1754,10 @@ MonoBehaviour: hashName: 3734921565 objectType: 0 gameObject: {fileID: 2193199943518160406} + - name: act_main_ui.bottom.act_page_btns_comp + hashName: 3092751478 + objectType: 1 + gameObject: {fileID: 555587358427111133} --- !u!114 &2590985090857277675 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1802,9 +1807,9 @@ RectTransform: m_Father: {fileID: 4349531562817866669} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 939, y: -61.5} m_SizeDelta: {x: 82, y: 82} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8333402913837251867 @@ -2201,7 +2206,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &7164646245563373147 RectTransform: m_ObjectHideFlags: 0 @@ -2334,6 +2339,113 @@ MonoBehaviour: y: 0 width: 1 height: 1 +--- !u!1001 &1560251617308438447 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 6003606013773546669} + m_Modifications: + - target: {fileID: 1302375191361040754, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_Name + value: act_page_btns_comp + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_Pivot.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_AnchorMin.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_SizeDelta.x + value: 600 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} +--- !u!1 &555587358427111133 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1302375191361040754, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + m_PrefabInstance: {fileID: 1560251617308438447} + m_PrefabAsset: {fileID: 0} +--- !u!224 &7758145191226327219 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 9083012120132890396, guid: 03f3924c454f6fe4db655c120c3fd761, type: 3} + m_PrefabInstance: {fileID: 1560251617308438447} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4651145702072022789 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab b/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab new file mode 100644 index 000000000..32a89968e --- /dev/null +++ b/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab @@ -0,0 +1,613 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1302375191361040754 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9083012120132890396} + - component: {fileID: 1445982464306500563} + - component: {fileID: 6514017414582223789} + m_Layer: 5 + m_Name: act_page_btns_comp + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9083012120132890396 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302375191361040754} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 9194047554899445671} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 600, y: 0} + m_Pivot: {x: 1, y: 0.5} +--- !u!222 &1445982464306500563 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302375191361040754} + m_CullTransparentMesh: 1 +--- !u!114 &6514017414582223789 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1302375191361040754} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabList: + - name: act_page_btns_comp.scrollrect + hashName: 9928203 + objectType: 0 + gameObject: {fileID: 3615984651817403971} +--- !u!1 &1677554853772717491 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8112935395103594698} + m_Layer: 5 + m_Name: content + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8112935395103594698 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1677554853772717491} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 4334083368117370649} + m_Father: {fileID: 7719440301098242638} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 500, y: 126} + m_Pivot: {x: 0, y: 0.5} +--- !u!1 &2592010785549748608 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3788973291375176816} + - component: {fileID: 9189850266703300409} + - component: {fileID: 2223303875800091390} + m_Layer: 5 + m_Name: img_icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3788973291375176816 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2592010785549748608} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4334083368117370649} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 82, y: 82} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &9189850266703300409 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2592010785549748608} + m_CullTransparentMesh: 1 +--- !u!114 &2223303875800091390 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2592010785549748608} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 835eaa0553c15a74585908d5a00581bc, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3615984651817403971 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 9194047554899445671} + - component: {fileID: 1540558688298797478} + - component: {fileID: 1459722962689210173} + - component: {fileID: 5119168275471049971} + - component: {fileID: 4162683084529514510} + m_Layer: 5 + m_Name: scrollrect + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &9194047554899445671 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3615984651817403971} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7719440301098242638} + m_Father: {fileID: 9083012120132890396} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &1540558688298797478 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3615984651817403971} + m_CullTransparentMesh: 1 +--- !u!114 &1459722962689210173 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3615984651817403971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Content: {fileID: 8112935395103594698} + m_Horizontal: 1 + m_Vertical: 0 + m_MovementType: 1 + m_Elasticity: 0.1 + m_Inertia: 1 + m_DecelerationRate: 0.135 + m_ScrollSensitivity: 1 + m_Viewport: {fileID: 7719440301098242638} + m_HorizontalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 0} + m_HorizontalScrollbarVisibility: 2 + m_VerticalScrollbarVisibility: 2 + m_HorizontalScrollbarSpacing: -3 + m_VerticalScrollbarSpacing: -3 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &5119168275471049971 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3615984651817403971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e290255ba1add4ababd574322a0843c7, type: 3} + m_Name: + m_EditorClassIdentifier: + isDrag: 0 + contentTrans: {fileID: 8112935395103594698} + bfCell: {fileID: 8208313911170309913} + topRecoveryOffset: 0 + downRecoveryOffset: 0 + direction: 1 + reverse: 1 + cellWidth: 115 + cellHeight: 100 + perLineNum: 1 +--- !u!114 &4162683084529514510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3615984651817403971} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + 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} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &4113773380103993640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4334083368117370649} + - component: {fileID: 1212821554642823981} + - component: {fileID: 8208313911170309913} + - component: {fileID: 2545996303524596766} + - component: {fileID: 3719041507713495559} + - component: {fileID: 2366248158798549424} + m_Layer: 5 + m_Name: page_btn_cell + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4334083368117370649 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4113773380103993640} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3788973291375176816} + - {fileID: 6937228273386882435} + m_Father: {fileID: 8112935395103594698} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 41, y: -63} + m_SizeDelta: {x: 82, y: 82} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1212821554642823981 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4113773380103993640} + m_CullTransparentMesh: 1 +--- !u!114 &8208313911170309913 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4113773380103993640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2ff04a05639f474f85820cdf1f47de0, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2545996303524596766 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4113773380103993640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} + m_Name: + m_EditorClassIdentifier: + prefabList: + - name: page_btn_cell.img_icon + hashName: 230358062 + objectType: 0 + gameObject: {fileID: 2592010785549748608} + - name: page_btn_cell.tx_desc + hashName: 3981566867 + objectType: 0 + gameObject: {fileID: 6694130224144468640} +--- !u!114 &3719041507713495559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4113773380103993640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ea6cc73146e6042cdae5988a604bca31, type: 3} + m_Name: + m_EditorClassIdentifier: + 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} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &2366248158798549424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4113773380103993640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1069f9c1eb6f9475b8f98a4cbb9dfe01, type: 3} + m_Name: + m_EditorClassIdentifier: + IsShowClickAnimation: 1 +--- !u!1 &6619116913345739926 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7719440301098242638} + - component: {fileID: 6386505263712159452} + - component: {fileID: 9038620223661051092} + m_Layer: 5 + m_Name: viewport + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7719440301098242638 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6619116913345739926} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8112935395103594698} + m_Father: {fileID: 9194047554899445671} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6386505263712159452 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6619116913345739926} + m_CullTransparentMesh: 1 +--- !u!114 &9038620223661051092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6619116913345739926} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3312d7739989d2b4e91e6319e9a96d76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: {x: 0, y: 0, z: 0, w: 0} + m_Softness: {x: 0, y: 0} +--- !u!1 &6694130224144468640 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6937228273386882435} + - component: {fileID: 5888460103675332984} + - component: {fileID: 8098068619182030195} + m_Layer: 5 + m_Name: tx_desc + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6937228273386882435 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6694130224144468640} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4334083368117370649} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -30} + m_SizeDelta: {x: 90, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5888460103675332984 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6694130224144468640} + m_CullTransparentMesh: 1 +--- !u!114 &8098068619182030195 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6694130224144468640} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 8fbea6f32a7344f69af606d42e8d880a, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: d9526b8cb4bc030488db413ef429c6f9, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4291095295 + m_fontColor: {r: 1, g: 0.91764706, b: 0.76862746, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 24 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 15 + m_fontSizeMax: 24 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab.meta b/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab.meta new file mode 100755 index 000000000..e2c368218 --- /dev/null +++ b/Assets/prefabs/ui/activity/common/comp/act_page_btns_comp.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 03f3924c454f6fe4db655c120c3fd761 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: prefabs/ui/common/page_btns_comp.prefab.ab + assetBundleVariant: diff --git a/Assets/prefabs/ui/shop/first_recharge_ui.prefab b/Assets/prefabs/ui/shop/first_recharge_ui.prefab old mode 100755 new mode 100644 index aa3e49094..a7c50142c --- a/Assets/prefabs/ui/shop/first_recharge_ui.prefab +++ b/Assets/prefabs/ui/shop/first_recharge_ui.prefab @@ -204,7 +204,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: 01240f1da8af68349860a811fa2f6457, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -337,7 +337,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b1fe26318314b5d4da52c9eefa176586, type: 3} + m_Sprite: {fileID: 21300000, guid: 6fcfdf7ba1e7f4441a15bd5d888541d0, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -496,7 +496,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e46cb8c031067814da16a35a82676656, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -813,7 +813,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e46cb8c031067814da16a35a82676656, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1156,7 +1156,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e46cb8c031067814da16a35a82676656, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1380,7 +1380,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a72fd1071c9cbcc4c9840ef2845db942, type: 3} + m_Sprite: {fileID: 21300000, guid: 9bc39501344a8494daeaf1035cb736db, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1803,7 +1803,6 @@ GameObject: - component: {fileID: 1652254950293225014} - component: {fileID: 1225774943438592279} - component: {fileID: 4056711468675530278} - - component: {fileID: 4776551533327352939} m_Layer: 5 m_Name: first_recharge_ui m_TagString: Untagged @@ -1890,7 +1889,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 603618363c40f41f2a20bffd04da5c14, type: 3} m_Name: m_EditorClassIdentifier: - lis_AddObject: [] prefabList: - name: first_recharge_ui.btn_close hashName: 330425796 @@ -2028,21 +2026,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5997397792976241942} m_CullTransparentMesh: 1 ---- !u!114 &4776551533327352939 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5997397792976241942} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a9961f2693c0ea344aa81949924f05b7, type: 3} - m_Name: - m_EditorClassIdentifier: - globalInfoList: - - tx: {fileID: 6373113814354613879} - key: DIVINATION_DESC_7 --- !u!1 &6035634609215113555 GameObject: m_ObjectHideFlags: 0 @@ -2534,7 +2517,7 @@ MonoBehaviour: m_text: m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9d1aadd9ebaf54ce2b217ab8427fa0db, type: 2} - m_sharedMaterial: {fileID: 2100000, guid: e46cb8c031067814da16a35a82676656, type: 2} + m_sharedMaterial: {fileID: 2100000, guid: 09210edd46ea1463596717e00ea9e8be, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -3903,7 +3886,7 @@ PrefabInstance: - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: skeletonDataAsset value: - objectReference: {fileID: 11400000, guid: 6b97745c4db155b49a20323bea157efd, type: 2} + objectReference: {fileID: 0} - target: {fileID: 2505651998029909099, guid: 4f7cf840d6e73e14781807788b817568, type: 3} propertyPath: startingAnimation value: idle diff --git a/Assets/prefabs/ui/sign/sign_main_ui.prefab b/Assets/prefabs/ui/sign/sign_main_ui.prefab index 9ce7c4f2f..a5d93103d 100644 --- a/Assets/prefabs/ui/sign/sign_main_ui.prefab +++ b/Assets/prefabs/ui/sign/sign_main_ui.prefab @@ -2285,6 +2285,10 @@ PrefabInstance: propertyPath: m_Name value: sign_month_comp objectReference: {fileID: 0} + - target: {fileID: 7578790876813054411, guid: 694a7ddc7340b53478cc26f81068587a, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7779800550233643752, guid: 694a7ddc7340b53478cc26f81068587a, type: 3} propertyPath: m_Material value: diff --git a/Assets/prefabs/ui/sign/sign_week_comp.prefab b/Assets/prefabs/ui/sign/sign_week_comp.prefab index 7eeeee70a..cb47f1cac 100644 --- a/Assets/prefabs/ui/sign/sign_week_comp.prefab +++ b/Assets/prefabs/ui/sign/sign_week_comp.prefab @@ -1644,7 +1644,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3569dfdcd6f978f4ab5fd10e9a6abf83, type: 3} + m_Sprite: {fileID: 21300000, guid: 87a7452c9489a664baecde1ba0f16a2f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3497,7 +3497,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 3569dfdcd6f978f4ab5fd10e9a6abf83, type: 3} + m_Sprite: {fileID: 21300000, guid: 87a7452c9489a664baecde1ba0f16a2f, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/proto/protocol.bytes b/Assets/proto/protocol.bytes index 0473890d7..fc07065fb 100644 --- a/Assets/proto/protocol.bytes +++ b/Assets/proto/protocol.bytes @@ -1,5 +1,5 @@ - +ν pb/proto/protocol.protocspb"' Act gifts ( 2 @@ -61,7 +61,24 @@ growUpGift"U group_up_gift ( 2.cspb.ActGrowUpGift2R groupUpGift"4 ActIntroductoryGift -trigger_at (R triggerAt" +trigger_at (R triggerAt" +ActivityExchangeP +exchange_count ( 2).cspb.ActivityExchange.ExchangeCountEntryR exchangeCountG + exchange_at ( 2&.cspb.ActivityExchange.ExchangeAtEntryR +exchangeAt@ +ExchangeCountEntry +key (Rkey +value (Rvalue:8= +ExchangeAtEntry +key (Rkey +value (Rvalue:8"; +ActivityExchangeReq +id (Rid +count (Rcount" +ActivityExchangeRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards" +costs ( 2 .cspb.RewardRcosts" ActivityRush id (Rid"Z ActivityRushSign @@ -1221,7 +1238,67 @@ activities> type (Rtype"_ PlayerInfoRsp( err_code (2 .cspb.ErrCodeRerrCode$ -info ( 2.cspb.PlayerInfoRinfo" +info ( 2.cspb.PlayerInfoRinfo" + SevenDays +open_at (RopenAt + claimed_ids (R +claimedIds9 +progress ( 2.cspb.SevenDays.ProgressEntryRprogress( +score_reward_ids (RscoreRewardIds; + ProgressEntry +key (Rkey +value (Rvalue:8" + SevenDaysReq" + SevenDaysRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards" +costs ( 2 .cspb.RewardRcosts# +info ( 2.cspb.SevenDaysRinfo": +SevenDaysTaskReq +id (Rid +period (Rperiod"d +SevenDaysTaskRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards"A +SevenDaysScoreRewardReq +id (Rid +period (Rperiod" +SevenDaysScoreRewardRsp( +err_code (2 .cspb.ErrCodeRerrCode& +rewards ( 2 .cspb.RewardRrewards" +costs ( 2 .cspb.RewardRcosts" +SevenDay + open_day_ts (R openDayTs/ +tasks ( 2.cspb.SevenDay.TasksEntryRtasks5 +claimed ( 2.cspb.SevenDay.ClaimedEntryRclaimedD + +TasksEntry +key (Rkey +value ( 2 +.cspb.TaskRvalue:8: + ClaimedEntry +key (Rkey +value (Rvalue:8") +SevenDayTaskRewardReq +ids (Rids" +SevenDayTaskRewardRsp( +err_code (2 .cspb.ErrCodeRerrCode< +tasks ( 2&.cspb.SevenDayTaskRewardRsp.TasksEntryRtasks& +rewards ( 2 .cspb.RewardRrewardsD + +TasksEntry +key (Rkey +value ( 2 +.cspb.TaskRvalue:8"# +SevenDayRewardReq +id (Rid" +SevenDayRewardRsp( +err_code (2 .cspb.ErrCodeRerrCode> +Claimed ( 2$.cspb.SevenDayRewardRsp.ClaimedEntryRClaimed& +rewards ( 2 .cspb.RewardRrewards: + ClaimedEntry +key (Rkey +value (Rvalue:8" Sign open_at (RopenAt> claimed_free ( 2.cspb.Sign.ClaimedFreeEntryR claimedFree;