diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index 4daf50b27..63bcf50ce 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/data_manager.lua.bytes b/Assets/lua/app/common/data_manager.lua.bytes index d4062d188..be12e5e62 100644 Binary files a/Assets/lua/app/common/data_manager.lua.bytes and b/Assets/lua/app/common/data_manager.lua.bytes differ diff --git a/Assets/lua/app/common/pay_manager.lua.bytes b/Assets/lua/app/common/pay_manager.lua.bytes index 3995cb5ec..f7e45d82e 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/game.lua.bytes b/Assets/lua/app/game.lua.bytes index 50cc37b97..4ed9fc985 100644 Binary files a/Assets/lua/app/game.lua.bytes and b/Assets/lua/app/game.lua.bytes differ diff --git a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes b/Assets/lua/app/module/chapter/chapter_manager.lua.bytes index 56eb89250..01de58237 100644 Binary files a/Assets/lua/app/module/chapter/chapter_manager.lua.bytes and b/Assets/lua/app/module/chapter/chapter_manager.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 073b37fd0..7927ecd00 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 ac6693b74..b0ee0fc1e 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/ui/main_city/main_city_ui.lua.bytes b/Assets/lua/app/ui/main_city/main_city_ui.lua.bytes index 8e96768f5..9ad43e7f2 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/ui/shop/cell/beginner_sell_cell.lua.bytes b/Assets/lua/app/ui/shop/cell/beginner_sell_cell.lua.bytes index 68bfb8d7e..857030224 100644 Binary files a/Assets/lua/app/ui/shop/cell/beginner_sell_cell.lua.bytes and b/Assets/lua/app/ui/shop/cell/beginner_sell_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/cell/chapter_cell.lua.bytes b/Assets/lua/app/ui/shop/cell/chapter_cell.lua.bytes index 4f55d0512..a4db8261f 100644 Binary files a/Assets/lua/app/ui/shop/cell/chapter_cell.lua.bytes and b/Assets/lua/app/ui/shop/cell/chapter_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/cell/chapter_sell_cell.lua.bytes b/Assets/lua/app/ui/shop/cell/chapter_sell_cell.lua.bytes index 2d69c441b..da072a877 100644 Binary files a/Assets/lua/app/ui/shop/cell/chapter_sell_cell.lua.bytes and b/Assets/lua/app/ui/shop/cell/chapter_sell_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/cell/gem_cell.lua.bytes b/Assets/lua/app/ui/shop/cell/gem_cell.lua.bytes index e82ec38b9..41e0a47ea 100644 Binary files a/Assets/lua/app/ui/shop/cell/gem_cell.lua.bytes and b/Assets/lua/app/ui/shop/cell/gem_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/gift_pop_ui.lua.bytes b/Assets/lua/app/ui/shop/gift_pop_ui.lua.bytes new file mode 100644 index 000000000..99e748c72 Binary files /dev/null and b/Assets/lua/app/ui/shop/gift_pop_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/shop/gift_pop_ui.lua.bytes.meta b/Assets/lua/app/ui/shop/gift_pop_ui.lua.bytes.meta new file mode 100644 index 000000000..4d1a5c034 --- /dev/null +++ b/Assets/lua/app/ui/shop/gift_pop_ui.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 75ecf66692574c041ae465e22bf42d67 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/lua/app/userdata/shop/shop_data.lua.bytes b/Assets/lua/app/userdata/shop/shop_data.lua.bytes index ae04ea479..2a647089d 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/prefabs/ui/shop/gift_pop_ui.prefab b/Assets/prefabs/ui/shop/gift_pop_ui.prefab index c030b1fab..10f4576df 100644 --- a/Assets/prefabs/ui/shop/gift_pop_ui.prefab +++ b/Assets/prefabs/ui/shop/gift_pop_ui.prefab @@ -302,7 +302,7 @@ RectTransform: 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: 370} + m_AnchoredPosition: {x: 0, y: 323} m_SizeDelta: {x: 600, y: 50} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1572974857966272460 @@ -717,7 +717,7 @@ RectTransform: m_Children: - {fileID: 3641798393908367798} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 7 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1098,19 +1098,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3684581747112625499} - 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: - {fileID: 3216659999434841662} - {fileID: 5855844711530093975} - {fileID: 1635485933773897682} - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 5 + m_Father: {fileID: 6421884840616050067} + m_RootOrder: 2 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: 60, y: -105} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 110, y: 142} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7703701751853361270 @@ -1151,6 +1151,65 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3794706123148292986 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6421884840616050067} + - component: {fileID: 1277730143452168869} + m_Layer: 5 + m_Name: item_node + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6421884840616050067 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3794706123148292986} + 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: + - {fileID: 5380735088143568625} + - {fileID: 6137294402458132337} + - {fileID: 3416454017020524507} + - {fileID: 1981152942187469396} + m_Father: {fileID: 6532261956592226185} + m_RootOrder: 3 + 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: -100} + m_SizeDelta: {x: 500, y: 142} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1277730143452168869 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3794706123148292986} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 61cd9c9c2795741588033c81cd008e7e, type: 3} + m_Name: + m_EditorClassIdentifier: + left: 0 + right: 0 + top: 0 + bottom: 0 + childAlignment: 4 + spacing: 5 + verticalOrHorizontal: 0 --- !u!1 &4117970956418931131 GameObject: m_ObjectHideFlags: 0 @@ -1183,10 +1242,7 @@ RectTransform: - {fileID: 7437306225081421888} - {fileID: 6367979773758997921} - {fileID: 5677724647850855975} - - {fileID: 5380735088143568625} - - {fileID: 6137294402458132337} - - {fileID: 3416454017020524507} - - {fileID: 1981152942187469396} + - {fileID: 6421884840616050067} - {fileID: 7407897637106462976} - {fileID: 3618769078468116502} m_Father: {fileID: 8461932745927490369} @@ -1340,7 +1396,7 @@ RectTransform: - {fileID: 3876298356550912567} - {fileID: 5474555283759120578} m_Father: {fileID: 6532261956592226185} - m_RootOrder: 8 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -1635,7 +1691,7 @@ RectTransform: m_GameObject: {fileID: 5642452800870098847} 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_LocalScale: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 3618769078468116502} m_RootOrder: 1 @@ -1842,19 +1898,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5911992687973849931} - 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: - {fileID: 7194678733288552927} - {fileID: 2946511882995981772} - {fileID: 8173557332708960290} - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 3 + m_Father: {fileID: 6421884840616050067} + 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: -177, y: -105} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 110, y: 142} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7616228745954779343 @@ -2096,6 +2152,10 @@ MonoBehaviour: hashName: 1577143064 objectType: 0 gameObject: {fileID: 2831420153353503022} + - name: gift_pop_ui.bg.item_node + hashName: 473734882 + objectType: 0 + gameObject: {fileID: 3794706123148292986} --- !u!114 &960821287463814128 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2269,19 +2329,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6112589953650552666} - 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: - {fileID: 8536164944306749280} - {fileID: 234573154662921238} - {fileID: 4520413429258922377} - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 4 + m_Father: {fileID: 6421884840616050067} + 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: -60, y: -105} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 110, y: 142} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8277944783412004693 @@ -2481,19 +2541,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6765835555815332733} - 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: - {fileID: 996302764616250464} - {fileID: 1664298413477479032} - {fileID: 2412084218387525634} - m_Father: {fileID: 6532261956592226185} - m_RootOrder: 6 + m_Father: {fileID: 6421884840616050067} + m_RootOrder: 3 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: 177, y: -105} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 110, y: 142} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4738102304295336647 @@ -2762,16 +2822,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} ---- !u!224 &996302764616250464 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} - m_PrefabInstance: {fileID: 3417292636798606748} - m_PrefabAsset: {fileID: 0} --- !u!1 &5243091770578807851 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7471363632449712567, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} m_PrefabInstance: {fileID: 3417292636798606748} m_PrefabAsset: {fileID: 0} +--- !u!224 &996302764616250464 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2503787648808692220, guid: 5ca3e95e591a43942878fdef120fc747, type: 3} + m_PrefabInstance: {fileID: 3417292636798606748} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4712911085462097955 PrefabInstance: m_ObjectHideFlags: 0