diff --git a/Assets/lua/app/common/bi_report.lua.bytes b/Assets/lua/app/common/bi_report.lua.bytes index 92a8f677e..ec2beeac2 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 48bcedfcd..5ff9f0323 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 f1ee3aca2..69bbed688 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/module/fund/fund_manager.lua.bytes b/Assets/lua/app/module/fund/fund_manager.lua.bytes index 31ff775e7..e60ceb868 100644 Binary files a/Assets/lua/app/module/fund/fund_manager.lua.bytes and b/Assets/lua/app/module/fund/fund_manager.lua.bytes differ diff --git a/Assets/lua/app/module/maincity/maincity_const.lua.bytes b/Assets/lua/app/module/maincity/maincity_const.lua.bytes index 819bff797..a1b1ce522 100644 Binary files a/Assets/lua/app/module/maincity/maincity_const.lua.bytes and b/Assets/lua/app/module/maincity/maincity_const.lua.bytes differ diff --git a/Assets/lua/app/ui/fund/cell/growth_fund_cell.lua.bytes b/Assets/lua/app/ui/fund/cell/growth_fund_cell.lua.bytes new file mode 100644 index 000000000..dead1f8ab Binary files /dev/null and b/Assets/lua/app/ui/fund/cell/growth_fund_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/fund/level_fund_ui.lua.bytes.meta b/Assets/lua/app/ui/fund/cell/growth_fund_cell.lua.bytes.meta similarity index 75% rename from Assets/lua/app/ui/fund/level_fund_ui.lua.bytes.meta rename to Assets/lua/app/ui/fund/cell/growth_fund_cell.lua.bytes.meta index d3e9503ec..ca1358fbb 100644 --- a/Assets/lua/app/ui/fund/level_fund_ui.lua.bytes.meta +++ b/Assets/lua/app/ui/fund/cell/growth_fund_cell.lua.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 937fdeb0eda22cf4d9bc6dfdaaaa84e6 +guid: 16b0b5a8302cf6a48b95b0a7e8badba1 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/lua/app/ui/fund/cell/growth_fund_reward_cell.lua.bytes b/Assets/lua/app/ui/fund/cell/growth_fund_reward_cell.lua.bytes new file mode 100644 index 000000000..0a734e12b Binary files /dev/null and b/Assets/lua/app/ui/fund/cell/growth_fund_reward_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes.meta b/Assets/lua/app/ui/fund/cell/growth_fund_reward_cell.lua.bytes.meta similarity index 75% rename from Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes.meta rename to Assets/lua/app/ui/fund/cell/growth_fund_reward_cell.lua.bytes.meta index 8590a7f73..1f39a448b 100644 --- a/Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes.meta +++ b/Assets/lua/app/ui/fund/cell/growth_fund_reward_cell.lua.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f82b312c866c64c4e8a6028320862a63 +guid: 1d21b797dc756a24aaa28e5e6f7c36af TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes b/Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes deleted file mode 100644 index 1cb5fa5ca..000000000 Binary files a/Assets/lua/app/ui/fund/cell/level_fund_cell.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes b/Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes deleted file mode 100644 index 4b9b3dea1..000000000 Binary files a/Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/ui/fund/growth_fund_ui.lua.bytes b/Assets/lua/app/ui/fund/growth_fund_ui.lua.bytes new file mode 100644 index 000000000..5c44e905c Binary files /dev/null and b/Assets/lua/app/ui/fund/growth_fund_ui.lua.bytes differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes.meta b/Assets/lua/app/ui/fund/growth_fund_ui.lua.bytes.meta similarity index 75% rename from Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes.meta rename to Assets/lua/app/ui/fund/growth_fund_ui.lua.bytes.meta index fcd04de0e..22c881025 100644 --- a/Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes.meta +++ b/Assets/lua/app/ui/fund/growth_fund_ui.lua.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 51238aa12b2f25640bdf473ea648ffae +guid: 6d2e4ea7c97c70e4aa97dc9fb9731ac6 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/lua/app/ui/fund/level_fund_ui.lua.bytes b/Assets/lua/app/ui/fund/level_fund_ui.lua.bytes deleted file mode 100644 index 4cc4f94e5..000000000 Binary files a/Assets/lua/app/ui/fund/level_fund_ui.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes new file mode 100644 index 000000000..4b7290cf4 Binary files /dev/null and b/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes differ diff --git a/Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes.meta b/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes.meta similarity index 75% rename from Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes.meta rename to Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes.meta index 5279c4f30..f7fbcdd76 100644 --- a/Assets/lua/app/ui/fund/cell/level_fund_reward_cell.lua.bytes.meta +++ b/Assets/lua/app/ui/main_city/cell/side_bar_growth_fund_cell.lua.bytes.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4646c3c969b4d4b41823775a528a0ebd +guid: 4e6fcda48ee5c6e438c10e73988f3fc8 TextScriptImporter: externalObjects: {} userData: diff --git a/Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes b/Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes deleted file mode 100644 index 2db8139b9..000000000 Binary files a/Assets/lua/app/ui/main_city/cell/side_bar_level_fund_cell.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/userdata/fund/fund_data.lua.bytes b/Assets/lua/app/userdata/fund/fund_data.lua.bytes deleted file mode 100644 index 4a51e0745..000000000 Binary files a/Assets/lua/app/userdata/fund/fund_data.lua.bytes and /dev/null differ diff --git a/Assets/lua/app/userdata/fund/fund_data.lua.bytes.meta b/Assets/lua/app/userdata/fund/fund_data.lua.bytes.meta deleted file mode 100644 index 49100654b..000000000 --- a/Assets/lua/app/userdata/fund/fund_data.lua.bytes.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5bfc3527f9346d24cabb1dd439fcf59c -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/lua/app/userdata/fund/growth_fund_data.lua.bytes b/Assets/lua/app/userdata/fund/growth_fund_data.lua.bytes new file mode 100644 index 000000000..a61bc1e89 Binary files /dev/null and b/Assets/lua/app/userdata/fund/growth_fund_data.lua.bytes differ diff --git a/Assets/lua/app/userdata/fund/growth_fund_data.lua.bytes.meta b/Assets/lua/app/userdata/fund/growth_fund_data.lua.bytes.meta new file mode 100644 index 000000000..66c3cf4fa --- /dev/null +++ b/Assets/lua/app/userdata/fund/growth_fund_data.lua.bytes.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 38d5a0a74116cd74ba64e2710b9527f9 +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 f260fb8bc..93f7e034a 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/fund/level_fund_ui.prefab b/Assets/prefabs/ui/fund/growth_fund_ui.prefab similarity index 98% rename from Assets/prefabs/ui/fund/level_fund_ui.prefab rename to Assets/prefabs/ui/fund/growth_fund_ui.prefab index 50f856ed7..421c55aba 100644 --- a/Assets/prefabs/ui/fund/level_fund_ui.prefab +++ b/Assets/prefabs/ui/fund/growth_fund_ui.prefab @@ -828,7 +828,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 370.00024} + m_AnchoredPosition: {x: 0, y: 509.99994} m_SizeDelta: {x: 0, y: 160} m_Pivot: {x: 0.5, y: 1} --- !u!1 &3607665674731238076 @@ -1451,7 +1451,7 @@ GameObject: - component: {fileID: 1652254950293225014} - component: {fileID: 1225774943438592279} m_Layer: 5 - m_Name: level_fund_ui + m_Name: growth_fund_ui m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1540,72 +1540,72 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: level_fund_ui.down.close_btn - hashName: 3196405764 + - name: growth_fund_ui.down.close_btn + hashName: 274900577 objectType: 0 gameObject: {fileID: 4363501055539055553} - - name: level_fund_ui.title_img.title_tx - hashName: 754867032 + - name: growth_fund_ui.title_img.title_tx + hashName: 2048607029 objectType: 0 gameObject: {fileID: 7872773671535516738} - - name: level_fund_ui.title_bg_2.free_tx - hashName: 511413187 + - name: growth_fund_ui.title_bg_2.free_tx + hashName: 1805153184 objectType: 0 gameObject: {fileID: 2602774465547175517} - - name: level_fund_ui.title_bg_2.btn_1 - hashName: 3643829402 + - name: growth_fund_ui.title_bg_2.btn_1 + hashName: 690988983 objectType: 0 gameObject: {fileID: 7149358291207380171} - - name: level_fund_ui.title_bg_2.btn_1.text - hashName: 3116098049 + - name: growth_fund_ui.title_bg_2.btn_1.text + hashName: 1887834372 objectType: 0 gameObject: {fileID: 2311596896611543328} - - name: level_fund_ui.title_bg_2.btn_2 - hashName: 3643829403 + - name: growth_fund_ui.title_bg_2.btn_2 + hashName: 690988984 objectType: 0 gameObject: {fileID: 846112264346929280} - - name: level_fund_ui.title_bg_2.btn_2.text - hashName: 3144727200 + - name: growth_fund_ui.title_bg_2.btn_2.text + hashName: 1916463523 objectType: 0 gameObject: {fileID: 4179225867965772024} - - name: level_fund_ui.scrollrect - hashName: 2432862828 + - name: growth_fund_ui.scrollrect + hashName: 861904713 objectType: 0 gameObject: {fileID: 8767943249369055269} - - name: level_fund_ui.scrollrect.viewport.content.progress_bg - hashName: 1689631900 + - name: growth_fund_ui.scrollrect.viewport.content.progress_bg + hashName: 1844531423 objectType: 0 gameObject: {fileID: 6019748699940912536} - - name: level_fund_ui.scrollrect.viewport.content.progress_bg.progress - hashName: 1264543551 + - name: growth_fund_ui.scrollrect.viewport.content.progress_bg.progress + hashName: 3642945116 objectType: 0 gameObject: {fileID: 4646975924080514432} - - name: level_fund_ui.scrollrect.viewport.content.gray_img - hashName: 2342827266 + - name: growth_fund_ui.scrollrect.viewport.content.gray_img + hashName: 2483830687 objectType: 0 gameObject: {fileID: 3874658184574105918} - - name: level_fund_ui.scrollrect.viewport.content.line_img - hashName: 3423054355 + - name: growth_fund_ui.scrollrect.viewport.content.line_img + hashName: 3564057776 objectType: 0 gameObject: {fileID: 5473037390653079988} - - name: level_fund_ui.scrollrect.viewport.content - hashName: 4204607091 + - name: growth_fund_ui.scrollrect.viewport.content + hashName: 3581597494 objectType: 0 gameObject: {fileID: 3465973270909600698} - - name: level_fund_ui.scrollrect.viewport.content.vertical_line_1 - hashName: 3746087444 + - name: growth_fund_ui.scrollrect.viewport.content.vertical_line_1 + hashName: 4232740055 objectType: 0 gameObject: {fileID: 3607665674731238076} - - name: level_fund_ui.scrollrect.viewport.content.vertical_line_2 - hashName: 3746087445 + - name: growth_fund_ui.scrollrect.viewport.content.vertical_line_2 + hashName: 4232740056 objectType: 0 gameObject: {fileID: 3942531295729745389} - - name: level_fund_ui.title_img - hashName: 3621327297 + - name: growth_fund_ui.title_img + hashName: 2739367236 objectType: 0 gameObject: {fileID: 7594935122771612688} - - name: level_fund_ui.title_img.bg - hashName: 1973011346 + - name: growth_fund_ui.title_img.bg + hashName: 4110751023 objectType: 0 gameObject: {fileID: 7196926459956754878} --- !u!1 &6019748699940912536 @@ -1942,7 +1942,7 @@ GameObject: - component: {fileID: 328612024676429395} - component: {fileID: 3537619377531454142} m_Layer: 5 - m_Name: level_fund_cell + m_Name: growth_fund_cell m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1984,28 +1984,28 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: prefabList: - - name: level_fund_cell.fund_reward_cell_1 - hashName: 3828512535 + - name: growth_fund_cell.fund_reward_cell_1 + hashName: 1572133812 objectType: 1 gameObject: {fileID: 6897433954095913334} - - name: level_fund_cell.fund_reward_cell_2 - hashName: 3828512536 + - name: growth_fund_cell.fund_reward_cell_2 + hashName: 1572133813 objectType: 1 gameObject: {fileID: 6156637029134291811} - - name: level_fund_cell.fund_reward_cell_3 - hashName: 3828512537 + - name: growth_fund_cell.fund_reward_cell_3 + hashName: 1572133814 objectType: 1 gameObject: {fileID: 646866309303917430} - - name: level_fund_cell.lv_bg.gray - hashName: 588927268 + - name: growth_fund_cell.lv_bg.gray + hashName: 2726666945 objectType: 0 gameObject: {fileID: 790588640951732610} - - name: level_fund_cell.lv_bg.tx - hashName: 1216254341 + - name: growth_fund_cell.lv_bg.tx + hashName: 3940263522 objectType: 0 gameObject: {fileID: 2748902761571330533} - - name: level_fund_cell.lv_bg - hashName: 13304461 + - name: growth_fund_cell.lv_bg + hashName: 2282775248 objectType: 0 gameObject: {fileID: 1050058964922907401} --- !u!114 &5053045738784603665 diff --git a/Assets/prefabs/ui/fund/level_fund_ui.prefab.meta b/Assets/prefabs/ui/fund/growth_fund_ui.prefab.meta similarity index 100% rename from Assets/prefabs/ui/fund/level_fund_ui.prefab.meta rename to Assets/prefabs/ui/fund/growth_fund_ui.prefab.meta