miduo_client/Assets/ManagedResources/Prefabs
zhangqiang ed53f7e760 Merge branch 'master_develop' into master_develop2
# Conflicts:
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicActivityPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua
#	data_execl/base_data/BeStronger.xlsx
#	data_execl/base_data/EquipTalismana.xlsx
#	data_execl/base_data/GlobalActivity.xlsx
2020-08-07 06:54:04 +08:00
..
Effect add soulprint effect commit 2020-08-02 09:16:45 +08:00
Live2d 外网0.16.14 内网0.15.25 2020-07-01 09:40:20 +08:00
Map 提交 2020-05-09 13:31:21 +08:00
UI Merge branch 'master_develop' into master_develop2 2020-08-07 06:54:04 +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