From a112127db04821356f957b64366b063c1eedcc39 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Tue, 25 May 2021 18:07:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A0=E5=B0=BD=E5=89=AF=E6=9C=AC=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Carbon/EndLessCarbonPanel.lua | 1 - .../~Lua/Modules/Map/EndLessMapManager.lua | 31 ------------------- .../~Lua/Modules/Map/TrialMapPanel.lua | 4 +-- .../~Lua/Modules/Map/View/MapPlayerView.lua | 2 +- .../TreasureOfHeaven/EndLessTreasurePanel.lua | 1 + 5 files changed, 4 insertions(+), 35 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua index d531839ba8..08312d47b3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Carbon/EndLessCarbonPanel.lua @@ -147,7 +147,6 @@ end function this.EnterMap() -- 进入地图编队,重新赋值一遍 CarbonManager.difficulty = CARBON_TYPE.ENDLESS - --UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId) if not EndLessMapManager.IsMapTeamAlive() then UIManager.OpenPanel(UIName.FormationPanelV2, FORMATION_TYPE.CARBON, MapManager.curMapId) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua index f6e4ec784e..bd94cec0d7 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/EndLessMapManager.lua @@ -670,33 +670,6 @@ function this.GetHeroLeftBlood(heroId) end end --- --编队界面有死亡猎妖师重组编队数据 --- function this.RoleListFormationNewMapTeam() --- local newMapTeam = {} -- 地图中的编队数据 --- local curTeam = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ENDLESS_MAP) --- -- 成员数据 --- if curTeam.teamHeroInfos and #curTeam.teamHeroInfos > 0 then --- for i = 1, #curTeam.teamHeroInfos do --- local roleData = curTeam.teamHeroInfos[i] --- local curRoleHp = 0 --- if this.allHeroBlood[roleData.heroId] then --- curRoleHp = this.allHeroBlood[roleData.heroId].curHp --- else --- local allProp = HeroManager.CalculateWarAllProVal(roleData.heroId) --- curRoleHp = allProp[3] --- end --- if curRoleHp > 0 then --- local info = {} --- info.position = #newMapTeam+1--curTeam.teamHeroInfos[i].position --- info.heroId = roleData.heroId --- table.insert(newMapTeam,info) --- end --- end --- end --- FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ENDLESS_MAP, newMapTeam, curTeam.teamPokemonInfos) --- return newMapTeam --- end - -- 角色战斗失败,删除相应的地图队伍 function this.DeleteMapTeam() for i = 1, #MapManager.formationList do @@ -762,7 +735,6 @@ function this.SetRewardData() local allMissionData = TaskManager.GetTypeTaskList(TaskTypeDef.wujinfuben) for k,v in ipairs(this.mission) do for j = 1,#allMissionData do - LogGreen("allMissionData[j].missionId:"..allMissionData[j].missionId.." allMissionData[j].state :"..allMissionData[j].state .." allMissionData[j].progress:"..allMissionData[j].progress) if v.Id == allMissionData[j].missionId then v.progress = allMissionData[j].progress if allMissionData[j].state == 2 then @@ -833,7 +805,6 @@ function this.GetShiQiValue() break end end - LogGreen("itemCount:"..itemCount.." moraleLv1:"..moraleLv1.." id:"..id) return id,moraleLv1 end ------------------------------------------------------------------------------------秘宝----------------------------------------------------- @@ -887,8 +858,6 @@ end function this.InitTreasureData(msg) this.treasureData = {} this.treasureData.tip = "无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝无尽秘宝" - --重置时间 - LogGreen("msg.resetTime:"..msg.resetTime) this.treasureData.resetTime = msg.resetTime --购买状态 -- LogGreen("msg.isBuy:"..msg.isBuy) diff --git a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua index 509c434fc9..2487e9743c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/TrialMapPanel.lua @@ -467,8 +467,8 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn) local itemNum=trialSetting[1].HealingId[2] this.selectHero:SetActive(true) local d = MapManager.trialHeroInfo - for k = 1, this.s_grid.transform.childCount do - this.s_grid.transform:GetChild(k-1).gameObject:SetActive(false) + for k = 1, #heroList do + heroList[k].gameObject:SetActive(false) end local closeChoosed=function() --有开着选择的全关了 for i, v in ipairs(heroList) do diff --git a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua index bb6d9aef7d..081b7a02f9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/View/MapPlayerView.lua @@ -241,7 +241,7 @@ end function this.ShowPos(u, v) rolePos = Map_UV2Pos(u, v) MapTrialManager.SetRolePos(u, v) - EndLessMapView.OnRoleMove(u, v) + EndLessMapView:OnRoleMove(u, v) this.PosText.text = string.format("(%d, %d)", u, v) end diff --git a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua index 91b3b80ccf..367448fe44 100644 --- a/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TreasureOfHeaven/EndLessTreasurePanel.lua @@ -222,6 +222,7 @@ function EndLessTreasurePanel:OnBtnDealClicked(rewardItem,singleData) else EndLessMapManager.SetTreasureState(singleData.Id,-1) end + CheckRedPointStatus(RedPointType.wujinTreasure) self:refresh()--刷新界面 end) end)