miduo_client/Assets/ManagedResources
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
..
Atlas activity commit 2020-08-03 10:18:04 +08:00
Audio 音频更新 2020-08-04 17:47:38 +08:00
BG 修改Loading界面资源位置 2020-08-03 18:49:24 +08:00
Configs 提交 2020-05-09 13:31:21 +08:00
DynamicAtlas 游戏logo替换 2020-07-28 10:40:02 +08:00
EditorConfigs 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
Effects 破阵诛仙活动界面 2020-07-31 16:18:14 +08:00
Fonts 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
Icons 法宝资源替换新增 2020-07-31 18:03:27 +08:00
Prefabs Merge branch 'master_develop' into master_develop2 2020-08-07 06:54:04 +08:00
PublicArtRes 文件名重复修改 2020-07-31 15:09:04 +08:00
RTexture rendertexture优化修改 2020-07-30 14:00:55 +08:00
ResConfigs 破阵诛仙活动界面 2020-07-31 16:18:14 +08:00
Spine 删除错误的spine 2020-07-28 16:11:04 +08:00
SplashPanel 提交 2020-05-09 13:31:21 +08:00
UpdatePanel 修改Loading界面资源位置 2020-08-03 18:49:24 +08:00
~Lua Merge branch 'master_develop' into master_develop2 2020-08-07 06:54:04 +08:00
Atlas.meta 提交 2020-05-09 13:31:21 +08:00
Audio.meta 提交 2020-05-09 13:31:21 +08:00
BG.meta 提交 2020-05-09 13:31:21 +08:00
Configs.meta 提交 2020-05-09 13:31:21 +08:00
DynamicAtlas.meta 提交 2020-05-09 13:31:21 +08:00
EditorConfigs.meta 提交 2020-05-09 13:31:21 +08:00
Effects.meta 提交 2020-05-09 13:31:21 +08:00
Fonts.meta 提交 2020-05-09 13:31:21 +08:00
Icons.meta 提交 2020-05-09 13:31:21 +08:00
Prefabs.meta 提交 2020-05-09 13:31:21 +08:00
PublicArtRes.meta 提交 2020-05-09 13:31:21 +08:00
RTexture.meta 六月三号开发提交 2020-06-03 19:09:01 +08:00
ResConfigs.meta 提交 2020-05-09 13:31:21 +08:00
Spine.meta 提交 2020-05-09 13:31:21 +08:00
SplashPanel.meta 提交 2020-05-09 13:31:21 +08:00
UpdatePanel.meta 提交 2020-05-09 13:31:21 +08:00
~Lua.meta 提交 2020-05-09 13:31:21 +08:00