miduo_client/Assets/ManagedResources/Icon/Item
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
..
n_niuqichongchong_icon_niuqizhi_zh.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
n_niuqichongchong_icon_niuqizhi_zh.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_LvUpItem_linpai.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_LvUpItem_linpai.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_Material_scfx_0001.png 【资源】新增物品资源 2021-05-14 15:54:28 +08:00
r_Material_scfx_0001.png.meta 【资源】新增物品资源 2021-05-14 15:54:28 +08:00
r_RareItem_Specail_0222.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_RareItem_Specail_0222.png.meta Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
r_fb_90053.png 替换白骨精法宝图片 2020-12-26 18:30:54 +08:00
r_fb_90053.png.meta 【资源】遗漏资源补齐 2020-12-26 19:56:59 +08:00
r_fb_90054.png 【资源】法宝资源添加,meta文件提交 2021-01-30 13:23:06 +08:00
r_fb_90054.png.meta 【资源】法宝资源添加,meta文件提交 2021-01-30 13:23:06 +08:00
r_guanka_sheji_bu_01.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_guanka_sheji_bu_01.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_guanka_sheji_bu_02.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_guanka_sheji_bu_02.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_guanka_sheji_bu_03.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_guanka_sheji_bu_03.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_huodong_dingguashenchu.png 定卦神锄资源 2020-11-10 14:56:03 +08:00
r_huodong_dingguashenchu.png.meta [玄机妙算] 提交 2020-11-12 15:10:52 +08:00
r_lingshou_hualingfu.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_lingshou_hualingfu.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_lingshou_qianyuandan.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_lingshou_qianyuandan.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_lingshou_xianlingcao.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_lingshou_xianlingcao.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_lingshou_yulingbi.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_lingshou_yulingbi.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_taichuzhiqi.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_taichuzhiqi.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_xiangyaoduobao_xiaohao.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_xiangyaoduobao_xiaohao.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_xinjianglaixi_chou.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_xinjianglaixi_chou.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_xinjianglaixi_duihuan.png 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_xinjianglaixi_duihuan.png.meta 【资源】新心意点资源,玉帝资源替换 2021-04-27 14:31:14 +08:00
r_xuanhuangzhiqi.png 【资源】新增法宝资源,玄黄之气资源替换,玉帝技能文字替换 2021-04-27 22:40:20 +08:00
r_xuanhuangzhiqi.png.meta 【资源】新增法宝资源,玄黄之气资源替换,玉帝技能文字替换 2021-04-27 22:40:20 +08:00