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