Update - 1.9.0.107

EN: 1.9.0.107
CN: 1.9.0.108
JP: 1.9.0.112
KR: 1.9.0.112
This commit is contained in:
SL1900
2026-05-14 16:00:00 +09:00
parent 4b880806ef
commit eafd8f4088
1034 changed files with 809589 additions and 23067 deletions
@@ -1,5 +1,6 @@
local JointDrillBuildListCtrl = class("JointDrillBuildListCtrl", BaseCtrl)
local ClientManager = CS.ClientManager.Instance
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillBuildListCtrl._mapNodeConfig = {
TopBarPanel = {
sCtrlName = "Game.UI.TopBarEx.TopBarCtrl"
@@ -60,10 +61,10 @@ function JointDrillBuildListCtrl:GetJointDrillPlayerData()
return PlayerData.JointDrill_1
end
function JointDrillBuildListCtrl:GetJointDrillBuildListPanelId()
return PanelId.JointDrillBuildList_1
return JointDrillContext.GetPanelId(self:GetJointDrillPlayerData().nActId, "BuildList")
end
function JointDrillBuildListCtrl:GetJointDrillLevelSelectPanelId()
return PanelId.JointDrillLevelSelect_1
return JointDrillContext.GetPanelId(self:GetJointDrillPlayerData().nActId, "LevelSelect")
end
function JointDrillBuildListCtrl:GetRegionBossFormationType()
return AllEnum.RegionBossFormationType.JointDrill
@@ -165,7 +166,7 @@ function JointDrillBuildListCtrl:OnEnable()
self._mapNode.goChallengeTime.gameObject:SetActive(self.bInBattle)
end
function JointDrillBuildListCtrl:OnDisable()
for _, v in ipairs(self.tbBuildItemCtrl) do
for _, v in pairs(self.tbBuildItemCtrl) do
local obj = v.gameObject
self:UnbindCtrlByNode(v)
destroy(obj)
@@ -1,21 +0,0 @@
local JointDrillBuildListPanel = class("JointDrillBuildListPanel", BasePanel)
JointDrillBuildListPanel._sUIResRootPath = "UI_Activity/"
JointDrillBuildListPanel._tbDefine = {
{
sPrefabPath = "_510001/JointDrillBuildList.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillBuildListCtrl"
}
}
function JointDrillBuildListPanel:Awake()
end
function JointDrillBuildListPanel:OnEnable()
end
function JointDrillBuildListPanel:OnAfterEnter()
end
function JointDrillBuildListPanel:OnDisable()
end
function JointDrillBuildListPanel:OnDestroy()
end
function JointDrillBuildListPanel:OnRelease()
end
return JointDrillBuildListPanel
@@ -0,0 +1,21 @@
local JointDrillBuildListPanel_510001 = class("JointDrillBuildListPanel_510001", BasePanel)
JointDrillBuildListPanel_510001._sUIResRootPath = "UI_Activity/"
JointDrillBuildListPanel_510001._tbDefine = {
{
sPrefabPath = "_510001/JointDrillBuildList.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillBuildListCtrl"
}
}
function JointDrillBuildListPanel_510001:Awake()
end
function JointDrillBuildListPanel_510001:OnEnable()
end
function JointDrillBuildListPanel_510001:OnAfterEnter()
end
function JointDrillBuildListPanel_510001:OnDisable()
end
function JointDrillBuildListPanel_510001:OnDestroy()
end
function JointDrillBuildListPanel_510001:OnRelease()
end
return JointDrillBuildListPanel_510001
@@ -104,6 +104,10 @@ end
function JointDrillLevelItemCtrl:OnEnable()
end
function JointDrillLevelItemCtrl:OnDisable()
if self.timeTimer ~= nil then
self.timeTimer:Cancel()
self.timeTimer = nil
end
end
function JointDrillLevelItemCtrl:OnDestroy()
end
@@ -1,6 +1,7 @@
local JointDrillLevelSelectCtrl = class("JointDrillLevelSelectCtrl", BaseCtrl)
local LocalData = require("GameCore.Data.LocalData")
local ClientManager = CS.ClientManager.Instance
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillLevelSelectCtrl._mapNodeConfig = {
TopBarPanel = {
sCtrlName = "Game.UI.TopBarEx.TopBarCtrl"
@@ -580,7 +581,7 @@ function JointDrillLevelSelectCtrl:OnEnable()
self.nActId = tbParam[1]
self.actDataIns = PlayerData.Activity:GetActivityDataById(self.nActId)
local mapCfg = ConfigTable.GetData("JointDrillControl", self.nActId)
if mapCfg == nil then
if mapCfg == nil or self.actDataIns == nil then
return
end
self.nGroupId = mapCfg.DrillLevelGroupId
@@ -589,6 +590,9 @@ function JointDrillLevelSelectCtrl:OnEnable()
local callback = function()
end
PlayerData.Build:GetAllBuildBriefData(callback)
if self.actDataIns == nil then
return
end
self.nActStatus = self.actDataIns:GetActStatus()
self._mapNode.goSmoke.gameObject:SetActive(false)
self._mapNode.goSmoke.gameObject:SetActive(true)
@@ -622,7 +626,7 @@ function JointDrillLevelSelectCtrl:OnBtnClick_Avg()
end
function JointDrillLevelSelectCtrl:OnBtnClick_Quest()
PlayerData.JointDrill_1:SendJointDrillRankMsg(function()
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillQuest_1, self.nActId)
EventManager.Hit(EventId.OpenPanel, JointDrillContext.GetPanelId(self.nActId, "Quest"), self.nActId)
end)
end
function JointDrillLevelSelectCtrl:OnBtnClick_Shop()
@@ -630,7 +634,7 @@ function JointDrillLevelSelectCtrl:OnBtnClick_Shop()
end
function JointDrillLevelSelectCtrl:OnBtnClick_Rank()
PlayerData.JointDrill_1:SendJointDrillRankMsg(function()
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillRanking_1, self.nActId)
EventManager.Hit(EventId.OpenPanel, JointDrillContext.GetPanelId(self.nActId, "Ranking"), self.nActId)
end)
end
function JointDrillLevelSelectCtrl:OnBtnClick_Tickets()
@@ -670,7 +674,7 @@ function JointDrillLevelSelectCtrl:OnBtnClick_Start()
return
end
local callback = function()
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillBuildList_1, self.nSelectLevelId, false)
EventManager.Hit(EventId.OpenPanel, JointDrillContext.GetPanelId(self.nActId, "BuildList"), self.nSelectLevelId, false)
end
callback()
end
@@ -692,7 +696,7 @@ function JointDrillLevelSelectCtrl:OnBtnClick_Continue()
return
end
local bSimulate = PlayerData.JointDrill_1:GetBattleSimulate()
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillBuildList_1, self.nSelectLevelId, bSimulate)
EventManager.Hit(EventId.OpenPanel, JointDrillContext.GetPanelId(self.nActId, "BuildList"), self.nSelectLevelId, bSimulate)
end
function JointDrillLevelSelectCtrl:OnBtnClick_Simulation()
local bInChallengeTime = PlayerData.JointDrill_1:CheckActChallengeTime()
@@ -706,7 +710,7 @@ function JointDrillLevelSelectCtrl:OnBtnClick_Simulation()
printError("LevelId 错误")
return
end
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillBuildList_1, self.nSelectLevelId, true)
EventManager.Hit(EventId.OpenPanel, JointDrillContext.GetPanelId(self.nActId, "BuildList"), self.nSelectLevelId, true)
end
function JointDrillLevelSelectCtrl:OnBtnClick_Cancel()
local sTip = ConfigTable.GetUIText("JointDrill_Give_Up_Tip")
@@ -749,7 +753,7 @@ function JointDrillLevelSelectCtrl:OnBtnClick_FastBattle()
return
end
PlayerData.JointDrill_1:SendJointDrillRankMsg(function()
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillRaid_1, self.nSelectLevelId)
EventManager.Hit(EventId.OpenPanel, JointDrillContext.GetPanelId(self.nActId, "Raid"), self.nSelectLevelId)
end)
end
function JointDrillLevelSelectCtrl:OnEvent_RefreshJointDrillLevel()
@@ -1,21 +0,0 @@
local JointDrillLevelSelectPanel = class("JointDrillLevelSelectPanel", BasePanel)
JointDrillLevelSelectPanel._sUIResRootPath = "UI_Activity/"
JointDrillLevelSelectPanel._tbDefine = {
{
sPrefabPath = "_510001/JointDrillLevelSelect.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillLevelSelectCtrl"
}
}
function JointDrillLevelSelectPanel:Awake()
end
function JointDrillLevelSelectPanel:OnEnable()
end
function JointDrillLevelSelectPanel:OnAfterEnter()
end
function JointDrillLevelSelectPanel:OnDisable()
end
function JointDrillLevelSelectPanel:OnDestroy()
end
function JointDrillLevelSelectPanel:OnRelease()
end
return JointDrillLevelSelectPanel
@@ -0,0 +1,21 @@
local JointDrillLevelSelectPanel_510001 = class("JointDrillLevelSelectPanel_510001", BasePanel)
JointDrillLevelSelectPanel_510001._sUIResRootPath = "UI_Activity/"
JointDrillLevelSelectPanel_510001._tbDefine = {
{
sPrefabPath = "_510001/JointDrillLevelSelect.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillLevelSelectCtrl"
}
}
function JointDrillLevelSelectPanel_510001:Awake()
end
function JointDrillLevelSelectPanel_510001:OnEnable()
end
function JointDrillLevelSelectPanel_510001:OnAfterEnter()
end
function JointDrillLevelSelectPanel_510001:OnDisable()
end
function JointDrillLevelSelectPanel_510001:OnDestroy()
end
function JointDrillLevelSelectPanel_510001:OnRelease()
end
return JointDrillLevelSelectPanel_510001
@@ -1,4 +1,5 @@
local JointDrillQuestCtrl = class("JointDrillQuestCtrl", BaseCtrl)
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillQuestCtrl._mapNodeConfig = {
goBlur = {
sNodeName = "t_fullscreen_blur_01"
@@ -138,7 +139,7 @@ function JointDrillQuestCtrl:PlayCloseAni(callback)
self:AddTimer(1, 0.2, "OnPanelClose", true, true, true, callback)
end
function JointDrillQuestCtrl:OnPanelClose(_, callback)
EventManager.Hit(EventId.ClosePanel, PanelId.JointDrillQuest_1)
EventManager.Hit(EventId.ClosePanel, JointDrillContext.GetPanelId(self.nActId, "Quest"))
if callback then
callback()
end
@@ -147,6 +148,7 @@ function JointDrillQuestCtrl:Awake()
self.nActId = 0
self.mapQuestGrid = {}
self.mapRankingGrid = {}
self.tbQuests = {}
end
function JointDrillQuestCtrl:OnEnable()
local tbParam = self:GetPanelParam()
@@ -1,22 +0,0 @@
local JointDrillQuestPanel = class("JointDrillQuestPanel", BasePanel)
JointDrillQuestPanel._bIsMainPanel = false
JointDrillQuestPanel._sUIResRootPath = "UI_Activity/"
JointDrillQuestPanel._tbDefine = {
{
sPrefabPath = "_510001/JointDrillQuestPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillQuestCtrl"
}
}
function JointDrillQuestPanel:Awake()
end
function JointDrillQuestPanel:OnEnable()
end
function JointDrillQuestPanel:OnAfterEnter()
end
function JointDrillQuestPanel:OnDisable()
end
function JointDrillQuestPanel:OnDestroy()
end
function JointDrillQuestPanel:OnRelease()
end
return JointDrillQuestPanel
@@ -0,0 +1,22 @@
local JointDrillQuestPanel_510001 = class("JointDrillQuestPanel_510001", BasePanel)
JointDrillQuestPanel_510001._bIsMainPanel = false
JointDrillQuestPanel_510001._sUIResRootPath = "UI_Activity/"
JointDrillQuestPanel_510001._tbDefine = {
{
sPrefabPath = "_510001/JointDrillQuestPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillQuestCtrl"
}
}
function JointDrillQuestPanel_510001:Awake()
end
function JointDrillQuestPanel_510001:OnEnable()
end
function JointDrillQuestPanel_510001:OnAfterEnter()
end
function JointDrillQuestPanel_510001:OnDisable()
end
function JointDrillQuestPanel_510001:OnDestroy()
end
function JointDrillQuestPanel_510001:OnRelease()
end
return JointDrillQuestPanel_510001
@@ -1,4 +1,5 @@
local JointDrillRaidCtrl = class("JointDrillRaidCtrl", BaseCtrl)
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillRaidCtrl._mapNodeConfig = {
goBlur = {
sNodeName = "t_fullscreen_blur_blue"
@@ -112,7 +113,7 @@ function JointDrillRaidCtrl:PlayOutAni()
EventManager.Hit(EventId.TemporaryBlockInput, 0.3)
end
function JointDrillRaidCtrl:Close()
EventManager.Hit(EventId.ClosePanel, PanelId.JointDrillRaid_1)
EventManager.Hit(EventId.ClosePanel, JointDrillContext.GetPanelId(PlayerData.JointDrill_1.nActId, "Raid"))
end
function JointDrillRaidCtrl:Awake()
end
@@ -1,22 +0,0 @@
local JointDrillRaidPanel = class("JointDrillRaidPanel", BasePanel)
JointDrillRaidPanel._bIsMainPanel = false
JointDrillRaidPanel._sUIResRootPath = "UI_Activity/"
JointDrillRaidPanel._tbDefine = {
{
sPrefabPath = "_510001/JointDrillRaidPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillRaidCtrl"
}
}
function JointDrillRaidPanel:Awake()
end
function JointDrillRaidPanel:OnEnable()
end
function JointDrillRaidPanel:OnAfterEnter()
end
function JointDrillRaidPanel:OnDisable()
end
function JointDrillRaidPanel:OnDestroy()
end
function JointDrillRaidPanel:OnRelease()
end
return JointDrillRaidPanel
@@ -0,0 +1,22 @@
local JointDrillRaidPanel_510001 = class("JointDrillRaidPanel_510001", BasePanel)
JointDrillRaidPanel_510001._bIsMainPanel = false
JointDrillRaidPanel_510001._sUIResRootPath = "UI_Activity/"
JointDrillRaidPanel_510001._tbDefine = {
{
sPrefabPath = "_510001/JointDrillRaidPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillRaidCtrl"
}
}
function JointDrillRaidPanel_510001:Awake()
end
function JointDrillRaidPanel_510001:OnEnable()
end
function JointDrillRaidPanel_510001:OnAfterEnter()
end
function JointDrillRaidPanel_510001:OnDisable()
end
function JointDrillRaidPanel_510001:OnDestroy()
end
function JointDrillRaidPanel_510001:OnRelease()
end
return JointDrillRaidPanel_510001
@@ -1,4 +1,5 @@
local JointDrillRankDetailCtrl = class("JointDrillRankDetailCtrl", BaseCtrl)
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillRankDetailCtrl._mapNodeConfig = {
goBlurBg = {
sNodeName = "t_fullscreen_blur_blue"
@@ -54,7 +55,7 @@ function JointDrillRankDetailCtrl:RefreshRankData(mapRank)
self:RefreshTeamList()
end
function JointDrillRankDetailCtrl:RefreshTeamList()
for _, v in ipairs(self.tbTeamGridCtrl) do
for _, v in pairs(self.tbTeamGridCtrl) do
self:UnbindCtrlByNode(v)
end
self.tbTeamGridCtrl = {}
@@ -62,10 +63,11 @@ function JointDrillRankDetailCtrl:RefreshTeamList()
end
function JointDrillRankDetailCtrl:RefreshGrid(goGrid, goGridIndex)
local nIndex = goGridIndex + 1
local itemCtrl = self:BindCtrlByNode(goGrid, "Game.UI.JointDrill.JointDrill_1.JointDrillTeamItemCtrl")
if self.tbTeamGridCtrl[goGrid] == nil then
self.tbTeamGridCtrl[goGrid] = self:BindCtrlByNode(goGrid, "Game.UI.JointDrill.JointDrill_1.JointDrillTeamItemCtrl")
end
local mapTeam = self.tbTeams[nIndex]
itemCtrl:RefreshItem(mapTeam, nIndex)
self.tbTeamGridCtrl[nIndex] = itemCtrl
self.tbTeamGridCtrl[goGrid]:RefreshItem(mapTeam, nIndex)
end
function JointDrillRankDetailCtrl:Awake()
end
@@ -87,7 +89,7 @@ function JointDrillRankDetailCtrl:OnEnable()
cs_coroutine.start(wait)
end
function JointDrillRankDetailCtrl:OnDisable()
for _, v in ipairs(self.tbTeamGridCtrl) do
for _, v in pairs(self.tbTeamGridCtrl) do
local obj = v.gameObject
self:UnbindCtrlByNode(v)
destroy(obj)
@@ -102,7 +104,7 @@ function JointDrillRankDetailCtrl:OnBtnClick_Close()
self._mapNode.animWindow:Play("t_window_04_t_out")
self._mapNode.goBlurBg:SetActive(false)
local callback = function()
EventManager.Hit(EventId.ClosePanel, PanelId.JointDrillRankDetail_1)
EventManager.Hit(EventId.ClosePanel, JointDrillContext.GetPanelId(PlayerData.JointDrill_1.nActId, "RankDetail"))
end
self:AddTimer(1, 0.3, callback, true, true, true)
EventManager.Hit(EventId.TemporaryBlockInput, 0.3)
@@ -1,22 +0,0 @@
local JointDrillRankDetailPanel = class("JointDrillRankDetailPanel", BasePanel)
JointDrillRankDetailPanel._bIsMainPanel = false
JointDrillRankDetailPanel._sUIResRootPath = "UI_Activity/"
JointDrillRankDetailPanel._tbDefine = {
{
sPrefabPath = "_510001/JointDrillRankDetailPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillRankDetailCtrl"
}
}
function JointDrillRankDetailPanel:Awake()
end
function JointDrillRankDetailPanel:OnEnable()
end
function JointDrillRankDetailPanel:OnAfterEnter()
end
function JointDrillRankDetailPanel:OnDisable()
end
function JointDrillRankDetailPanel:OnDestroy()
end
function JointDrillRankDetailPanel:OnRelease()
end
return JointDrillRankDetailPanel
@@ -0,0 +1,22 @@
local JointDrillRankDetailPanel_510001 = class("JointDrillRankDetailPanel_510001", BasePanel)
JointDrillRankDetailPanel_510001._bIsMainPanel = false
JointDrillRankDetailPanel_510001._sUIResRootPath = "UI_Activity/"
JointDrillRankDetailPanel_510001._tbDefine = {
{
sPrefabPath = "_510001/JointDrillRankDetailPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillRankDetailCtrl"
}
}
function JointDrillRankDetailPanel_510001:Awake()
end
function JointDrillRankDetailPanel_510001:OnEnable()
end
function JointDrillRankDetailPanel_510001:OnAfterEnter()
end
function JointDrillRankDetailPanel_510001:OnDisable()
end
function JointDrillRankDetailPanel_510001:OnDestroy()
end
function JointDrillRankDetailPanel_510001:OnRelease()
end
return JointDrillRankDetailPanel_510001
@@ -1,5 +1,6 @@
local JointDrillRankingCtrl = class("JointDrillRankingCtrl", BaseCtrl)
local ClientManager = CS.ClientManager.Instance
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillRankingCtrl._mapNodeConfig = {
TopBar = {
sNodeName = "TopBarPanel",
@@ -139,7 +140,7 @@ function JointDrillRankingCtrl:RefreshRankList()
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_1, self._panel.mapRankDetail)
EventManager.Hit(EventId.OpenPanel, JointDrillContext.GetPanelId(self.nActId, "RankDetail"), self._panel.mapRankDetail)
self._panel.mapRankDetail = nil
self._panel.nGridPos = 0
end, true, true, true)
@@ -1,23 +0,0 @@
local JointDrillRankingPanel = class("JointDrillRankingPanel", BasePanel)
JointDrillRankingPanel._sUIResRootPath = "UI_Activity/"
JointDrillRankingPanel._tbDefine = {
{
sPrefabPath = "_510001/JointDrillRankingPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillRankingCtrl"
}
}
function JointDrillRankingPanel:Awake()
self.mapRankDetail = nil
self.nGridPos = 0
end
function JointDrillRankingPanel:OnEnable()
end
function JointDrillRankingPanel:OnAfterEnter()
end
function JointDrillRankingPanel:OnDisable()
end
function JointDrillRankingPanel:OnDestroy()
end
function JointDrillRankingPanel:OnRelease()
end
return JointDrillRankingPanel
@@ -0,0 +1,23 @@
local JointDrillRankingPanel_510001 = class("JointDrillRankingPanel_510001", BasePanel)
JointDrillRankingPanel_510001._sUIResRootPath = "UI_Activity/"
JointDrillRankingPanel_510001._tbDefine = {
{
sPrefabPath = "_510001/JointDrillRankingPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillRankingCtrl"
}
}
function JointDrillRankingPanel_510001:Awake()
self.mapRankDetail = nil
self.nGridPos = 0
end
function JointDrillRankingPanel_510001:OnEnable()
end
function JointDrillRankingPanel_510001:OnAfterEnter()
end
function JointDrillRankingPanel_510001:OnDisable()
end
function JointDrillRankingPanel_510001:OnDestroy()
end
function JointDrillRankingPanel_510001:OnRelease()
end
return JointDrillRankingPanel_510001
@@ -1,4 +1,5 @@
local JointDrillRankItemCtrl = class("JointDrillRankItemCtrl", BaseCtrl)
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillRankItemCtrl._mapNodeConfig = {
btnTeamDetail = {
sComponentName = "UIButton",
@@ -103,8 +104,10 @@ function JointDrillRankItemCtrl:RefreshHonorTitle(tbHonors)
for k, v in pairs(tbHonors) do
if v ~= nil and v.Id > 0 then
local honorData = ConfigTable.GetData("Honor", v.Id)
self._mapNode.goHonorTitle[k]:SetHonotTitle(honorData.Id, k == 1, v.AffinityLV)
self._mapNode.goHonorTitle[k].gameObject:SetActive(true)
self._mapNode.goHonorTitle[k].gameObject:SetActive(honorData ~= nil)
if honorData ~= nil then
self._mapNode.goHonorTitle[k]:SetHonotTitle(honorData.Id, k == 1, v.AffinityLV)
end
end
end
end
@@ -133,7 +136,9 @@ function JointDrillRankItemCtrl:RefreshBuild(mapBuildList)
NovaAPI.SetTMPText(self._mapNode.txtRank[i], mapBuild.Chars[i].Level)
local nCharSkinId = mapChar.DefaultSkinId
local mapCharSkin = ConfigTable.GetData_CharacterSkin(nCharSkinId)
self:SetPngSprite(self._mapNode.imgItemIcon[i], mapCharSkin.Icon .. AllEnum.CharHeadIconSurfix.XXL)
if mapCharSkin ~= nil then
self:SetPngSprite(self._mapNode.imgItemIcon[i], mapCharSkin.Icon .. AllEnum.CharHeadIconSurfix.XXL)
end
local nRarity = mapChar.Grade
local sFrame = AllEnum.FrameType_New.BoardFrame .. AllEnum.BoardFrameColor[nRarity]
self:SetAtlasSprite(self._mapNode.imgItemRare[i], "12_rare", sFrame, true)
@@ -184,6 +189,6 @@ function JointDrillRankItemCtrl:OnBtnClick_TeamDetail()
return
end
EventManager.Hit("ShowTeamDetail", self.mapRankData)
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillRankDetail_1, self.mapRankData)
EventManager.Hit(EventId.OpenPanel, JointDrillContext.GetPanelId(PlayerData.JointDrill_1.nActId, "RankDetail"), self.mapRankData)
end
return JointDrillRankItemCtrl
@@ -41,6 +41,7 @@ function JointDrillRankRewardItemCtrl:RefreshItem(nIndex, nSelfRankSection)
self.tbReward = {}
for i = 1, 3 do
if mapCfg["AwardItemTid" .. i] ~= nil and mapCfg["AwardItemTid" .. i] ~= 0 then
self._mapNode.btnItem[i].gameObject:SetActive(true)
local nTid = mapCfg["AwardItemTid" .. i]
local nCount = mapCfg["AwardItemNum" .. i]
table.insert(self.tbReward, {nTid = nTid, nCount = nCount})
@@ -1,4 +1,5 @@
local JointDrillRankUpCtrl = class("JointDrillRankUpCtrl", BaseCtrl)
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillRankUpCtrl._mapNodeConfig = {
imgBlurredBg = {},
safeAreaRoot = {
@@ -100,6 +101,6 @@ function JointDrillRankUpCtrl:OnDestroy()
end
end
function JointDrillRankUpCtrl:OnBtnClick_Close()
EventManager.Hit(EventId.ClosePanel, PanelId.JointDrillRankUp_1)
EventManager.Hit(EventId.ClosePanel, JointDrillContext.GetPanelId(PlayerData.JointDrill_1.nActId, "RankUp"))
end
return JointDrillRankUpCtrl
@@ -1,22 +0,0 @@
local JointDrillRankUpPanel = class("JointDrillRankUpPanel", BasePanel)
JointDrillRankUpPanel._bIsMainPanel = false
JointDrillRankUpPanel._sUIResRootPath = "UI_Activity/"
JointDrillRankUpPanel._tbDefine = {
{
sPrefabPath = "_510001/JointDrillRankUpPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillRankUpCtrl"
}
}
function JointDrillRankUpPanel:Awake()
end
function JointDrillRankUpPanel:OnEnable()
end
function JointDrillRankUpPanel:OnAfterEnter()
end
function JointDrillRankUpPanel:OnDisable()
end
function JointDrillRankUpPanel:OnDestroy()
end
function JointDrillRankUpPanel:OnRelease()
end
return JointDrillRankUpPanel
@@ -0,0 +1,22 @@
local JointDrillRankUpPanel_510001 = class("JointDrillRankUpPanel_510001", BasePanel)
JointDrillRankUpPanel_510001._bIsMainPanel = false
JointDrillRankUpPanel_510001._sUIResRootPath = "UI_Activity/"
JointDrillRankUpPanel_510001._tbDefine = {
{
sPrefabPath = "_510001/JointDrillRankUpPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillRankUpCtrl"
}
}
function JointDrillRankUpPanel_510001:Awake()
end
function JointDrillRankUpPanel_510001:OnEnable()
end
function JointDrillRankUpPanel_510001:OnAfterEnter()
end
function JointDrillRankUpPanel_510001:OnDisable()
end
function JointDrillRankUpPanel_510001:OnDestroy()
end
function JointDrillRankUpPanel_510001:OnRelease()
end
return JointDrillRankUpPanel_510001
@@ -2,6 +2,7 @@ local JointDrillResultCtrl = class("JointDrillResultCtrl", BaseCtrl)
local WwiseManger = CS.WwiseAudioManager.Instance
local GamepadUIManager = require("GameCore.Module.GamepadUIManager")
local ModuleManager = require("GameCore.Module.ModuleManager")
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillResultCtrl._mapNodeConfig = {
imgBlurredBg = {},
goBg = {},
@@ -173,7 +174,7 @@ function JointDrillResultCtrl:OpenReward()
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
EventManager.Hit(EventId.OpenPanel, PanelId.JointDrillRankUp_1, self.nOld, self.nNew, self.mapScore, self.nResultType, closeCallback)
EventManager.Hit(EventId.OpenPanel, JointDrillContext.GetPanelId(PlayerData.JointDrill_1.nActId, "RankUp"), self.nOld, self.nNew, self.mapScore, self.nResultType, closeCallback)
else
closeCallback()
end
@@ -1,21 +0,0 @@
local JointDrillResultPanel = class("JointDrillResultPanel", BasePanel)
JointDrillResultPanel._sUIResRootPath = "UI_Activity/"
JointDrillResultPanel._tbDefine = {
{
sPrefabPath = "_510001/JointDrillResultPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillResultCtrl"
}
}
function JointDrillResultPanel:Awake()
end
function JointDrillResultPanel:OnEnable()
end
function JointDrillResultPanel:OnAfterEnter()
end
function JointDrillResultPanel:OnDisable()
end
function JointDrillResultPanel:OnDestroy()
end
function JointDrillResultPanel:OnRelease()
end
return JointDrillResultPanel
@@ -0,0 +1,21 @@
local JointDrillResultPanel_510001 = class("JointDrillResultPanel_510001", BasePanel)
JointDrillResultPanel_510001._sUIResRootPath = "UI_Activity/"
JointDrillResultPanel_510001._tbDefine = {
{
sPrefabPath = "_510001/JointDrillResultPanel.prefab",
sCtrlName = "Game.UI.JointDrill.JointDrill_1.JointDrillResultCtrl"
}
}
function JointDrillResultPanel_510001:Awake()
end
function JointDrillResultPanel_510001:OnEnable()
end
function JointDrillResultPanel_510001:OnAfterEnter()
end
function JointDrillResultPanel_510001:OnDisable()
end
function JointDrillResultPanel_510001:OnDestroy()
end
function JointDrillResultPanel_510001:OnRelease()
end
return JointDrillResultPanel_510001
@@ -1,4 +1,5 @@
local JointDrillTeamItemCtrl = class("JointDrillTeamItemCtrl", BaseCtrl)
local JointDrillContext = require("Game.UI.JointDrill.JointDrillContext")
JointDrillTeamItemCtrl._mapNodeConfig = {
goCharItem = {nCount = 3},
imgItemIcon = {nCount = 3, sComponentName = "Image"},
@@ -68,7 +69,7 @@ function JointDrillTeamItemCtrl:OnBtnClick_Detail()
EventManager.Hit(EventId.OpenPanel, PanelId.RankBuildDetail, self.mapTeam)
local wait = function()
coroutine.yield(CS.UnityEngine.WaitForEndOfFrame())
EventManager.Hit(EventId.ClosePanel, PanelId.JointDrillRankDetail_1)
EventManager.Hit(EventId.ClosePanel, JointDrillContext.GetPanelId(PlayerData.JointDrill_1.nActId, "RankDetail"))
end
cs_coroutine.start(wait)
end