Update - 1.9.0.103
EN: 1.9.0.103 CN: 1.9.0.104 JP: 1.9.0.106 KR: 1.9.0.108
This commit is contained in:
@@ -56,14 +56,35 @@ JointDrillBuildListCtrl._mapEventConfig = {
|
||||
RefreshJointDrillActTime = "OnEvent_RefreshJointDrillActTime"
|
||||
}
|
||||
JointDrillBuildListCtrl._mapRedDotConfig = {}
|
||||
function JointDrillBuildListCtrl:GetJointDrillPlayerData()
|
||||
return PlayerData.JointDrill_2
|
||||
end
|
||||
function JointDrillBuildListCtrl:GetJointDrillBuildListPanelId()
|
||||
return PanelId.JointDrillBuildList_2
|
||||
end
|
||||
function JointDrillBuildListCtrl:GetJointDrillLevelSelectPanelId()
|
||||
return PanelId.JointDrillLevelSelect_2
|
||||
end
|
||||
function JointDrillBuildListCtrl:GetRegionBossFormationType()
|
||||
return AllEnum.RegionBossFormationType.JointDrill_2
|
||||
end
|
||||
function JointDrillBuildListCtrl:GetBuildItemCtrlPath()
|
||||
return "Game.UI.JointDrill.JointDrill_2.JointDrillBuildItemCtrl"
|
||||
end
|
||||
function JointDrillBuildListCtrl:GetJointDrillBuildListRaw()
|
||||
return self:GetJointDrillPlayerData():GetJointDrillBuildList()
|
||||
end
|
||||
function JointDrillBuildListCtrl:GetJointDrillBuildList()
|
||||
return self:GetJointDrillBuildListRaw()
|
||||
end
|
||||
function JointDrillBuildListCtrl:RefreshBuildList()
|
||||
self.tbBuildItemCtrl = {}
|
||||
local nAllChallengeCount = PlayerData.JointDrill_2:GetMaxChallengeCount(self.nLevelId)
|
||||
local nAllChallengeCount = self:GetJointDrillPlayerData():GetMaxChallengeCount(self.nLevelId)
|
||||
nAllChallengeCount = math.max(4, nAllChallengeCount)
|
||||
self._mapNode.buildLSV:Init(nAllChallengeCount, self, self.OnGridRefresh)
|
||||
end
|
||||
function JointDrillBuildListCtrl:SetSelectBuildItem()
|
||||
local nCurSelectBuildId = PlayerData.JointDrill_2:GetCachedBuild()
|
||||
local nCurSelectBuildId = self:GetJointDrillPlayerData():GetCachedBuild()
|
||||
if nCurSelectBuildId == 0 then
|
||||
self._mapNode.btnSelectBuild.gameObject:SetActive(true)
|
||||
self._mapNode.goBuild.gameObject:SetActive(false)
|
||||
@@ -88,7 +109,7 @@ function JointDrillBuildListCtrl:OnGridRefresh(goGrid, gridIndex)
|
||||
local nIndex = gridIndex + 1
|
||||
local mapBuild = self.tbBuildList[nIndex]
|
||||
if self.tbBuildItemCtrl[goGrid] == nil then
|
||||
local itemCtrl = self:BindCtrlByNode(goGrid, "Game.UI.JointDrill.JointDrill_2.JointDrillBuildItemCtrl")
|
||||
local itemCtrl = self:BindCtrlByNode(goGrid, self:GetBuildItemCtrlPath())
|
||||
self.tbBuildItemCtrl[goGrid] = itemCtrl
|
||||
end
|
||||
self.tbBuildItemCtrl[goGrid]:SetItem(nIndex, mapBuild, self.nLevelId)
|
||||
@@ -104,7 +125,7 @@ function JointDrillBuildListCtrl:SetChallengeTime(nRemainTime)
|
||||
NovaAPI.SetTMPText(self._mapNode.txtChallengeTime, orderedFormat(ConfigTable.GetUIText("JointDrill_Challenge_Time_Left"), sTime))
|
||||
end
|
||||
function JointDrillBuildListCtrl:RefreshChallengeTime()
|
||||
local nStartTime = PlayerData.JointDrill_2:GetJointDrillStartTime()
|
||||
local nStartTime = self:GetJointDrillPlayerData():GetJointDrillStartTime()
|
||||
local nCloseTime = math.floor(nStartTime + ConfigTable.GetConfigNumber("JointDrill_Challenge_Time_Max"))
|
||||
local nCurTime = ClientManager.serverTimeStamp
|
||||
local nRemainTime = nCloseTime - nCurTime
|
||||
@@ -119,8 +140,8 @@ function JointDrillBuildListCtrl:OnEnable()
|
||||
self.nLevelId = tbParam[1]
|
||||
self.bSimulation = tbParam[2]
|
||||
end
|
||||
self.bInBattle = PlayerData.JointDrill_2:CheckJointDrillInBattle()
|
||||
self.tbBuildList = PlayerData.JointDrill_2:GetJointDrillBuildList()
|
||||
self.bInBattle = self:GetJointDrillPlayerData():CheckJointDrillInBattle()
|
||||
self.tbBuildList = self:GetJointDrillBuildList()
|
||||
if not self.bInBattle then
|
||||
NovaAPI.SetTMPText(self._mapNode.txtBtnStart, ConfigTable.GetUIText("JointDrill_Btn_Start_Challenge"))
|
||||
else
|
||||
@@ -139,7 +160,7 @@ function JointDrillBuildListCtrl:OnEnable()
|
||||
end
|
||||
self:SetSelectBuildItem()
|
||||
local nChallengeCount = #self.tbBuildList
|
||||
self.nAllChallengeCount = PlayerData.JointDrill_2:GetMaxChallengeCount(self.nLevelId)
|
||||
self.nAllChallengeCount = self:GetJointDrillPlayerData():GetMaxChallengeCount(self.nLevelId)
|
||||
NovaAPI.SetTMPText(self._mapNode.txtChallengeCount, orderedFormat(ConfigTable.GetUIText("JointDrill_Challenge_Count"), self.nAllChallengeCount - nChallengeCount))
|
||||
self._mapNode.goChallengeTime.gameObject:SetActive(self.bInBattle)
|
||||
end
|
||||
@@ -154,42 +175,42 @@ end
|
||||
function JointDrillBuildListCtrl:OnDestroy()
|
||||
end
|
||||
function JointDrillBuildListCtrl:OnBtnClick_SelectBuild()
|
||||
if not PlayerData.JointDrill_2:CheckChallengeCount() then
|
||||
if not self:GetJointDrillPlayerData():CheckChallengeCount() then
|
||||
return
|
||||
end
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.RogueBossBuildBrief, AllEnum.RegionBossFormationType.JointDrill_2)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.RogueBossBuildBrief, self:GetRegionBossFormationType())
|
||||
end
|
||||
function JointDrillBuildListCtrl:OnBtnClick_DelBuild()
|
||||
PlayerData.JointDrill_2:SetSelBuildId(0)
|
||||
self:GetJointDrillPlayerData():SetSelBuildId(0)
|
||||
self:SetSelectBuildItem()
|
||||
end
|
||||
function JointDrillBuildListCtrl:OnBtnClick_Start()
|
||||
local bInChallengeTime = PlayerData.JointDrill_2:CheckActChallengeTime()
|
||||
local bInChallengeTime = self:GetJointDrillPlayerData():CheckActChallengeTime()
|
||||
if not bInChallengeTime then
|
||||
local gameOverCallback = function()
|
||||
EventManager.Hit(EventId.ClosePanel, PanelId.JointDrillBuildList_2)
|
||||
EventManager.Hit(EventId.ClosePanel, self:GetJointDrillBuildListPanelId())
|
||||
end
|
||||
if self.bInBattle then
|
||||
PlayerData.JointDrill_2:JointDrillGameOver(gameOverCallback, true)
|
||||
self:GetJointDrillPlayerData():JointDrillGameOver(gameOverCallback, true)
|
||||
else
|
||||
EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("JointDrill_Challenge_End_Tip"))
|
||||
gameOverCallback()
|
||||
end
|
||||
return
|
||||
end
|
||||
if not PlayerData.JointDrill_2:CheckChallengeCount() then
|
||||
if not self:GetJointDrillPlayerData():CheckChallengeCount() then
|
||||
return
|
||||
end
|
||||
local nBuildId = PlayerData.JointDrill_2:GetCachedBuild()
|
||||
local nBuildId = self:GetJointDrillPlayerData():GetCachedBuild()
|
||||
if nBuildId == 0 then
|
||||
EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("JointDrill_SelectBuild_Tip"))
|
||||
return
|
||||
end
|
||||
if self.bInBattle then
|
||||
local nStartTime = PlayerData.JointDrill_2:GetJointDrillStartTime()
|
||||
local nStartTime = self:GetJointDrillPlayerData():GetJointDrillStartTime()
|
||||
local nCloseTime = math.floor(nStartTime + ConfigTable.GetConfigNumber("JointDrill_Challenge_Time_Max"))
|
||||
if nCloseTime <= ClientManager.serverTimeStamp then
|
||||
PlayerData.JointDrill_2:JointDrillGameOver(nil, true)
|
||||
self:GetJointDrillPlayerData():JointDrillGameOver(nil, true)
|
||||
return
|
||||
end
|
||||
end
|
||||
@@ -197,7 +218,7 @@ function JointDrillBuildListCtrl:OnBtnClick_Start()
|
||||
if self.bInBattle then
|
||||
nType = AllEnum.JointDrillLevelStartType.Continue
|
||||
end
|
||||
PlayerData.JointDrill_2:EnterJointDrill(self.nLevelId, nBuildId, self.bSimulation, nType)
|
||||
self:GetJointDrillPlayerData():EnterJointDrill(self.nLevelId, nBuildId, self.bSimulation, nType)
|
||||
end
|
||||
function JointDrillBuildListCtrl:OnEvent_RefreshChallengeTime(nRemainTime)
|
||||
self:SetChallengeTime(nRemainTime)
|
||||
@@ -205,8 +226,8 @@ end
|
||||
function JointDrillBuildListCtrl:OnEvent_RefreshJointDrillActTime(nStatus, nRemainTime)
|
||||
if nStatus == AllEnum.JointDrillActStatus.Closed then
|
||||
local confirmCallback = function()
|
||||
EventManager.Hit(EventId.ClosePanel, PanelId.JointDrillBuildList_2)
|
||||
EventManager.Hit(EventId.ClosePanel, PanelId.JointDrillLevelSelect_2)
|
||||
EventManager.Hit(EventId.ClosePanel, self:GetJointDrillBuildListPanelId())
|
||||
EventManager.Hit(EventId.ClosePanel, self:GetJointDrillLevelSelectPanelId())
|
||||
end
|
||||
local msg = {
|
||||
nType = AllEnum.MessageBox.Alert,
|
||||
|
||||
@@ -79,7 +79,10 @@ JointDrillRankingCtrl._mapNodeConfig = {
|
||||
callback = "OnBtnClick_CloseReward"
|
||||
}
|
||||
}
|
||||
JointDrillRankingCtrl._mapEventConfig = {}
|
||||
JointDrillRankingCtrl._mapEventConfig = {
|
||||
ShowTeamDetail = "OnEvent_ShowTeamDetail",
|
||||
OpenRankBuildDetail = "OnEvent_OpenRankBuildDetail"
|
||||
}
|
||||
JointDrillRankingCtrl._mapRedDotConfig = {}
|
||||
function JointDrillRankingCtrl:SetEndTime()
|
||||
local actData = PlayerData.Activity:GetActivityDataById(self.nActId)
|
||||
@@ -129,8 +132,19 @@ function JointDrillRankingCtrl:RefreshRankList()
|
||||
else
|
||||
self._mapNode.goLoading.gameObject:SetActive(false)
|
||||
self._mapNode.goMainContent.gameObject:SetActive(true)
|
||||
self._mapNode.svRankingInfo:SetAnim(0.1)
|
||||
if self._panel.mapRankDetail == nil then
|
||||
self._mapNode.svRankingInfo:SetAnim(0.1)
|
||||
end
|
||||
self._mapNode.svRankingInfo:Init(#self.mapRankList, self, self.RefreshRankGrid)
|
||||
if self._panel.mapRankDetail ~= nil then
|
||||
self._mapNode.svRankingInfo:SetScrollPos(self._panel.nGridPos)
|
||||
self:AddTimer(1, 0.4, function()
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillRankDetail_2, self._panel.mapRankDetail)
|
||||
self._panel.mapRankDetail = nil
|
||||
self._panel.nGridPos = 0
|
||||
end, true, true, true)
|
||||
EventManager.Hit(EventId.TemporaryBlockInput, 0.4)
|
||||
end
|
||||
end
|
||||
end
|
||||
function JointDrillRankingCtrl:RefreshSelfRank()
|
||||
@@ -200,4 +214,11 @@ function JointDrillRankingCtrl:OnBtnClick_CloseReward()
|
||||
self:AddTimer(1, 0.2, close, true, true, true)
|
||||
EventManager.Hit(EventId.TemporaryBlockInput, 0.2)
|
||||
end
|
||||
function JointDrillRankingCtrl:OnEvent_ShowTeamDetail(rankData)
|
||||
self.mapRankDetail = rankData
|
||||
end
|
||||
function JointDrillRankingCtrl:OnEvent_OpenRankBuildDetail()
|
||||
self._panel.mapRankDetail = self.mapRankDetail
|
||||
self._panel.nGridPos = self._mapNode.svRankingInfo:GetScrollPos()
|
||||
end
|
||||
return JointDrillRankingCtrl
|
||||
|
||||
@@ -7,6 +7,8 @@ JointDrillRankingPanel._tbDefine = {
|
||||
}
|
||||
}
|
||||
function JointDrillRankingPanel:Awake()
|
||||
self.mapRankDetail = nil
|
||||
self.nGridPos = 0
|
||||
end
|
||||
function JointDrillRankingPanel:OnEnable()
|
||||
end
|
||||
|
||||
@@ -183,6 +183,7 @@ function JointDrillRankItemCtrl:OnBtnClick_TeamDetail()
|
||||
EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("JointDrill_Rank_Detail_Empty"))
|
||||
return
|
||||
end
|
||||
EventManager.Hit("ShowTeamDetail", self.mapRankData)
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillRankDetail_2, self.mapRankData)
|
||||
end
|
||||
return JointDrillRankItemCtrl
|
||||
|
||||
@@ -200,7 +200,7 @@ function JointDrillResultCtrl:OpenReward()
|
||||
self:ClosePanel()
|
||||
end
|
||||
local callback = function()
|
||||
if self.nResultType == AllEnum.JointDrillResultType.Success or self.nResultType == AllEnum.JointDrillResultType.ChallengeEnd and self.mapScore ~= nil and next(self.mapScore) ~= nil then
|
||||
if (self.nResultType == AllEnum.JointDrillResultType.Success or self.nResultType == AllEnum.JointDrillResultType.ChallengeEnd) and self.mapScore ~= nil and next(self.mapScore) ~= nil then
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillRankUp_2, self.nOld, self.nNew, self.mapScore, self.nResultType, closeCallback)
|
||||
else
|
||||
closeCallback()
|
||||
|
||||
@@ -18,6 +18,10 @@ JointDrillTeamItemCtrl._mapNodeConfig = {
|
||||
nCount = 2,
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Build_Sub"
|
||||
},
|
||||
btnDetail = {
|
||||
sComponentName = "UIButton",
|
||||
callback = "OnBtnClick_Detail"
|
||||
}
|
||||
}
|
||||
JointDrillTeamItemCtrl._mapEventConfig = {}
|
||||
@@ -36,6 +40,7 @@ function JointDrillTeamItemCtrl:GetBuildRank(nScore)
|
||||
return curIdx
|
||||
end
|
||||
function JointDrillTeamItemCtrl:RefreshItem(mapTeam, nIndex)
|
||||
self.mapTeam = mapTeam
|
||||
local sIndex = ConfigTable.GetUIText("JointDrill_Battle_Time_" .. nIndex)
|
||||
NovaAPI.SetTMPText(self._mapNode.txtTeam, orderedFormat(ConfigTable.GetUIText("JointDrill_Rank_Build_Count"), sIndex))
|
||||
for i = 1, 3 do
|
||||
@@ -54,6 +59,19 @@ function JointDrillTeamItemCtrl:RefreshItem(mapTeam, nIndex)
|
||||
local nScore = self:GetBuildRank(mapTeam.BuildScore)
|
||||
self:SetPngSprite(self._mapNode.imgScoreIcon, "Icon/BuildRank/BuildRank_" .. nScore)
|
||||
end
|
||||
function JointDrillTeamItemCtrl:OnBtnClick_Detail()
|
||||
if self.mapTeam.Discs == nil or #self.mapTeam.Discs == 0 then
|
||||
EventManager.Hit(EventId.OpenMessageBox, ConfigTable.GetUIText("Rank_Build_Detail_Unavailable"))
|
||||
return
|
||||
end
|
||||
EventManager.Hit("OpenRankBuildDetail")
|
||||
EventManager.Hit(EventId.OpenPanel, PanelId.RankBuildDetail, self.mapTeam)
|
||||
local wait = function()
|
||||
coroutine.yield(CS.UnityEngine.WaitForEndOfFrame())
|
||||
EventManager.Hit(EventId.ClosePanel, PanelId.JointDrillRankDetail_2)
|
||||
end
|
||||
cs_coroutine.start(wait)
|
||||
end
|
||||
function JointDrillTeamItemCtrl:Awake()
|
||||
end
|
||||
function JointDrillTeamItemCtrl:OnEnable()
|
||||
|
||||
Reference in New Issue
Block a user