战斗结算修改
parent
da6437e2a2
commit
f49cefd6b3
|
@ -2299,6 +2299,7 @@ BATTLE_TYPE = {
|
||||||
FIGHTLEVEL = 20, --山河社稷图主关卡
|
FIGHTLEVEL = 20, --山河社稷图主关卡
|
||||||
FIGHT_ASSISTANT_LEVEL = 21, --山河社稷图副关卡战斗
|
FIGHT_ASSISTANT_LEVEL = 21, --山河社稷图副关卡战斗
|
||||||
BACK_BATTLE = 1000, -- 系统战斗回放
|
BACK_BATTLE = 1000, -- 系统战斗回放
|
||||||
|
EndlessMpaFight = 22,
|
||||||
}
|
}
|
||||||
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||||
[2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
[2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = true},
|
||||||
|
|
|
@ -11,7 +11,7 @@ local itemConfig = ConfigManager.GetConfig(ConfigName.ItemConfig)
|
||||||
local endlessMorale = ConfigManager.GetConfig(ConfigName.endlessMorale)
|
local endlessMorale = ConfigManager.GetConfig(ConfigName.endlessMorale)
|
||||||
local endlessTreasure = ConfigManager.GetConfig(ConfigName.endlessTreasure)
|
local endlessTreasure = ConfigManager.GetConfig(ConfigName.endlessTreasure)
|
||||||
this.limiteLevel = 0
|
this.limiteLevel = 0
|
||||||
|
this.EndlessDrop = {}
|
||||||
function this.Initialize()
|
function this.Initialize()
|
||||||
this.hungery = false -- 没有行动力了
|
this.hungery = false -- 没有行动力了
|
||||||
this.leftEnergy = 0 -- 剩余行动力
|
this.leftEnergy = 0 -- 剩余行动力
|
||||||
|
|
|
@ -57,9 +57,11 @@ function this:BindEvent()
|
||||||
if MapManager.curCarbonType == CarBonTypeId.ENDLESS then
|
if MapManager.curCarbonType == CarBonTypeId.ENDLESS then
|
||||||
NetManager.QuickFightRequest(function(msg)
|
NetManager.QuickFightRequest(function(msg)
|
||||||
-- CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
-- CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
||||||
|
if msg.result == 1 then
|
||||||
|
EndLessMapManager.EndlessDrop = msg.enventDrop
|
||||||
|
end
|
||||||
local fightData = BattleManager.GetBattleServerData(msg)
|
local fightData = BattleManager.GetBattleServerData(msg)
|
||||||
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.MAP_FIGHT, function()
|
UIManager.OpenPanel(UIName.BattlePanel, fightData, BATTLE_TYPE.EndlessMpaFight, function()
|
||||||
--更新精气值
|
--更新精气值
|
||||||
--LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
--LogGreen("战斗后的更新精气值:"..msg.essenceValue)
|
||||||
MapTrialManager.powerValue = msg.essenceValue
|
MapTrialManager.powerValue = msg.essenceValue
|
||||||
|
@ -74,10 +76,6 @@ function this:BindEvent()
|
||||||
-- 刷新数据
|
-- 刷新数据
|
||||||
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
CarbonManager.InitQuickFightData(monsterGroupId, nil, msg)
|
||||||
end, 0.2):Start()
|
end, 0.2):Start()
|
||||||
-- if msg.result == 1 then
|
|
||||||
-- UIManager.OpenPanel(UIName.RewardItemPopup,msg.enventDrop,1,function()
|
|
||||||
-- end)
|
|
||||||
-- end
|
|
||||||
end)
|
end)
|
||||||
self:ClosePanel()
|
self:ClosePanel()
|
||||||
end)
|
end)
|
||||||
|
|
|
@ -97,7 +97,7 @@ function BattleFailPopup:OnOpen(battlePanel, showRecord, backPanel,_fightType)
|
||||||
FightPointPassManager.FightBattleEnd()
|
FightPointPassManager.FightBattleEnd()
|
||||||
Util.GetGameObject(this.btnClose, "record"):SetActive(m_showRecord)
|
Util.GetGameObject(this.btnClose, "record"):SetActive(m_showRecord)
|
||||||
Util.GetGameObject(this.btnClose,"tip"):SetActive(not fightType ==12)--副本内无法点击招募
|
Util.GetGameObject(this.btnClose,"tip"):SetActive(not fightType ==12)--副本内无法点击招募
|
||||||
if fightType == BATTLE_TYPE.MAP_FIGHT or GuideManager.IsInMainGuide() or MapManager.Mapping or fightType == BATTLE_TYPE.Test then--地图
|
if fightType == BATTLE_TYPE.MAP_FIGHT or GuideManager.IsInMainGuide() or MapManager.Mapping or fightType == BATTLE_TYPE.Test or fightType == BATTLE_TYPE.EndlessMpaFight then--地图
|
||||||
this.btnBattleBack:SetActive(false)
|
this.btnBattleBack:SetActive(false)
|
||||||
else
|
else
|
||||||
this.btnBattleBack:SetActive(true)
|
this.btnBattleBack:SetActive(true)
|
||||||
|
|
|
@ -45,7 +45,7 @@ function BattleWinPopup:NextStep()
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
if m_fightType == BATTLE_TYPE.MAP_FIGHT then --副本战斗结算
|
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)
|
--UIManager.OpenPanel(UIName.RewardItemPopup, m_battleResult.drop, 1,function() m_battlePanel:ClosePanel() self:ClosePanel() end, 1, true)
|
||||||
-- local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
-- local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||||
-- FightPointPassManager.oldLevel = PlayerManager.level
|
-- FightPointPassManager.oldLevel = PlayerManager.level
|
||||||
-- if bestData then
|
-- if bestData then
|
||||||
|
@ -83,6 +83,24 @@ function BattleWinPopup:NextStep()
|
||||||
this.ShowBattleResultByFightLevelType(m_battleResult.drop)
|
this.ShowBattleResultByFightLevelType(m_battleResult.drop)
|
||||||
elseif m_fightType == BATTLE_TYPE.FIGHT_ASSISTANT_LEVEL then--山河社稷图副关卡
|
elseif m_fightType == BATTLE_TYPE.FIGHT_ASSISTANT_LEVEL then--山河社稷图副关卡
|
||||||
this.ShowBattleResultByFightLevelAssistantType(m_battleResult.drop)
|
this.ShowBattleResultByFightLevelAssistantType(m_battleResult.drop)
|
||||||
|
elseif m_fightType == BATTLE_TYPE.EndlessMpaFight then
|
||||||
|
local bestData, allDamage= BattleRecordManager.GetBattleBestData()
|
||||||
|
FightPointPassManager.oldLevel = PlayerManager.level
|
||||||
|
if bestData then
|
||||||
|
UIManager.OpenPanel(UIName.BattleBestPopup, bestData.roleId, bestData.skinId,bestData.damage, allDamage, function(_BattleBestPopup)
|
||||||
|
-- 打开关卡奖励界面
|
||||||
|
UIManager.OpenPanel(UIName.RewardItemPopup, EndLessMapManager.EndlessDrop, 1,function()
|
||||||
|
if _BattleBestPopup then
|
||||||
|
_BattleBestPopup:ClosePanel()
|
||||||
|
end
|
||||||
|
if m_battlePanel then
|
||||||
|
m_battlePanel:ClosePanel()
|
||||||
|
end
|
||||||
|
self:ClosePanel()
|
||||||
|
Game.GlobalEvent:DispatchEvent(GameEvent.Bag.BagGold)
|
||||||
|
end,1, true, true)
|
||||||
|
end)
|
||||||
|
end
|
||||||
--新回放功能
|
--新回放功能
|
||||||
elseif m_fightType == BATTLE_TYPE.BACK_BATTLE then
|
elseif m_fightType == BATTLE_TYPE.BACK_BATTLE then
|
||||||
if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then-- 新关卡战斗
|
if BattleManager.GetLastBattleType() == BATTLE_TYPE.STORY_FIGHT then-- 新关卡战斗
|
||||||
|
|
Loading…
Reference in New Issue