miduo_client/Assets/ManagedResources/Atlas/PopupAtlas
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 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
ArtFont.meta
b_baolishuchu_anniu 1.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
b_baolishuchu_anniu 1.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
b_baolishuchu_anniu.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
b_baolishuchu_anniu.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
b_baolishuchu_juesebanzi2.png Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
b_baolishuchu_juesebanzi2.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
b_baolishuchu_juesebanzi2_anniu.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
b_baolishuchu_juesebanzi2_anniu.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
b_baolishuchu_juesebanzi2_gouxuan.png Merge branch 'china/dev-c' into china/ios 2021-05-19 14:12:37 +08:00
b_baolishuchu_juesebanzi2_gouxuan.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
b_baolishuchu_juesebanzi2_mingzi.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
b_baolishuchu_juesebanzi2_mingzi.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
bd_yiyaobeijin.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
bd_yiyaobeijin.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_cjjs_baitou_02.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_cjjs_baitou_02.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_cjjs_heitou_01.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_cjjs_heitou_01.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_cjjs_heizi.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_cjjs_heizi.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_cjjs_xiaotu.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_cjjs_xiaotu.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_zuoqi_mingcheng.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
c_zuoqi_mingcheng.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
mapnpc_f.png
mapnpc_f.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
p_phb_ziji.png
p_phb_ziji.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
q_qinlongmibao_jiesuozhenbao198.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
q_qinlongmibao_jiesuozhenbao198.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_chouka_button_001.png
r_chouka_button_001.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_chouka_button_002.png
r_chouka_button_002.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_chouka_button_003.png
r_chouka_button_003.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_chouka_button_004.png
r_chouka_button_004.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_chouka_xiabanner_01.png
r_chouka_xiabanner_01.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_chouka_xiabanner_03.png
r_chouka_xiabanner_03.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_fabao_xiaobiaodi.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_fabao_xiaobiaodi.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_fenjie_dibu.png
r_fenjie_dibu.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_gonggao.png
r_gonggao.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_guanka_dainluodi.png
r_guanka_dainluodi.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_guanka_dainluodi_01.png
r_guanka_dainluodi_01.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_guanka_kuangdi.png
r_guanka_kuangdi.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_guanka_paishengzi.png
r_guanka_paishengzi.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_guanka_richang_guanbicha.png
r_guanka_richang_guanbicha.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_guanka_richang_jinduzongdi.png
r_guanka_richang_jinduzongdi.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_guanka_richang_tanchuandi_jia.png
r_guanka_richang_tanchuandi_jia.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_hero_001.png
r_hero_001.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_hero_button_001.png
r_hero_button_001.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_hero_button_002.png
r_hero_button_002.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_hero_button_003.png
r_hero_button_003.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_hero_fengexian_001.png
r_hero_fengexian_001.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_hero_tanchuangdi.png
r_hero_tanchuangdi.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_hero_zhuanjidiandi_02.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_hero_zhuanjidiandi_02.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_lianzao_bannerjiantou.png
r_lianzao_bannerjiantou.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_lianzao_taochuangdi_01.png
r_lianzao_taochuangdi_01.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_lianzao_taochuangdi_02.png
r_lianzao_taochuangdi_02.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_map_dark.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_map_dark.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_qiehuanzhanghao.png
r_qiehuanzhanghao.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_renwu_tiao_004.png
r_renwu_tiao_004.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_renwu_yijitanchuang_003.png
r_renwu_yijitanchuang_003.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_renwu_zhankaikuang.png
r_renwu_zhankaikuang.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_tanchuang_button_001.png
r_tanchuang_button_001.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_tanchuang_button_002.png
r_tanchuang_button_002.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_tanchuang_erji_003.png
r_tanchuang_erji_003.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_tanchuang_lianjie_0001.png
r_tanchuang_lianjie_0001.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_tanchuang_lianjie_0002.png
r_tanchuang_lianjie_0002.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_tanchuang_lianjie_0003.png
r_tanchuang_lianjie_0003.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_xinshou_001.png
r_xinshou_001.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_chengyuan_002.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_chengyuan_002.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_jiantou01.png
r_zhandou_jiantou01.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_jiantou02.png
r_zhandou_jiantou02.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_jiantou03.png
r_zhandou_jiantou03.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_jiantou04.png
r_zhandou_jiantou04.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_jielingqianghua.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_jielingqianghua.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_tishengxian.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_tishengxian.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_zhaomu_002.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_zhaomu_002.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_zhuangshi_001.png
r_zhandou_zhuangshi_001.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zhandou_zhuangshi_003.png
r_zhandou_zhuangshi_003.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zjm_mengheidi.png 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
r_zjm_mengheidi.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00
w_wybq_fenye.png
w_wybq_fenye.png.meta 【ios】资源位置修改 2021-04-20 13:57:33 +08:00