Commit Graph

5 Commits (61f25a31c809e9f71792e74db93bfe71dea87236)

Author SHA1 Message Date
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
gaoxin a3bc278624 【配置】获取配置前,拉取更新 2021-09-18 12:02:16 +08:00
gaoxin 071e7db748 【配置】打包和同步校验服修改到配置文件工程中 2021-09-17 19:22:45 +08:00
gaoxin 17db509837 【热更新】修改热更新配置文件 2021-09-07 18:02:40 +08:00
gaoxin 7d8bb2bc36 【Version工具】修改配置文件走svn 2021-09-03 15:54:33 +08:00