miduo_client/Assets/ManagedResources/Atlas/PopupAtlas
jiaoyangna a05694855c Merge branch 'local_to_xmadev' into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Expedition/ExpeditionMonsterInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Formation/FormationPanelV2.prefab
#	Assets/ManagedResources/Prefabs/UI/Main/MainPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/Popup/RoleGetInfoPopup.prefab
#	Assets/ManagedResources/Prefabs/UI/Resolve/ResolvePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleEquipPanel.prefab
#	Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleInfoPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagManager.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Bag/BagResolveAnCompoundPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/BattlePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/DailyCarbonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/XuanYuanMirrorPanelList.lua
#	Assets/ManagedResources/~Lua/Modules/Chat/ChatManager.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/CompoundSelectListPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Compound/view/CompoundPanel_SoulPrint.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroFirstUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/CompoundHero/CompoundHeroUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonActivatePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DiffMonster/DemonUpGradePanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/DynamicTaskPage.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGe.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/LingShouBaoGeTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/QianKunBox.lua
#	Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitedCall.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/ExpeditionHeroListResurgencePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Expedition/View/ExpeditionMonsterInfo_Shop.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/DiffMonsterBuy.lua
#	Assets/ManagedResources/~Lua/Modules/Expert/PatFacePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FastExploreInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightAreaRewardFullPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightMopUpEndPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Fight/View/InvadeMonsterView.lua
#	Assets/ManagedResources/~Lua/Modules/FindTreasure/FindTreasureDispatchPanel.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MapFightBuyExtraPopup.lua
#	Assets/ManagedResources/~Lua/Modules/FormFightMatch/MatchDataManager.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/ElementPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua
#	Assets/ManagedResources/~Lua/Modules/GlobalActTimeCtrl/ActTimeCtrlManager.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Aid/GuildAid_GuildAid.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildCreatePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/GuildFetePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_SendView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Skill/GuildSkillUpLvPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptMainPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/Transcript/GuildTranscriptManager.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookEquipInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/HandBook/HandBookHeroInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffChoosePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/BuffOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua
#	Assets/ManagedResources/~Lua/Modules/Map/MapOptionPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Map/View/EndLessMapView.lua
#	Assets/ManagedResources/~Lua/Modules/Message/NotEnoughPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Mission/MissionDailyPanel_SecretTreasureTrail.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GiftPackPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/GrowthGiftPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonOneResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonSummonTenResultPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/PassGiftPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardEquipSingleShowPopup2.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RewardItemSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/RoleGetInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SoulPrintPopUp.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/SupremeHeroPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/TalismanInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_EquipSingleSell.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_GuildSkillReset.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_PokemonChipCompound.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_ResolveEquipTreasure.lua
#	Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_TrialXingYao.lua
#	Assets/ManagedResources/~Lua/Modules/Pray/PrayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/QuickPurchase/QuickCoinPurchasePart.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/ElementDrawCardPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/RecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/SingleRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Recruit/TenRecruitPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Dismantle.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Recall.lua
#	Assets/ManagedResources/~Lua/Modules/Resolve/View/Resolve_Talisman.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/EquipTreasureStrongPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarLayout.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/TalismanUpStarListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/SevenDayCarnival/SevenDayCarnivalPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopExchangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/Shop/ShopManager.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/RewardSoulPrintSingleShowPopup.lua
#	Assets/ManagedResources/~Lua/Modules/SoulPrint/SoulPrintPopUpV2.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryDialoguePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Story/StoryManager.lua
#	Assets/ManagedResources/~Lua/Modules/TreasureOfSomebody/TreasureOfSomebodyScorePageV2.lua
#	Assets/ManagedResources/~Lua/Modules/Vip/VipPanelV2.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopArmorOnePanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShopMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/WorkShop/WorkShowTechnologPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoYaoYouPanel.lua
#	Assets/ManagedResources/~Lua/Modules/XiaoYao/XiaoyaoHeroGetPopup.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua
2021-02-20 17:55:52 +08:00
..
ArtFont 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ArtFont.meta
l_libao_kuang.png
l_libao_kuang.png.meta
mapnpc_f.png
mapnpc_f.png.meta
p_phb_ziji.png
p_phb_ziji.png.meta
r_chouka_button_001.png
r_chouka_button_001.png.meta
r_chouka_button_002.png
r_chouka_button_002.png.meta
r_chouka_button_003.png
r_chouka_button_003.png.meta
r_chouka_button_004.png
r_chouka_button_004.png.meta
r_chouka_xiabanner_01.png
r_chouka_xiabanner_01.png.meta
r_chouka_xiabanner_03.png
r_chouka_xiabanner_03.png.meta
r_fenjie_dibu.png
r_fenjie_dibu.png.meta
r_gonggao.png
r_gonggao.png.meta
r_guanka_dainluodi.png
r_guanka_dainluodi.png.meta
r_guanka_dainluodi_01.png
r_guanka_dainluodi_01.png.meta
r_guanka_kuangdi.png
r_guanka_kuangdi.png.meta
r_guanka_paishengzi.png
r_guanka_paishengzi.png.meta
r_guanka_paizi.png
r_guanka_paizi.png.meta
r_guanka_richang_guanbicha.png
r_guanka_richang_guanbicha.png.meta
r_guanka_richang_jindudi.png
r_guanka_richang_jindudi.png.meta
r_guanka_richang_jinduzongdi.png
r_guanka_richang_jinduzongdi.png.meta
r_guanka_richang_tanchuandi_jia.png
r_guanka_richang_tanchuandi_jia.png.meta
r_hero_001.png
r_hero_001.png.meta
r_hero_button_001.png
r_hero_button_001.png.meta
r_hero_button_002.png
r_hero_button_002.png.meta
r_hero_button_003.png
r_hero_button_003.png.meta
r_hero_diwen.png
r_hero_diwen.png.meta
r_hero_fengexian_001.png
r_hero_fengexian_001.png.meta
r_hero_tanchuangdi.png
r_hero_tanchuangdi.png.meta
r_hero_tiao.png
r_hero_tiao.png.meta
r_lianzao_bannerjiantou.png
r_lianzao_bannerjiantou.png.meta
r_lianzao_gongxihuodebeiban.png
r_lianzao_gongxihuodebeiban.png.meta
r_lianzao_taochuangdi_01.png
r_lianzao_taochuangdi_01.png.meta
r_lianzao_taochuangdi_02.png
r_lianzao_taochuangdi_02.png.meta
r_qiehuanzhanghao.png
r_qiehuanzhanghao.png.meta
r_renwu_tiao_004.png
r_renwu_tiao_004.png.meta 【鸿蒙阵补齐资源】 2021-01-11 11:03:06 +08:00
r_renwu_yijitanchuang_003.png
r_renwu_yijitanchuang_003.png.meta
r_renwu_zhankaikuang.png
r_renwu_zhankaikuang.png.meta
r_tanchuang_button_001.png
r_tanchuang_button_001.png.meta
r_tanchuang_button_002.png
r_tanchuang_button_002.png.meta
r_tanchuang_erji_001.png
r_tanchuang_erji_001.png.meta
r_tanchuang_erji_003.png
r_tanchuang_erji_003.png.meta
r_tanchuang_fenge_001.png
r_tanchuang_fenge_001.png.meta
r_tanchuang_fenge_002.png
r_tanchuang_fenge_002.png.meta
r_tanchuang_lianjie_0001.png
r_tanchuang_lianjie_0001.png.meta
r_tanchuang_lianjie_0002.png
r_tanchuang_lianjie_0002.png.meta
r_tanchuang_lianjie_0003.png
r_tanchuang_lianjie_0003.png.meta
r_tanchuang_paomadeng_001.png
r_tanchuang_paomadeng_001.png.meta
r_tongyong_tiao.png
r_tongyong_tiao.png.meta
r_tongyong_xiaanniu_di.png
r_tongyong_xiaanniu_di.png.meta
r_xinshou_001.png
r_xinshou_001.png.meta
r_xinshou_002.png
r_xinshou_002.png.meta
r_zhandou_jiantou01.png
r_zhandou_jiantou01.png.meta
r_zhandou_jiantou02.png
r_zhandou_jiantou02.png.meta
r_zhandou_jiantou03.png
r_zhandou_jiantou03.png.meta
r_zhandou_jiantou04.png
r_zhandou_jiantou04.png.meta
r_zhandou_zhuangshi_001.png
r_zhandou_zhuangshi_001.png.meta
r_zhandou_zhuangshi_002.png
r_zhandou_zhuangshi_002.png.meta
r_zhandou_zhuangshi_003.png
r_zhandou_zhuangshi_003.png.meta
r_zjm_didi.png
r_zjm_didi.png.meta
r_zjm_icon-di.png
r_zjm_icon-di.png.meta
r_zjm_xiatiao.png
r_zjm_xiatiao.png.meta
w_wybq_fenye.png
w_wybq_fenye.png.meta
y-ystx-kuang.png
y-ystx-kuang.png.meta
y-ystx-kuang2.png
y-ystx-kuang2.png.meta
y-ystx-menhei.png
y-ystx-menhei.png.meta
z_zddh_kuang.png
z_zddh_kuang.png.meta