miduo_client/Assets/ManagedResources
gaoxin 1b873eb38d Merge branch 'china/dev-c' into china/ios
# Conflicts:
#	Assets/ManagedResources/ArtFont_en/f_fuxinggaozhao_zida_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_banner_en.png.meta
#	Assets/ManagedResources/ArtFont_en/n_niuqichongchong_niuqizhi_en.png.meta
#	Assets/ManagedResources/ArtFont_en/q_qinlongmibao_banner1_en.png.meta
#	Assets/ManagedResources/ArtFont_en/r_fabao_guiyuan_en.png.meta
#	Assets/ManagedResources/ArtFont_en/sl_en.png.meta
#	Assets/ManagedResources/ArtFont_en/x_xianshizaohuan_wujiangyulan 1_en.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_1_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_2_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_3_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_4_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_6_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_7_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_8_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/c_3_9_t9_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_banner_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/n_niuqichongchong_niuqizhi_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/q_qinlongmibao_banner1_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/r_fabao_guiyuan_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/sl_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_2_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/t_tianshumijuan_zhujiemiananniu_vi.png.meta
#	Assets/ManagedResources/ArtFont_vi/w_wj_banner_vi.png.meta
#	Assets/ManagedResources/Atlas/BattleAtlas/r_zhandou_leiquehei_01.png.meta
#	Assets/ManagedResources/Atlas/DyAct_Activity7/timelimit_putishushen2.png.meta
#	Assets/ManagedResources/Atlas/DyAct_XiangYaoDuoBao/ArtFont/t_tongqiangtiebi_banner_zh.jpg.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/ArtFont/x_xianshizaohuan_wujiangyulan 1_zh.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/QiKaiDeSheng/q_qikaidesheng_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/XiangLongFuHu/x_xianglongfuhu_shenjiang3.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YiShanDaoHai/y_yishandaohai_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/DynamicActivityAtlas/YongWangZhiQian/s_yongwangzhiqian_shenjiang2.png.meta
#	Assets/ManagedResources/Atlas/FirstRechargeAtlas/ArtFont/s_shouchong_100_zh.png.meta
#	Assets/ManagedResources/Atlas/MainAtlas/ArtFont/r_zjm_huodongicon-congzhi_zh.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2.png.meta
#	Assets/ManagedResources/Atlas/SupremeHeroAtlas/b_baolishuchu_juesebanzi2_gouxuan.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_01_zh.png.meta
#	Assets/ManagedResources/Atlas/TagButtonAtlas/ArtFont/r_huodong_leijichengzhianniu_zh.png.meta
#	Assets/ManagedResources/Atlas/TimeLimitSkinAtlas/ArtFont/sl_zh.png.meta
#	Assets/ManagedResources/BG/t_tapolingxiao_beijingtu.png.meta
#	Assets/ManagedResources/DynamicAtlas/b_bianhuanmoce_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/b_bowenduoshi_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/p_pozhengzhuxian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/q_qikaidesheng_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/s_yongwangzhiqian_banner_zh.png
#	Assets/ManagedResources/DynamicAtlas/y_yishandaohai_banner_zh.png
#	Assets/ManagedResources/EffectResUI/Story/Texture/UI_fuzhou_02.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/dianjijiekai.png.meta
#	Assets/ManagedResources/EffectResUI/Story/Texture/star_png.png.meta
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/Logic/BattleLogic.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/GuideBattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/EnemyView.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/FriendChatPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/view/CompoundHero_Compound.lua
#	Assets/ManagedResources/~Lua/Modules/DailyRecharge/DailyRechargePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ActivityMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShowTeHui.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/SheJiDaDian.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/ShengYiTianJiang.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/XinJiangLaiXi.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/YiJingBaoKu.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/FightPointMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookRoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListItem.lua
#	Assets/ManagedResources/~Lua/Modules/Login/ServerListSelectPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SkillInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recharge/View/EveryDayGift.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Pokemon.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SecretBox/SecretBoxBuyOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopBuyPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/View/PlayerInfoView.lua
2021-05-19 14:12:37 +08:00
..
ArtFont_en Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ArtFont_vi Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Atlas Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Audio 【跳过战斗优化】主线战斗中的BOSS关卡,改为不允许跳过 + 战斗背景音乐替换 2021-05-18 17:18:52 +08:00
BG Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Configs 提交 2020-05-09 13:31:21 +08:00
DynamicAtlas Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
EditorConfigs 【配置】保存一个luabytes文件防止buildconfig中luabytes文件丢失 2021-03-31 16:17:08 +08:00
EffectResSkill 【资源】资源缺失提交 2021-04-28 02:43:24 +08:00
EffectResUI Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Effects 【资源】资源名重复修整 2021-04-29 21:08:11 +08:00
Fonts 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
Icon Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
Icons 【资源】新增法宝资源,玄黄之气资源替换,玉帝技能文字替换 2021-04-27 22:40:20 +08:00
LuaBytes 【资源】重名文件处理,meta文件提交 2021-04-12 22:06:58 +08:00
Prefabs Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
PublicArtRes 【资源】新增物品资源 2021-05-14 15:54:28 +08:00
RTexture rendertexture优化修改 2020-07-30 14:00:55 +08:00
ResConfigs 【协议合并提交】刷资源提交 2021-05-17 11:28:54 +08:00
Spine 【资源】新增立绘 资源 2021-05-18 17:47:47 +08:00
SplashPanel 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
UpdatePanel 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
~Lua Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
ArtFont_en.meta 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ArtFont_vi.meta 越南语图片提交 2021-02-18 17:21:14 +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
EffectResSkill.meta 【社稷大典/灵兽】特效资源重新整理 2020-11-01 17:00:39 +08:00
EffectResUI.meta 【逍遥游】删除旧骰子资源 2020-10-26 15:39:49 +08:00
Effects.meta 提交 2020-05-09 13:31:21 +08:00
Fonts.meta 提交 2020-05-09 13:31:21 +08:00
Icon.meta 【资源】部分资源位置修改,防止热更资源过大 2020-10-27 11:03:08 +08:00
Icons.meta 提交 2020-05-09 13:31:21 +08:00
LuaBytes.meta 【配置】保存一个luabytes文件防止buildconfig中luabytes文件丢失 2021-03-31 16:17:08 +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