无尽进图武神将问题、取消对话战斗结束神将数据界面

dev_chengFeng
ZhangBiao 2020-08-26 16:22:37 +08:00
parent 8a285e4227
commit dc9615b4fc
5 changed files with 11 additions and 6 deletions

View File

@ -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

View File

@ -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

View File

@ -85,6 +85,7 @@ function this.InitVar()
this.curCarbonType = 0--当前副本玩法类型(副本很多东西不用了,慢慢删,进图只用传 编队、玩法 之后服务器返回mapId)
this.Mapping = false
this.endlessEnter = false
end
function this.InitData(msg)

View File

@ -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
-- =====================================

View File

@ -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)