Commit Graph

8 Commits (74c2f67d10c8c2b4ba5641c477e46f042b021485)

Author SHA1 Message Date
xiejun f1b9b526c1 代码修改 2023-08-30 20:33:29 +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
jiaoyangna ad9e76bda5 四灵试炼修改提交 2021-08-31 19:03:29 +08:00
jiaoyangna d7d8a6071b 特希奥层级修改提交 2021-08-31 14:41:35 +08:00
jiaoyangna cd594275e0 四灵试炼修改提交 2021-08-26 17:25:02 +08:00
ZhangBiao e64223b78b 【副本】新界面提交 2021-07-06 16:30:58 +08:00
gaoxin 1e36398a50 【内存优化】Util.Loadsprite 替换为 spLoader 2021-05-28 14:41:58 +08:00
gaoxin 006eae4bd9 【死灵试炼】资源及相关代码导入,但代码未使用 2021-05-21 13:45:10 +08:00