Commit Graph

24 Commits (b00f8742369b91ba7781af8b6e3182b3a851a15b)

Author SHA1 Message Date
wangzhenxing b00f874236 点石成金修改提交 2023-11-09 10:52:24 +08:00
xiejun 6ced2b0507 Merge branch 'dev_oneDis' into onepiece_demo
# Conflicts:
#	AssetBundles/version.txt
#	Assets/ManagedResources/Prefabs/UI/FightLevel/FightLevelChapterPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/ItemView/ItemView.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/Base/Effect.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Practice/PracticeManager.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
2023-08-29 17:58:24 +08:00
wangzhenxing 20f7c9da96 名望礼包修改提交 2023-06-06 19:38:21 +08:00
wangzhenxing 2694f5ad57 礼包报错修改提交 2023-06-06 17:16:28 +08:00
wangzhenxing 4b4ed9f63a [bt]=======名望特权修改 2022-11-22 15:30:03 +08:00
wangzhenxing 22367a5573 名望特权升级提示修改 2022-11-08 10:38:49 +08:00
wangzhenxing f3d4eed21c [gm]=======名望特权修改 2022-10-25 10:23:48 +08:00
wangzhenxing 8d63d391a6 [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
张彪 1597c0b657 【特权商城】无法购买最后i一个名望礼包,修改 2022-01-26 13:40:13 +08:00
ZhangBiao 409836ffb5 【名望礼包】提交 2022-01-17 13:16:18 +08:00
ZhangBiao 58ffbf416c 【商城界面】提示修改 2021-12-21 16:32:59 +08:00
ZhangBiao 12b980590f 【名望】提交 2021-12-20 15:18:03 +08:00
ZhangBiao 680b956474 【声望】修改 2021-12-20 15:02:14 +08:00
ZhangBiao 0377b2b642 【特惠商城】提交 2021-12-17 18:53:24 +08:00
ZhangBiao 8ad3346af9 【特惠商城】 2021-12-17 16:05:51 +08:00
ZhangBiao d34d896f47 【成长礼包】提交 2021-12-17 14:13:41 +08:00
ZhangBiao d939e6b32b 【新人商城】提交 2021-12-17 14:00:07 +08:00
ZhangBiao f4b2a09f08 【商城界面】和信任商城 2021-12-17 12:08:15 +08:00
ZhangBiao 45241e1d5d 【商城界面】提交 2021-12-17 11:28:37 +08:00
ZhangBiao 052d7418ca 【商城界面】提交 2021-12-17 09:31:45 +08:00
ZhangBiao 5393485f65 【商城界面】提交 2021-12-16 19:22:46 +08:00
ZhangBiao e9954f49f2 【商城界面】提交 2021-12-16 11:59:18 +08:00
ZhangBiao 2858f2e400 【商城界面】提交 2021-12-16 10:46:11 +08:00
ZhangBiao 0b190666d5 【商城界面】提交 2021-12-15 14:34:21 +08:00