diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua index c702b81597..5f8ed40ea4 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/CarbonManager.lua @@ -817,7 +817,7 @@ function this. CarbonRedCheck(redType) end return false --心魔 - elseif redType == RedPointType.EpicExplore then + elseif redType == RedPointType.EpicExplore_LevleReward then if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.MONSTER_COMING) then for k,v in ConfigPairs(ConfigManager.GetConfig(ConfigName.FloodConfig)) do if v.SpecialReward and #v.SpecialReward > 0 then @@ -826,9 +826,9 @@ function this. CarbonRedCheck(redType) return true end end - end + end end - return MonsterCampManager.GetCanBattleCount() > 0 + return false --大闹天宫 elseif redType == RedPointType.OrdinaryExplore then if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.EXPEDITION) then diff --git a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleLevelInfoPopup.lua b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleLevelInfoPopup.lua index e2c1d7dd0a..b71c70a9f6 100644 --- a/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleLevelInfoPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/FightLevel/FightLevelSingleLevelInfoPopup.lua @@ -61,7 +61,7 @@ function FightLevelSingleLevelInfoPopup:RemoveListener() contentScripts[i].view:RemoveListener() end end - +local args --界面打开时调用(用于子类重写) function FightLevelSingleLevelInfoPopup:OnOpen(popupType,...) -- local args={...} @@ -76,6 +76,7 @@ function FightLevelSingleLevelInfoPopup:OnOpen(popupType,...) for i=1,#contentPrefabs do contentPrefabs[i].gameObject:SetActive(false) end + args = ... this.BGImage1:SetActive(index == 1 ) this.BGImage2:SetActive(index == 2 or index == 3 or index == 4) contentPrefabs[index].gameObject:SetActive(true) @@ -86,7 +87,9 @@ end --界面打开或者重新打开后,界面刷新时调用(用于子类重写) function FightLevelSingleLevelInfoPopup:OnShow() - + for i = 1, #contentScripts do + contentScripts[i].view:OnShow(this,args) + end end diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua index 461150087a..eb17b1cbd0 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampNewPanel.lua @@ -150,6 +150,8 @@ end --界面打开时调用(用于子类重写) function MonsterCampNewPanel:OnShow() + CheckRedPointStatus(RedPointType.EpicExplore_LevleReward) + CheckRedPointStatus(RedPointType.EpicExplore_MoppingUp) storeDataId,itemId,costNum = MonsterCampManager.MonsterCampGetCost() this.titleText.text = Language[12099] freeTimes = MonsterCampManager.GetCanBattleCount() diff --git a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua index d17f938788..808981f3e0 100644 --- a/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua +++ b/Assets/ManagedResources/~Lua/View/MonsterCampSingleWave.lua @@ -188,7 +188,6 @@ function MonsterCampSingleWave:SingleHeroDataShow(monConfig,heroData) local roleConfig = ConfigManager.GetConfigData(ConfigName.RoleConfig, heroData.Id) local scale = roleConfig.play_liveScale local livePos = Vector3.New(roleConfig.offset[1], roleConfig.offset[2], 0) - LogYellow("(self.data.Id%6 == 0 and 12 or (self.data.Id%6 + 6)) "..(self.data.Id%6 == 0 and 12 or (self.data.Id%6 + 6))) self.icon.texture = CardRendererManager.GetSpineTexture((self.data.Id%6 == 0 and 6 or (self.data.Id%6)), liveName, Vector3.one * scale, livePos, true) self.icon.transform.localScale = Vector3.one self.icon.transform.localPosition = Vector3.zero