ZhangBiao 1c191a78b9 Merge branch '0功能/玉虚论道' into 0功能/七界试炼 ... # Conflicts: # Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralBigPopup.prefab # Assets/ManagedResources/Prefabs/UI/Popup/GeneralPopup.prefab # Assets/ManagedResources/Prefabs/UI/Popup/RewardItemPopup.prefab # Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset # Assets/ManagedResources/~Lua/Common/GlobalDefine.lua # Assets/ManagedResources/~Lua/Message/CommonProto_pb.lua # Assets/ManagedResources/~Lua/Message/MessageTypeProto_pb.lua # Assets/ManagedResources/~Lua/Message/PlayerInfoProto_pb.lua # Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralBigPopup.lua # Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua # Assets/ManagedResources/~Lua/Modules/Main/GMPanel.lua # Assets/ManagedResources/~Lua/Modules/Popup/GeneralPopup.lua # Assets/ManagedResources/~Lua/Modules/Popup/RewardItemPopup.lua # Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua # Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/HeavenUnlockExtraRewardPanel.lua		2021-09-22 11:46:24 +08:00
..
GeneralPopup_BuyXuanYuanMirrorTims.lua	…
GeneralPopup_BuyXuanYuanMirrorTims.lua.meta	…
GeneralPopup_ChooseUpHero.lua	…
GeneralPopup_ChooseUpHero.lua.meta	…
GeneralPopup_ChooseUpSoul.lua	【编队优化】	2021-09-10 16:25:38 +08:00
GeneralPopup_ChooseUpSoul.lua.meta	…
GeneralPopup_EndlessPanel.lua	…
GeneralPopup_EndlessPanel.lua.meta	…
GeneralPopup_EquipBatchSell.lua	…
GeneralPopup_EquipBatchSell.lua.meta	…
GeneralPopup_EquipCompound.lua	…
GeneralPopup_EquipCompound.lua.meta	…
GeneralPopup_EquipSingleSell.lua	…
GeneralPopup_EquipSingleSell.lua.meta	…
GeneralPopup_ExpeditionReply.lua	…
GeneralPopup_ExpeditionReply.lua.meta	…
GeneralPopup_FightReturnLookFourEle.lua	回放修改提交	2021-09-01 18:13:58 +08:00
GeneralPopup_FightReturnLookFourEle.lua.meta	…
GeneralPopup_GuildAid.lua	…
GeneralPopup_GuildAid.lua.meta	…
GeneralPopup_GuildAidFindBoxReward.lua	…
GeneralPopup_GuildAidFindBoxReward.lua.meta	…
GeneralPopup_GuildSkillReset.lua	…
GeneralPopup_GuildSkillReset.lua.meta	…
GeneralPopup_HeavenUnlockExtraRewardPanel.lua	【七界试炼】提交	2021-09-17 19:29:58 +08:00
GeneralPopup_HeavenUnlockExtraRewardPanel.lua.meta	…
GeneralPopup_LingShouBaoGe.lua	…
GeneralPopup_LingShouBaoGe.lua.meta	…
GeneralPopup_NewAddWishHero.lua	报错修改提交	2021-07-23 11:17:50 +08:00
GeneralPopup_NewAddWishHero.lua.meta	【心愿抽卡】增加英雄加入卡池的天数条件	2021-07-21 17:35:38 +08:00
GeneralPopup_Onhook.lua	…
GeneralPopup_Onhook.lua.meta	…
GeneralPopup_PokemonChipCompound.lua	…
GeneralPopup_PokemonChipCompound.lua.meta	…
GeneralPopup_PokemonResolve.lua	…
GeneralPopup_PokemonResolve.lua.meta	…
GeneralPopup_PokemonRestore.lua	…
GeneralPopup_PokemonRestore.lua.meta	…
GeneralPopup_PokemonUpZhenAddPro.lua	…
GeneralPopup_PokemonUpZhenAddPro.lua.meta	…
GeneralPopup_QiJieSingleTreasure.lua	【七界试炼】完成！！！	2021-09-17 19:57:45 +08:00
GeneralPopup_QiJieSingleTreasure.lua.meta	【七界试炼】提交	2021-09-09 11:10:43 +08:00
GeneralPopup_QinglongSerectTreasureBuyLevel.lua	…
GeneralPopup_QinglongSerectTreasureBuyLevel.lua.meta	…
GeneralPopup_RecruitBox.lua	…
GeneralPopup_RecruitBox.lua.meta	…
GeneralPopup_RecruitConfirm.lua	…
GeneralPopup_RecruitConfirm.lua.meta	…
GeneralPopup_RecruitReward.lua	…
GeneralPopup_RecruitReward.lua.meta	…
GeneralPopup_ResolveDismantle.lua	…
GeneralPopup_ResolveDismantle.lua.meta	…
GeneralPopup_ResolveEquipTreasure.lua	…
GeneralPopup_ResolveEquipTreasure.lua.meta	…
GeneralPopup_ResolveRecall.lua	…
GeneralPopup_ResolveRecall.lua.meta	…
GeneralPopup_SheJiCheckGuild.lua	…
GeneralPopup_SheJiCheckGuild.lua.meta	…
GeneralPopup_TalismanResolve.lua	…
GeneralPopup_TalismanResolve.lua.meta	…
GeneralPopup_TreasureCompound.lua	…
GeneralPopup_TreasureCompound.lua.meta	…
GeneralPopup_TrialBomb.lua	…
GeneralPopup_TrialBomb.lua.meta	…
GeneralPopup_TrialGain.lua	…
GeneralPopup_TrialGain.lua.meta	…
GeneralPopup_TrialSetting.lua	…
GeneralPopup_TrialSetting.lua.meta	…
GeneralPopup_TrialToNextFloor.lua	…
GeneralPopup_TrialToNextFloor.lua.meta	…
GeneralPopup_TrialXingYao.lua	…
GeneralPopup_TrialXingYao.lua.meta	…
GeneralPopup_XiaoYaoYouItemExchange.lua	…
GeneralPopup_XiaoYaoYouItemExchange.lua.meta	…
GeneralPopup_YiJingBaoKuConfirm.lua	…
GeneralPopup_YiJingBaoKuConfirm.lua.meta	…
GeneralPopup_YunYouMan.lua	…
GeneralPopup_YunYouMan.lua.meta	…