diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua b/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua index c9493dacea..1f9f082c9c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/View/FourElementFormation.lua @@ -61,7 +61,7 @@ function this.GetHeros(limitLevel) return heros end -function this.SortHeroDatas1(data) +function this.SortHeroDatas(data) for i = 1 ,#data do if not HeroManager.IsHaveHero(data[i].dynamicId) then data[i].fourElementSortId = 1 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua index 47a290c878..cb8af62a6c 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_FourElementHelpFight.lua @@ -48,7 +48,6 @@ function this:BindEvent() this:BtnClick(i) end) end - BindRedPointObject(redTrailType[curType],Util.GetGameObject(tabs[#tabs], "redPoint")) end function this:BtnClick(i) @@ -85,6 +84,7 @@ function this:OnShow(_parent,...) rate = tonumber(string.format("%.2f",ConfigManager.GetConfigData(ConfigName.CampTowerSetting,1).HelpFightMax / 10000)) canHelpPower = heightPower*rate this:BtnClick(1) + BindRedPointObject(redTrailType[curType],Util.GetGameObject(tabs[#tabs], "redPoint")) end function this:SortHeros(data) @@ -179,6 +179,7 @@ end function this:OnClose() curIndex = 0 + ClearRedPointObject(redTrailType[curType],Util.GetGameObject(tabs[#tabs], "redPoint")) end function this:OnDestroy() @@ -191,7 +192,7 @@ function this:OnDestroy() this.ScrollView = nil end itemList = {} - ClearRedPointObject(redTrailType[curType],Util.GetGameObject(tabs[#tabs], "redPoint")) + end return this \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua index eae7656444..b4b87a479b 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/MonsterCampMainPanel.lua @@ -129,10 +129,10 @@ function MonsterCampMainPanel:SetSingleTrailData(go,data) local openTime = Util.GetGameObject(go, "openTime"):GetComponent("Text") title.sprite = Util.LoadSprite(FourElementNameImage[data.fourElementType]) curwave.text = (data.monsterWave + 1).."层" - if data.canFightTime >= campTowerSetting.TimesStoreMax then - canFightWave.text = string.format("可挑战层数:%s","FFD695",data.canFightTime) + if data.canFightTime >= campTowerSetting.TimesStoreMax then + canFightWave.text = string.format("可挑战层数:%s","FFD695",data.canFightTime) else - canFightWave.text = string.format("可挑战层数:%s","FFEED3",data.canFightTime) + canFightWave.text = string.format("可挑战层数:%s","FFEED3",data.canFightTime) end openTime.text = this:GetOpenTime(data.fourElementType).."开启"