无尽副本修改提交
parent
c95211428b
commit
bb2cd6a263
|
@ -378,8 +378,8 @@ MonoBehaviour:
|
|||
m_Alignment: 3
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 999999
|
||||
--- !u!1 &6097352913242442898
|
||||
|
@ -457,8 +457,8 @@ MonoBehaviour:
|
|||
m_Alignment: 4
|
||||
m_AlignByGeometry: 0
|
||||
m_RichText: 1
|
||||
m_HorizontalOverflow: 0
|
||||
m_VerticalOverflow: 0
|
||||
m_HorizontalOverflow: 1
|
||||
m_VerticalOverflow: 1
|
||||
m_LineSpacing: 1
|
||||
m_Text: 20:20:20
|
||||
--- !u!1 &6617788014832701651
|
||||
|
|
|
@ -113,7 +113,7 @@ function this.RefreshFormation(index, roleList, pokemonList,isDiffmonster)
|
|||
teamInfo.position = roleList[i].position--i
|
||||
table.insert(curFormation.teamHeroInfos, teamInfo)
|
||||
if not oldTeamheroInfos[teamInfo.heroId] then
|
||||
LogRed("roleList[i].heroId"..roleList[i].heroId.." this.formationList[index].teamId"..this.formationList[index].teamId)
|
||||
--LogRed("roleList[i].heroId"..roleList[i].heroId.." this.formationList[index].teamId"..this.formationList[index].teamId)
|
||||
HeroManager.SetHeroFormationList(roleList[i].heroId,this.formationList[index].teamId,1)
|
||||
end
|
||||
end
|
||||
|
|
|
@ -292,7 +292,9 @@ function this.InitAllEndlessHero(heroList,isClear)
|
|||
this.moraleLv = lv
|
||||
-- --LogGreen("this.moraleLv:"..this.moraleLv)
|
||||
this.moraleId = id
|
||||
end
|
||||
|
||||
function this.InitFormation()
|
||||
this.RrefreshFormation()
|
||||
this.formation = FormationManager.formationList[FormationTypeDef.FORMATION_ENDLESS_MAP].teamHeroInfos
|
||||
end
|
||||
|
@ -577,12 +579,10 @@ function this.InitHeroHp(msg, func)
|
|||
local heroData = msg.heroInfo[i]
|
||||
local allEquipAddProVal= HeroManager.CalculateWarAllProVal(heroData.heroId)
|
||||
local maxHp = allEquipAddProVal[3]
|
||||
--LogGreen("heroData.heroId:"..heroData.heroId.." heroData.hp:"..heroData.hp)
|
||||
local hp = heroData.hp / 10000
|
||||
local data = {}
|
||||
data.percentHp = hp
|
||||
data.curHp = math.ceil(hp * maxHp)
|
||||
--LogGreen("heroData.heroId:"..heroData.heroId.." data.curHp:"..data.curHp)
|
||||
data.heroId = heroData.heroId
|
||||
this.allHeroBlood[heroData.heroId] = data
|
||||
end
|
||||
|
@ -662,6 +662,7 @@ end
|
|||
function this.RrefreshFormation()
|
||||
local tempList = {}
|
||||
local curFormation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ENDLESS_MAP)
|
||||
LogGreen("#curFormation.teamHeroInfos:"..#curFormation.teamHeroInfos)
|
||||
for k,v in pairs(curFormation.teamHeroInfos) do
|
||||
if EndLessMapManager.GetSingleCanUseHeroData(v.heroId) then
|
||||
table.insert(tempList,v)
|
||||
|
|
|
@ -390,9 +390,9 @@ function EndLessMapView:SetShiQiValue()
|
|||
EndLessMapManager.moraleLv = lv
|
||||
EndLessMapManager.moraleId = id
|
||||
end
|
||||
this.shiQiProgress.text = (endlessMorale[id].Exp[2] and endlessMorale[id].Exp[2] > 0) and itemCount.."/"..endlessMorale[id].Exp[2] or "1/1"
|
||||
this.shiQiProgress.text = (endlessMorale[id].Exp and endlessMorale[id].Exp[2] > 0) and itemCount.."/"..endlessMorale[id].Exp[2] or "1/1"
|
||||
this.shiQiLv.text = lv.."级"
|
||||
this.shiQifillAmount.fillAmount = (endlessMorale[id].Exp[2] and endlessMorale[id].Exp[2] > 0) and itemCount/endlessMorale[id].Exp[2] or 1
|
||||
this.shiQifillAmount.fillAmount = (endlessMorale[id].Exp and endlessMorale[id].Exp[2] > 0) and itemCount/endlessMorale[id].Exp[2] or 1
|
||||
|
||||
if isShow then
|
||||
--士气等级提升
|
||||
|
|
|
@ -292,7 +292,9 @@ function this.UpdateEventPoint(msg, optionId, func)
|
|||
{"DeletePoint", {pointID = {beArgs[1][2]}}},
|
||||
}
|
||||
elseif behaviorType == 53 then -- 战斗并销毁指定地图点
|
||||
|
||||
NetManager.RequestAllHeroHp(function ()
|
||||
Game.GlobalEvent:DispatchEvent(GameEvent.EndLess.RefreshHeroData)
|
||||
end)
|
||||
end
|
||||
|
||||
-- 没有行为
|
||||
|
|
|
@ -741,9 +741,7 @@ function this.RefreshMapData(buffer)
|
|||
local msg = MapInfoProto_pb.EndlessMapChange()
|
||||
msg:ParseFromString(data)
|
||||
Log("推送的世界ID " .. msg.mapId)
|
||||
Log("推送的无尽世界等级 " .. msg.worldLevel)
|
||||
EndLessMapManager.openMapId = msg.mapId
|
||||
EndLessMapManager.worldLevel = msg.worldLevel
|
||||
end
|
||||
|
||||
function this.RestTreasureTaskData(buffer)
|
||||
|
|
|
@ -2229,6 +2229,9 @@ function this.RequestAllHeroHp(func)
|
|||
local data = buffer:DataByte()
|
||||
local msg = MapInfoProto_pb.GetEndlessHeroResponse()
|
||||
msg:ParseFromString(data)
|
||||
for i = 1,#msg.heroInfo do
|
||||
LogGreen(msg.heroInfo[i].heroId)
|
||||
end
|
||||
EndLessMapManager.InitHeroHp(msg, function()
|
||||
if func then
|
||||
func()
|
||||
|
@ -5030,11 +5033,9 @@ function this.AllEndLessHeroDataResponse(_index,func)
|
|||
local msg = HeroInfoProto_pb.GetEndlessHeroListInfoResponse()
|
||||
msg:ParseFromString(data)
|
||||
EndLessMapManager.InitAllEndlessHero(msg.heroList,true)
|
||||
-- for i = 1 ,#msg.heroList do
|
||||
-- LogGreen(msg.heroList[i].id.." "..msg.heroList[i].heroId)
|
||||
-- end
|
||||
if msg.isSendFinish then
|
||||
EndLessMapManager.InitMapInfoData(msg.endlessMapId)
|
||||
EndLessMapManager.InitFormation()
|
||||
if func then
|
||||
func(msg)
|
||||
end
|
||||
|
|
|
@ -25,11 +25,10 @@ function BattleWinPopup:BindEvent()
|
|||
Util.AddClick(this.btnWin, function ()
|
||||
self:ClosePanel()
|
||||
-- self:NextStep()
|
||||
if m_fightType == BATTLE_TYPE.Test then
|
||||
if m_fightType == BATTLE_TYPE.Test then
|
||||
if m_battlePanel then
|
||||
m_battlePanel:ClosePanel()
|
||||
end
|
||||
|
||||
end
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
@ -46,7 +45,7 @@ function BattleWinPopup:NextStep()
|
|||
return
|
||||
end
|
||||
if m_fightType == BATTLE_TYPE.MAP_FIGHT then --副本战斗结算
|
||||
|
||||
UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() m_battlePanel:ClosePanel() self:ClosePanel() end, 1, true)
|
||||
-- local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||
-- FightPointPassManager.oldLevel = PlayerManager.level
|
||||
-- if bestData then
|
||||
|
|
|
@ -33,7 +33,7 @@ function this.InitTypeTaskList(_userMissionList)
|
|||
userMissionList.takeTimes = _userMissionList[i].takeTimes
|
||||
userMissionList.heroId = _userMissionList[i].heroId
|
||||
userMissionList.lock = _userMissionList[i].lock
|
||||
--LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock.. " progress:".._userMissionList[i].progress)
|
||||
LogRed("任务 类型:"..userMissionList.type.." ID:"..userMissionList.missionId.." 状态:"..userMissionList.state.." lock "..userMissionList.lock.. " progress:".._userMissionList[i].progress)
|
||||
if not TypeTaskData[_userMissionList[i].type] then
|
||||
TypeTaskData[_userMissionList[i].type] = {}
|
||||
end
|
||||
|
|
Loading…
Reference in New Issue