无尽副本修改提交

dev_chengFeng
jiaoyangna 2021-05-25 18:07:53 +08:00
parent 5fb2aa23ce
commit a112127db0
5 changed files with 4 additions and 35 deletions

View File

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

View File

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

View File

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

View File

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

View File

@ -222,6 +222,7 @@ function EndLessTreasurePanel:OnBtnDealClicked(rewardItem,singleData)
else
EndLessMapManager.SetTreasureState(singleData.Id,-1)
end
CheckRedPointStatus(RedPointType.wujinTreasure)
self:refresh()--刷新界面
end)
end)