miduo_client/Assets/ManagedResources/Prefabs
zhangqiang e1b223e83f Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Data/ConfigData.lua
#	data_execl/base_data/ItemConfig.xlsx
#	data_execl/base_data/MonsterConfig.xlsx
#	data_execl/base_data/PrivilegeTypeConfig.xlsx
#	data_execl/base_data/RewardGroup.xlsx
#	data_execl/base_data/RewardItemConfig.xlsx
#	data_execl/base_data/SpecialConfig.xlsx
#	data_execl/base_data/StoreConfig.xlsx
#	data_execl/base_data/UIConfig.xlsx
2020-08-22 13:59:35 +08:00
..
Effect 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
Live2d live2d commit 2020-08-18 15:42:21 +08:00
Map conflict commit 2020-08-17 15:17:58 +08:00
UI Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop 2020-08-22 13:59:35 +08:00
Effect.meta 提交 2020-05-09 13:31:21 +08:00
Live2d.meta 提交 2020-05-09 13:31:21 +08:00
Map.meta 提交 2020-05-09 13:31:21 +08:00
UI.meta 提交 2020-05-09 13:31:21 +08:00