From dc9615b4fc52d1081e1f83e6ca4e069a7cd4cc8b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Wed, 26 Aug 2020 16:22:37 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E8=BF=9B=E5=9B=BE=E6=AD=A6?= =?UTF-8?q?=E7=A5=9E=E5=B0=86=E9=97=AE=E9=A2=98=E3=80=81=E5=8F=96=E6=B6=88?= =?UTF-8?q?=E5=AF=B9=E8=AF=9D=E6=88=98=E6=96=97=E7=BB=93=E6=9D=9F=E7=A5=9E?= =?UTF-8?q?=E5=B0=86=E6=95=B0=E6=8D=AE=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Battle/View/BattleEndPanel.lua | 1 + .../~Lua/Modules/Formation/View/CarbonFormation.lua | 1 + .../ManagedResources/~Lua/Modules/Map/MapManager.lua | 1 + .../~Lua/Modules/Map/View/MapControllView.lua | 10 ++++++---- .../~Lua/Modules/Player/RedpotManager.lua | 4 ++-- 5 files changed, 11 insertions(+), 6 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua index 768909e605..9be3414ede 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/BattleEndPanel.lua @@ -10,6 +10,7 @@ function BattleEndPanel:InitComponent() this.bg = Util.GetGameObject(self.gameObject, "btnBack") this.roleGrid = Util.GetGameObject(self.gameObject, "roleGrid") + this.roleGrid:SetActive(false) this.awardGrid = Util.GetGameObject(self.gameObject, "Bg/ItemRoot/grid") this.btnResult = Util.GetGameObject(self.gameObject, "btnResult") end diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua index 1c27781d23..38af237fe8 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/CarbonFormation.lua @@ -119,6 +119,7 @@ function this.On_Btn2_Click() end else LogGreen("进入的副本difficulty:"..CarbonManager.difficulty.." itemId: "..tostring(itemId)) + MapManager.endlessEnter = true this.EnterMapbyType(CarbonManager.difficulty, itemId) end diff --git a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua index c5dcf73257..84f05e08f1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/MapManager.lua @@ -85,6 +85,7 @@ function this.InitVar() this.curCarbonType = 0--当前副本玩法类型(副本很多东西不用了，慢慢删，进图只用传 编队、玩法 之后服务器返回mapId) this.Mapping = false + this.endlessEnter = false end function this.InitData(msg) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua index 4d466622e9..5ab998a2b4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapControllView.lua @@ -252,11 +252,13 @@ function this.OnClickTile(u, v) PopupTipPanel.ShowTip(Language[11300]) return end - - if not EndLessMapManager.IsMapTeamAlive() then - PopupTipPanel.ShowTip(Language[11301]) - return + if not MapManager.endlessEnter then + if not EndLessMapManager.IsMapTeamAlive() then + PopupTipPanel.ShowTip(Language[11301]) + return + end end + MapManager.endlessEnter = false end end -- ===================================== diff --git a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua index 1a36d5893f..cd2513cff4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/RedpotManager.lua @@ -207,7 +207,7 @@ function this.InitRedPointAllRelate() RPData:SetParent(RedPointType.Expert_SoulPrint, RedPointType.Expert) RPData:SetParent(RedPointType.LuckyCat, RedPointType.Expert) RPData:SetParent(RedPointType.Expert_WeekCard, RedPointType.Expert) - RPData:SetParent(RedPointType.HERO_STAR_GIFT, RedPointType.Expert) + -- RPData:SetParent(RedPointType.HERO_STAR_GIFT, RedPointType.Expert) RPData:SetParent(RedPointType.Expert_FindTreasure, RedPointType.Expert) RPData:SetParent(RedPointType.Expert_LuckyTurn, RedPointType.Expert) RPData:SetParent(RedPointType.Expert_Recruit, RedPointType.Expert) @@ -347,7 +347,7 @@ function this.RegisterRedCheckFunc() RPData:AddCheckFunc(RedPointType.Expert_SoulPrint, ActivityGiftManager.ExpterActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.LuckyTurn, LuckyTurnTableManager.ReturnRedPointState) RPData:AddCheckFunc(RedPointType.Expert_WeekCard, ActivityGiftManager.WeedCardActivityIsShowRedPoint) - RPData:AddCheckFunc(RedPointType.HERO_STAR_GIFT, OperatingManager.IsHeroStarGiftActive) + -- RPData:AddCheckFunc(RedPointType.HERO_STAR_GIFT, OperatingManager.IsHeroStarGiftActive) --战力排行 RPData:AddCheckFunc(RedPointType.WarPowerSort_Sort, ActivityGiftManager.WarPowerSortActivityIsShowRedPoint) RPData:AddCheckFunc(RedPointType.RankingSort, RankingManager.RefreshRedPoint)