miduo_client/Assets/ManagedResources
gaoxin ce13a0263e Merge branch '战斗优化v_n.0' into master_develop
# Conflicts:
#	.gitignore
#	Assets/ManagedResources/Atlas/QianKunBox.meta
#	Assets/ManagedResources/Prefabs/Effect/Skill/Effect_c_ab_00014_t3_attack01.prefab.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Config/Data/CombatControl.lua
#	Assets/ManagedResources/~Lua/Config/Data/SkillLogicConfig.lua
#	Assets/StreamingAssets/Android.meta
2020-07-08 19:55:09 +08:00
..
Atlas Merge branch '战斗优化v_n.0' into master_develop 2020-07-08 19:55:09 +08:00
Audio 删除meta文件 2020-07-02 17:58:34 +08:00
BG 包囊 2020-07-08 16:23:02 +08:00
Configs 提交 2020-05-09 13:31:21 +08:00
DynamicAtlas 版本开发提交 2020-06-28 17:52:29 +08:00
EditorConfigs 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
Effects 部分技能配置 2020-07-08 10:34:41 +08:00
Fonts 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
Icons svn逻辑同步 2020-07-02 14:53:44 +08:00
Prefabs Merge branch '战斗优化v_n.0' into master_develop 2020-07-08 19:55:09 +08:00
PublicArtRes 部分技能配置 2020-07-08 10:34:41 +08:00
RTexture 测试服热更0.15.6提交 2020-06-05 16:16:22 +08:00
ResConfigs 测试热更0.15.25、svn逻辑同步 2020-07-03 11:52:23 +08:00
Spine 删除meta文件 2020-07-02 17:58:34 +08:00
SplashPanel 提交 2020-05-09 13:31:21 +08:00
UpdatePanel 外网 0.16.10 内网 0.15.23 2020-06-28 17:48:49 +08:00
~Lua Merge branch '战斗优化v_n.0' into master_develop 2020-07-08 19:55:09 +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