Update - 1.4.0.73
EN: 1.4.0.73 CN: 1.4.0.74 JP: 1.4.0.77 KR: 1.4.0.80
This commit is contained in:
@@ -19,7 +19,8 @@ BattlePassPopupSkinCtrl._mapNodeConfig = {
|
||||
btnClosePopup = {
|
||||
sComponentName = "UIButton",
|
||||
callback = "OnBtnClick_Close"
|
||||
}
|
||||
},
|
||||
imgSeasonTimeBar = {sComponentName = "Image"}
|
||||
}
|
||||
BattlePassPopupSkinCtrl._mapEventConfig = {}
|
||||
BattlePassPopupSkinCtrl._mapRedDotConfig = {}
|
||||
@@ -43,10 +44,12 @@ function BattlePassPopupSkinCtrl:ShowPanel(mapBattlePassCfg)
|
||||
self.animRoot:Play("rtSkinPopup_in")
|
||||
local nSkinId = mapBattlePassCfg.Cover
|
||||
local mapSkinCfg = ConfigTable.GetData("CharacterSkin", nSkinId)
|
||||
local _, color = ColorUtility.TryParseHtmlString(mapBattlePassCfg.CoverColor)
|
||||
self._mapNode.imgSeasonTimeBar.color = color
|
||||
if mapSkinCfg ~= nil then
|
||||
self._mapNode.Actor2D_PNG_Popup.gameObject:SetActive(true)
|
||||
local nCharId = mapSkinCfg.CharId
|
||||
Actor2DManager.SetActor2D_PNG(self._mapNode.Actor2D_PNG_Popup, PanelId.MainView, nCharId, nSkinId)
|
||||
Actor2DManager.SetActor2D_PNG(self._mapNode.Actor2D_PNG_Popup, PanelId.BattlePass, nCharId, nSkinId)
|
||||
else
|
||||
self._mapNode.Actor2D_PNG_Popup.gameObject:SetActive(false)
|
||||
end
|
||||
@@ -56,6 +59,7 @@ function BattlePassPopupSkinCtrl:ShowPanel(mapBattlePassCfg)
|
||||
local sCloseTime = os.date("%Y.%m.%d", nCloseTime)
|
||||
NovaAPI.SetTMPText(self._mapNode.TMPSeasonTIme_popup, string.format("%s-%s", sOpenTime, sCloseTime))
|
||||
self:SetPngSprite(self._mapNode.imgBattlePassLogo, "Icon/ArtText/CharSkin_ArtText_" .. mapBattlePassCfg.Cover)
|
||||
NovaAPI.SetImageNativeSize(self._mapNode.imgBattlePassLogo)
|
||||
end
|
||||
function BattlePassPopupSkinCtrl:OnBtnClick_Close()
|
||||
local callback = function()
|
||||
|
||||
@@ -82,6 +82,7 @@ function BattlePassPremiumBuyCtrl:OpenPanel(nCurType, nSeasonId, nVersion)
|
||||
NovaAPI.SetTMPText(self._mapNode.txtBtnbtnBuyPremium, tostring(mapBattlePassCfgData.PremiumShowPrice))
|
||||
local nSPremiumPrice = nCurType == 0 and mapBattlePassCfgData.LuxuryPrice or mapBattlePassCfgData.ComplementaryPrice
|
||||
self:SetPngSprite(self._mapNode.imgBattlePassLogo, "Icon/ArtText/CharSkin_ArtText_" .. mapBattlePassCfgData.Cover)
|
||||
NovaAPI.SetImageNativeSize(self._mapNode.imgBattlePassLogo)
|
||||
local sSPremiumPrice = nCurType == 0 and mapBattlePassCfgData.LuxuryShowPrice or mapBattlePassCfgData.ComplementaryShowPrice
|
||||
NovaAPI.SetTMPText(self._mapNode.txtBtnbtnBuySPremium, tostring(sSPremiumPrice))
|
||||
NovaAPI.SetTMPText(self._mapNode.txtBtnbtnBuySPremiumDiscount, tostring(mapBattlePassCfgData.OriginShowPrice))
|
||||
@@ -95,7 +96,7 @@ function BattlePassPremiumBuyCtrl:OpenPanel(nCurType, nSeasonId, nVersion)
|
||||
if mapSkinCfg ~= nil then
|
||||
self._mapNode.Actor2D_PNG_Buy.gameObject:SetActive(true)
|
||||
local nCharId = mapSkinCfg.CharId
|
||||
Actor2DManager.SetActor2D_PNG(self._mapNode.Actor2D_PNG_Buy, PanelId.MainView, nCharId, nSkinId)
|
||||
Actor2DManager.SetActor2D_PNG(self._mapNode.Actor2D_PNG_Buy, PanelId.BattlePass, nCharId, nSkinId)
|
||||
else
|
||||
self._mapNode.Actor2D_PNG_Buy.gameObject:SetActive(false)
|
||||
end
|
||||
|
||||
@@ -310,7 +310,7 @@ function SkinPreviewCtrl:WaitReadyClipFinish()
|
||||
if director == nil then
|
||||
return
|
||||
end
|
||||
local readyClipName = self.nCharId .. "_Ready"
|
||||
local readyClipName = "_Ready"
|
||||
local wait = function()
|
||||
while CS.AdventureModuleHelper.CheckTimelineClipFinish(director, readyClipName) == false do
|
||||
coroutine.yield(CS.UnityEngine.WaitForEndOfFrame())
|
||||
|
||||
Reference in New Issue
Block a user