miduo_client/Assets/ManagedResources/~Lua/Modules/NewShenZun
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
..
ActivityChongRank.lua 升星冲榜添加我的排名 2023-02-22 18:31:53 +08:00
ActivityChongRank.lua.meta [gm]=====开服冲榜提交 2022-10-31 18:13:41 +08:00
GMMingWangPanel.lua Merge branch 'dev_oneDis' into onepiece_demo 2023-08-29 17:58:24 +08:00
GMMingWangPanel.lua.meta [gm]==============声望特权提交 2022-10-20 17:48:00 +08:00
NewShenZunExpExchangePopup.lua 神尊修改 2022-12-06 11:28:22 +08:00
NewShenZunExpExchangePopup.lua.meta 神尊特权提交 2022-09-09 18:09:45 +08:00
NewShenZunPanel.lua 神尊特权按钮文字 2022-11-19 00:53:32 +08:00
NewShenZunPanel.lua.meta 神尊特权提交 2022-09-09 18:09:45 +08:00