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
..
ActivityDetail.lua	文本还原	2021-02-20 16:43:44 +08:00
ActivityDetail.lua.meta	限时商市 珍奇宝阁	2020-08-21 11:23:46 +08:00
DynamicActivityManager.lua	【本地化】代码本地化提交	2021-01-26 17:08:39 +08:00
DynamicActivityManager.lua.meta	【社稷大典】提交5	2020-10-24 18:49:32 +08:00
DynamicActivityPanel.lua	Merge branch 'master_xma_local' into gx/xma_local	2021-02-05 14:30:05 +08:00
DynamicActivityPanel.lua.meta	限时召唤 乾坤宝盒 页面整合	2020-07-28 09:48:02 +08:00
DynamicTaskPage.lua	文本还原	2021-02-20 16:43:44 +08:00
DynamicTaskPage.lua.meta	勇冠三军，叱咤风云活动添加	2020-09-27 16:09:55 +08:00
LeiJiChongZhiPage.lua	文本还原	2021-02-20 16:43:44 +08:00
LeiJiChongZhiPage.lua.meta	限时商市 珍奇宝阁	2020-08-21 11:23:46 +08:00
LingShouBaoGe.lua	Merge branch 'local_to_xmadev' into xma/dev	2021-02-20 17:55:52 +08:00
LingShouBaoGe.lua.meta	【灵兽抽卡】 开坑	2020-11-10 11:34:19 +08:00
LingShouBaoGeOneResultPanel.lua	文本还原	2021-02-20 16:43:44 +08:00
LingShouBaoGeOneResultPanel.lua.meta	【灵兽宝阁】抽卡逻辑完善了	2020-11-11 16:53:04 +08:00
LingShouBaoGeTenResultPanel.lua	文本还原	2021-02-20 16:43:44 +08:00
LingShouBaoGeTenResultPanel.lua.meta	【灵兽宝阁】抽卡逻辑完善了	2020-11-11 16:53:04 +08:00
LingShowTeHui.lua	文本还原	2021-02-20 16:43:44 +08:00
LingShowTeHui.lua.meta	[灵兽特惠] 提交	2020-11-12 11:31:33 +08:00
QianKunBox.lua	Merge branch 'local_to_xmadev' into xma/dev	2021-02-20 17:55:52 +08:00
QianKunBox.lua.meta	限时商市 珍奇宝阁	2020-08-21 11:23:46 +08:00
QianKunBoxBuyOnePanel.lua	文本还原	2021-02-20 16:43:44 +08:00
QianKunBoxBuyOnePanel.lua.meta	限时商市 珍奇宝阁	2020-08-21 11:23:46 +08:00
QianKunBoxBuyTenPanel.lua	文本还原	2021-02-20 16:43:44 +08:00
QianKunBoxBuyTenPanel.lua.meta	限时商市 珍奇宝阁	2020-08-21 11:23:46 +08:00
RewardPreview.lua	文本还原	2021-02-20 16:43:44 +08:00
RewardPreview.lua.meta	限时商市 珍奇宝阁	2020-08-21 11:23:46 +08:00
SheJiDaDian.lua	文本还原	2021-02-20 16:43:44 +08:00
SheJiDaDian.lua.meta	【社稷大典】提交	2020-10-24 18:20:43 +08:00
ShengXingYouLi.lua	文本还原	2021-02-20 16:43:44 +08:00
ShengXingYouLi.lua.meta	【升星有礼】完成	2020-12-21 15:41:31 +08:00
ShengYiTianJiang.lua	文本还原	2021-02-20 16:43:44 +08:00
ShengYiTianJiang.lua.meta	皮肤提交	2020-11-06 20:36:38 +08:00
TimeLimitedCall.lua	Merge branch 'local_to_xmadev' into xma/dev	2021-02-20 17:55:52 +08:00
TimeLimitedCall.lua.meta	限时商市 珍奇宝阁	2020-08-21 11:23:46 +08:00
XianShiShangShi.lua	文本还原	2021-02-20 16:43:44 +08:00
XianShiShangShi.lua.meta	限时商市 珍奇宝阁	2020-08-21 11:23:46 +08:00
XiangYaoDuoBao.lua	文本还原	2021-02-20 16:43:44 +08:00
XiangYaoDuoBao.lua.meta	【降妖夺宝】开坑	2020-12-21 17:13:05 +08:00
XinJiangLaiXi.lua	文本还原	2021-02-20 16:43:44 +08:00
XinJiangLaiXi.lua.meta	【新将来袭】开坑	2020-12-01 13:51:13 +08:00
YiJingBaoKu.lua	文本还原	2021-02-20 16:43:44 +08:00
YiJingBaoKu.lua.meta	【易经宝库】开坑 搭界面 和做动画	2020-11-02 18:05:24 +08:00
ZhenQiYiBaoPage.lua	文本还原	2021-02-20 16:43:44 +08:00
ZhenQiYiBaoPage.lua.meta	限时商市 珍奇宝阁	2020-08-21 11:23:46 +08:00