Update - 2.1.0.147
EN: 2.1.0.147 CN: 2.1.0.147 JP: 2.1.0.149 KR: 2.1.0.154
This commit is contained in:
@@ -562,6 +562,7 @@ function SoldierLevelData:DispatchServerCase(case)
|
||||
self.mapCases[CaseEnum.SelectBossAbility] = {}
|
||||
self.mapCases[CaseEnum.SelectBossAbility].nId = case.Id
|
||||
elseif case.CheckStageCase then
|
||||
self.bEnterCheckStage = true
|
||||
self.mapCases[CaseEnum.CheckStage] = {}
|
||||
self.mapCases[CaseEnum.CheckStage].nId = case.Id
|
||||
self.mapCases[CaseEnum.CheckStage].nFloorId = case.CheckStageCase.FloorId
|
||||
@@ -1404,6 +1405,7 @@ function SoldierLevelData:EnterCheckStageCase()
|
||||
if mapCase == nil then
|
||||
return
|
||||
end
|
||||
self.bEnterCheckStage = true
|
||||
self:_EnterBattle(mapCase.nFloorId)
|
||||
end
|
||||
function SoldierLevelData:OpenBossAbilitySelect()
|
||||
@@ -1477,6 +1479,7 @@ function SoldierLevelData:SoldierSettle()
|
||||
local settleData = self.mapClientCases[ClientCase.Settle]
|
||||
local nType = settleData.nType
|
||||
local mapData = {
|
||||
bFinalBossSuccess = settleData.bFinalBossSuccess == true,
|
||||
tbSettle = settleData.tbSettle,
|
||||
tbChess = settleData.tbChess,
|
||||
tbDamage = settleData.tbDamage,
|
||||
@@ -2547,6 +2550,7 @@ function SoldierLevelData:InteractSettle(settleMsg)
|
||||
end
|
||||
self.mapClientCases[ClientCase.Settle] = {
|
||||
nType = nType,
|
||||
bFinalBossSuccess = self.bEnterCheckStage == true,
|
||||
tbSettle = {
|
||||
nPassedNode = settleMsg.PassedNode,
|
||||
nRemainingHp = settleMsg.RemainingHp,
|
||||
|
||||
@@ -386,7 +386,7 @@ function BaseRoom:HandleNpc(nNpcId, nNpcUid)
|
||||
local nBoardNpcId = ConfigTable.GetData("NPCConfig", nNpcId).NPCId
|
||||
local nSkinId = PlayerData.Board:GetNPCUsingSkinId(nBoardNpcId)
|
||||
local nCoin = self.parent._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc, 0)
|
||||
return
|
||||
elseif mapNpcCfgData.type == GameEnum.npcNewType.Event then
|
||||
self:OpenNpcOptionPanel(nCaseId, nNpcId)
|
||||
@@ -801,7 +801,7 @@ function BaseRoom:OpenNpcOptionPanel(nCaseId, nNpcConfigId)
|
||||
nTalkId = 0
|
||||
end
|
||||
local nCoin = self.parent._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc, 0)
|
||||
return
|
||||
end
|
||||
local tbOption = mapCase.Options
|
||||
@@ -890,7 +890,8 @@ function BaseRoom:OpenNpcOptionPanel(nCaseId, nNpcConfigId)
|
||||
end
|
||||
mapCase.bFirst = false
|
||||
local nCoin = self.parent._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 1, nEventId, tbOption, nSkinId, callback, tbUnabledOption, nTableEvtId, nTalkId, mapCase.nActionId, false, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc)
|
||||
local nEventCnt = mapCase.EventOptionCnt or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 1, nEventId, tbOption, nSkinId, callback, tbUnabledOption, nTableEvtId, nTalkId, mapCase.nActionId, false, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc, nEventCnt)
|
||||
end
|
||||
function BaseRoom:HandleRecover(nCaseId, nNpcConfigId)
|
||||
if self.mapCases[self.EnumCase.RecoveryHP] == nil then
|
||||
@@ -948,7 +949,7 @@ function BaseRoom:HandleNpcRecover(nCaseId, nNpcConfigId)
|
||||
nTalkId = tbSelectedChat[math.random(1, #tbSelectedChat)]
|
||||
end
|
||||
local nCoin = self.parent._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc, 0)
|
||||
return
|
||||
end
|
||||
local nEftId = mapCase.EffectId
|
||||
@@ -993,7 +994,7 @@ function BaseRoom:HandleNpcDangerRoom(nCaseId, nNpcConfigId)
|
||||
nTalkId = 0
|
||||
end
|
||||
local nCoin = self.parent._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 2, nCaseId, {}, nSkinId, callback, {}, 0, nTalkId, 0, false, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 2, nCaseId, {}, nSkinId, callback, {}, 0, nTalkId, 0, false, false, nCoin, self.parent.nTowerId, self.parent._mapNote, self.parent.tbDisc, 0)
|
||||
end
|
||||
function BaseRoom:HandlePopupDisc(mapData)
|
||||
local callback = function()
|
||||
|
||||
@@ -1148,7 +1148,7 @@ function StarTowerSweepData:HandleNpc(nNpcId, nNpcUid)
|
||||
local nBoardNpcId = ConfigTable.GetData("NPCConfig", nNpcId).NPCId
|
||||
local nSkinId = PlayerData.Board:GetNPCUsingSkinId(nBoardNpcId)
|
||||
local nCoin = self._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc, 0)
|
||||
return
|
||||
elseif mapNpcCfgData.type == GameEnum.npcNewType.Event then
|
||||
self:OpenNpcOptionPanel(nCaseId, nNpcId)
|
||||
@@ -1665,7 +1665,7 @@ function StarTowerSweepData:OpenNpcOptionPanel(nCaseId, nNpcConfigId)
|
||||
nTalkId = 0
|
||||
end
|
||||
local nCoin = self._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc, 0)
|
||||
return
|
||||
end
|
||||
local tbOption = mapCase.Options
|
||||
@@ -1777,7 +1777,8 @@ function StarTowerSweepData:OpenNpcOptionPanel(nCaseId, nNpcConfigId)
|
||||
mapCase.bFirst = false
|
||||
local nCoin = self._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
local OpenOptionPanel = function(mapAutoDisplay)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 1, nEventId, tbOption, nSkinId, callback, tbUnabledOption, nTableEvtId, nTalkId, mapCase.nActionId, false, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc, mapAutoDisplay)
|
||||
local nEventCnt = mapCase.EventOptionCnt or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 1, nEventId, tbOption, nSkinId, callback, tbUnabledOption, nTableEvtId, nTalkId, mapCase.nActionId, false, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc, nEventCnt, mapAutoDisplay)
|
||||
end
|
||||
if not self:IsAutoDecisionEnabled() then
|
||||
OpenOptionPanel()
|
||||
@@ -1860,7 +1861,7 @@ function StarTowerSweepData:HandleNpcRecover(nCaseId, nNpcConfigId)
|
||||
nTalkId = 0
|
||||
end
|
||||
local nCoin = self._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 0, 0, {}, nSkinId, 1, {}, {}, nTalkId, 0, true, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc, 0)
|
||||
return
|
||||
end
|
||||
local nHp = 0
|
||||
@@ -1903,7 +1904,7 @@ function StarTowerSweepData:HandleNpcDangerRoom(nCaseId, nNpcConfigId)
|
||||
nTalkId = 0
|
||||
end
|
||||
local nCoin = self._mapItem[AllEnum.CoinItemId.FixedRogCurrency] or 0
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 2, nCaseId, {}, nSkinId, callback, {}, 0, nTalkId, 0, false, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.NpcOptionPanel, 2, nCaseId, {}, nSkinId, callback, {}, 0, nTalkId, 0, false, true, nCoin, self.nTowerId, self._mapNote, self.tbDisc, 0)
|
||||
end
|
||||
function StarTowerSweepData:HandlePopupDisc(mapData)
|
||||
local callback = function()
|
||||
|
||||
Reference in New Issue
Block a user