miduo_client/Assets/ManagedResources/Atlas
jiaoyangna bdb47125a6 Merge branch 'local_to_dev' into xma/dev
# Conflicts:
#	Assets/ManagedResources/Prefabs/UI/ActivityGift/OpenSeverWelfarePanel.prefab
#	Assets/ManagedResources/Prefabs/UI/CompoundHero/CompoundHeroPanel.prefab
#	Assets/ManagedResources/~Lua/Common/GlobalDefine.lua
#	Assets/ManagedResources/~Lua/Common/functions.lua
#	Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua
#	Assets/ManagedResources/~Lua/Modules/Adventure/View/AdventureView.lua
#	Assets/ManagedResources/~Lua/Modules/ArenaTopMatch/View/ATM_MainMatchView.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/Unit/BattleUnit.lua
#	Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/BuffCtrl.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonScoreSortPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Carbon/CarbonTypePanelV2.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/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/ExpeditionManager.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/CarDelay/GuildCarDelayMainPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosInfoPanel.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/DeathPos/DeathPosRankPopup.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/GuildMemberInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_GetView.lua
#	Assets/ManagedResources/~Lua/Modules/Guild/RedPacketView/RedPacket_RankView.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/MonthCardPage.lua
#	Assets/ManagedResources/~Lua/Modules/Operating/UppperMonthCard.lua
#	Assets/ManagedResources/~Lua/Modules/Player/PrivilegeManager.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/PlayerInfoPopup.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/RoleAwakeSuccessPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleEquipTreasureChangePopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RolePosInfoPopup.lua
#	Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleTalismanPanelV2.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/ItemView.lua
#	Assets/ManagedResources/~Lua/View/JumpView.lua
#	Assets/ManagedResources/~Lua/View/ShopView.lua
#	FontArt/ArtFont_zh/hongmengzhen_zh.png
#	FontArt/ArtFont_zh/jianmushenshu_zh.png
#	FontArt/ArtFont_zh/silingshilian_zh.png
2021-03-02 16:44:38 +08:00
..
ActivityAltas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
AdventureAltas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ArenaAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ArenaTopMatchAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
BattleAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
CarbonAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ChatAtlas 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
CommonAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
CreateNameAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
DemonSlayerAtlas 三界除魔功能添加 2020-09-27 16:43:33 +08:00
DiffMonsterAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
DyAct_Activity3 图片提交 2021-02-20 19:22:57 +08:00
DyAct_Activity4 图片提交 2021-02-20 19:22:57 +08:00
DyAct_Activity5 主题活动提交 2021-02-25 10:20:14 +08:00
DyAct_SuoXiangPiMi 【本地化】资源提交 2021-01-26 17:56:55 +08:00
DyAct_TongQiangTieBi 【本地化】资源提交 2021-01-26 17:56:55 +08:00
DyAct_XiangYaoDuoBao 【本地化】资源提交 2021-01-26 17:56:55 +08:00
DyAct_XinJiangLaiXi 【本地化】新翻译资源导出,修复限时召唤界面白片 2021-02-04 11:22:59 +08:00
DynamicActivityAtlas 图片提交 2021-02-26 13:44:50 +08:00
EightDayAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ExpeditionAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
FindFairyAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
FindTreasureAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
FirstRechargeAtlas 【本地化】修复白片得问题 2021-02-23 19:12:16 +08:00
FogMaskAtlas 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
FormationAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
GuildAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
HeroCompoundReplaceAtlas 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
HongMengZhenAtlas 共鸣 英雄界面 提交 2021-02-26 17:26:17 +08:00
JumpServer 【本地化】资源提交 2021-01-26 17:56:55 +08:00
LoginAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
MainAtlas 主城提交 2021-02-23 09:51:37 +08:00
MapAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
MapChooseAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
MonsterCampAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
NiuZhuanQianKunAtlas 【本地化】ui资源本地化导出 2021-02-05 16:06:10 +08:00
OnlineRewardAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
PassGiftAtlas 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
PokemonAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
PopupAtlas Merge branch 'local_to_xmadev' into xma/dev 2021-02-20 17:55:52 +08:00
PrayAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
PublicAtlas Merge branch 'local_to_xmadev' into xma/dev 2021-02-20 17:55:52 +08:00
RecruitAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ResolveAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
RoleInfoAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
SecretBoxAtlas 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
SettingPlayerAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ShopAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
SoulPrintAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
SunroAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
SupremeHeroAtlas 【本地化】修复白片得问题 2021-02-23 19:12:16 +08:00
TagAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
TagButtonAtlas 图片提交 2021-02-20 19:23:38 +08:00
UpGradePackageAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
VipAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
WorkShopAtlas 【本地化】资源提交 2021-01-26 17:56:55 +08:00
XiaoYao 【本地化】资源提交 2021-01-26 17:56:55 +08:00
ActivityAltas.meta 提交 2020-05-09 13:31:21 +08:00
AdventureAltas.meta 提交 2020-05-09 13:31:21 +08:00
ArenaAtlas.meta 提交 2020-05-09 13:31:21 +08:00
ArenaTopMatchAtlas.meta 提交 2020-05-09 13:31:21 +08:00
BattleAtlas.meta 提交 2020-05-09 13:31:21 +08:00
CarbonAtlas.meta 提交 2020-05-09 13:31:21 +08:00
ChatAtlas.meta 提交 2020-05-09 13:31:21 +08:00
CommonAtlas.meta 【本地化】资源提交 2021-01-26 17:56:55 +08:00
CreateNameAtlas.meta 提交 2020-05-09 13:31:21 +08:00
DemonSlayerAtlas.meta 修复新玩家登陆卡在登陆100% 2020-09-27 20:40:20 +08:00
DiffMonsterAtlas.meta 提交 2020-05-09 13:31:21 +08:00
DyAct_Activity3.meta 【ID1008002】 2021-01-25 20:34:16 +08:00
DyAct_Activity4.meta 【活动需求】勇往直前主题活动(社稷大典) 2021-02-18 10:52:02 +08:00
DyAct_SuoXiangPiMi.meta 【资源文件夹】 2020-12-28 19:28:05 +08:00
DyAct_TongQiangTieBi.meta 【本周优化修改】 2021-01-15 22:11:38 +08:00
DyAct_XiangYaoDuoBao.meta 【资源文件夹】 2020-12-28 19:28:05 +08:00
DyAct_XinJiangLaiXi.meta 【资源文件夹】 2020-12-28 19:28:05 +08:00
DynamicActivityAtlas.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
EightDayAtlas.meta 切换为android平台 2020-05-15 17:46:08 +08:00
ExpeditionAtlas.meta 提交 2020-05-09 13:31:21 +08:00
FindFairyAtlas.meta 提交 2020-05-09 13:31:21 +08:00
FindTreasureAtlas.meta 提交 2020-05-09 13:31:21 +08:00
FirstRechargeAtlas.meta 提交 2020-05-09 13:31:21 +08:00
FogMaskAtlas.meta 提交 2020-05-09 13:31:21 +08:00
FormationAtlas.meta 提交 2020-05-09 13:31:21 +08:00
GuildAtlas.meta 提交 2020-05-09 13:31:21 +08:00
HeroCompoundReplaceAtlas.meta 资源压缩方式修改,苹果资源压缩方式添加, 2020-08-14 17:29:06 +08:00
HongMengZhenAtlas.meta 【鸿蒙阵】二次提交 2020-12-17 10:41:00 +08:00
JumpServer.meta 【本地化】资源提交 2021-01-26 17:56:55 +08:00
LoginAtlas.meta 提交 2020-05-09 13:31:21 +08:00
MainAtlas.meta 提交 2020-05-09 13:31:21 +08:00
MapAtlas.meta 提交 2020-05-09 13:31:21 +08:00
MapChooseAtlas.meta 提交 2020-05-09 13:31:21 +08:00
MonsterCampAtlas.meta 提交 2020-05-09 13:31:21 +08:00
NiuZhuanQianKunAtlas.meta 【牛转乾坤】资源提交 2021-01-20 14:52:12 +08:00
OnlineRewardAtlas.meta 切换为android平台 2020-05-15 17:46:08 +08:00
PassGiftAtlas.meta 提交 2020-05-09 13:31:21 +08:00
PokemonAtlas.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00
PopupAtlas.meta 提交 2020-05-09 13:31:21 +08:00
PrayAtlas.meta 提交 2020-05-09 13:31:21 +08:00
PublicAtlas.meta 提交 2020-05-09 13:31:21 +08:00
RecruitAtlas.meta 提交 2020-05-09 13:31:21 +08:00
ResolveAtlas.meta 提交 2020-05-09 13:31:21 +08:00
RoleInfoAtlas.meta 提交 2020-05-09 13:31:21 +08:00
SecretBoxAtlas.meta 提交 2020-05-09 13:31:21 +08:00
SettingPlayerAtlas.meta 提交 2020-05-09 13:31:21 +08:00
ShopAtlas.meta 提交 2020-05-09 13:31:21 +08:00
SoulPrintAtlas.meta 提交 2020-05-09 13:31:21 +08:00
SunroAtlas.meta 内网测试 0.15.14 2020-06-18 20:39:29 +08:00
SupremeHeroAtlas.meta 资源位置移动 2020-08-25 19:26:51 +08:00
TagAtlas.meta 提交 2020-05-09 13:31:21 +08:00
TagButtonAtlas.meta 提交 2020-05-09 13:31:21 +08:00
UpGradePackageAtlas.meta 内网测试 0.15.12 2020-06-13 11:47:13 +08:00
VipAtlas.meta 提交 2020-05-09 13:31:21 +08:00
WorkShopAtlas.meta 内网测试 0.15.5 2020-06-19 16:18:05 +08:00
XiaoYao.meta 【资源】 修改资源路径 2020-11-02 19:54:12 +08:00