Update - 1.7.0.88
EN: 1.7.0.88 CN: 1.7.0.90 JP: 1.7.0.91 KR: 1.7.0.94
This commit is contained in:
@@ -50,7 +50,7 @@ function ActivityShopGoodsItemCtrl:RefreshInfo()
|
||||
end
|
||||
self._mapNode.imgExpire.gameObject:SetActive(mapItemCfg.ExpireType > 0)
|
||||
local sPath = "db_green_shop_" .. AllEnum.FrameColor_New[mapItemCfg.Rarity]
|
||||
self:SetActivityAtlasSprite_New(self._mapNode.imgRare, "10103/SpriteAtlas_1010304", sPath)
|
||||
self:SetActivityAtlasSprite_New(self._mapNode.imgRare, "10103/SpriteAtlas/1010304", sPath)
|
||||
local bLimit = 0 < self.mapData.nMaximumLimit
|
||||
if bLimit then
|
||||
NovaAPI.SetTMPText(self._mapNode.txtLeft, orderedFormat(ConfigTable.GetUIText("Shop_Left"), self.mapData.nMaximumLimit - self.mapData.nBoughtCount))
|
||||
|
||||
@@ -349,12 +349,12 @@ function ActivityLevelsSelectCtrl:RefreshTogList(nType, nDifficulty)
|
||||
NovaAPI.SetImageColor(tmpImageHard, colorUnSelectLockMask)
|
||||
if not isOpenAdventure then
|
||||
local tmpLockAdventure = self._mapNode.lockAdventure.gameObject:GetComponent("Image")
|
||||
self:SetActivityAtlasSprite_New(tmpLockAdventure, "10104/SpriteAtlas_1010401", "tab_spring_1")
|
||||
self:SetActivityAtlasSprite_New(tmpLockAdventure, "10104/SpriteAtlas/1010401", "tab_spring_1")
|
||||
tmpLockAdventure:SetNativeSize()
|
||||
end
|
||||
if not isOpenHard then
|
||||
local tmpLockHard = self._mapNode.lockHard.gameObject:GetComponent("Image")
|
||||
self:SetActivityAtlasSprite_New(tmpLockHard, "10104/SpriteAtlas_1010401", "tab_spring_1")
|
||||
self:SetActivityAtlasSprite_New(tmpLockHard, "10104/SpriteAtlas/1010401", "tab_spring_1")
|
||||
tmpLockHard:SetNativeSize()
|
||||
end
|
||||
elseif nType == GameEnum.ActivityLevelType.Adventure then
|
||||
@@ -366,12 +366,12 @@ function ActivityLevelsSelectCtrl:RefreshTogList(nType, nDifficulty)
|
||||
NovaAPI.SetImageColor(tmpImageHard, colorUnSelectLockMask)
|
||||
if not isOpenAdventure then
|
||||
local tmpLockAdventure = self._mapNode.lockAdventure.gameObject:GetComponent("Image")
|
||||
self:SetActivityAtlasSprite_New(tmpLockAdventure, "10104/SpriteAtlas_1010401", "tab_spring_1_slc")
|
||||
self:SetActivityAtlasSprite_New(tmpLockAdventure, "10104/SpriteAtlas/1010401", "tab_spring_1_slc")
|
||||
tmpLockAdventure:SetNativeSize()
|
||||
end
|
||||
if not isOpenHard then
|
||||
local tmpLockHard = self._mapNode.lockHard.gameObject:GetComponent("Image")
|
||||
self:SetActivityAtlasSprite_New(tmpLockHard, "10104/SpriteAtlas_1010401", "tab_spring_1")
|
||||
self:SetActivityAtlasSprite_New(tmpLockHard, "10104/SpriteAtlas/1010401", "tab_spring_1")
|
||||
tmpLockHard:SetNativeSize()
|
||||
end
|
||||
else
|
||||
@@ -383,12 +383,12 @@ function ActivityLevelsSelectCtrl:RefreshTogList(nType, nDifficulty)
|
||||
NovaAPI.SetImageColor(tmpImageHard, colorSelectLockMask)
|
||||
if not isOpenAdventure then
|
||||
local tmpLockAdventure = self._mapNode.lockAdventure.gameObject:GetComponent("Image")
|
||||
self:SetActivityAtlasSprite_New(tmpLockAdventure, "10104/SpriteAtlas_1010401", "tab_spring_1")
|
||||
self:SetActivityAtlasSprite_New(tmpLockAdventure, "10104/SpriteAtlas/1010401", "tab_spring_1")
|
||||
tmpLockAdventure:SetNativeSize()
|
||||
end
|
||||
if not isOpenHard then
|
||||
local tmpLockHard = self._mapNode.lockHard.gameObject:GetComponent("Image")
|
||||
self:SetActivityAtlasSprite_New(tmpLockHard, "10104/SpriteAtlas_1010401", "tab_spring_1_slc")
|
||||
self:SetActivityAtlasSprite_New(tmpLockHard, "10104/SpriteAtlas/1010401", "tab_spring_1_slc")
|
||||
tmpLockHard:SetNativeSize()
|
||||
end
|
||||
end
|
||||
@@ -509,14 +509,14 @@ function ActivityLevelsSelectCtrl:OnBtnClick_Tog(btn)
|
||||
if value == self.curSelectHard then
|
||||
self._mapNode.togCtrl[idx]:SetDefaultActivity(false, colorSelect, colorUnSelect)
|
||||
local tmpImage = self._mapNode.togCtrl[idx].gameObject.transform:Find("AnimRoot/AnimSwitch/rtLockInfo/imgLockMask"):GetComponent("Image")
|
||||
self:SetActivityAtlasSprite_New(tmpImage, "10104/SpriteAtlas_1010401", "btn_spring_3")
|
||||
self:SetActivityAtlasSprite_New(tmpImage, "10104/SpriteAtlas/1010401", "btn_spring_3")
|
||||
tmpImage:SetNativeSize()
|
||||
break
|
||||
end
|
||||
end
|
||||
self._mapNode.togCtrl[togIdx]:SetDefaultActivity(true, colorSelect, colorUnSelect)
|
||||
local tmpImageSelect = self._mapNode.togCtrl[togIdx].gameObject.transform:Find("AnimRoot/AnimSwitch/rtLockInfo/imgLockMask"):GetComponent("Image")
|
||||
self:SetActivityAtlasSprite_New(tmpImageSelect, "10104/SpriteAtlas_1010401", "btn_spring_4")
|
||||
self:SetActivityAtlasSprite_New(tmpImageSelect, "10104/SpriteAtlas/1010401", "btn_spring_4")
|
||||
tmpImageSelect:SetNativeSize()
|
||||
self.SelectTogPreLvLock = self._mapNode.togCtrl[togIdx].gameObject.transform:Find("AnimRoot/AnimSwitch/rtLockPreLv/rtLockPreLvSelect"):GetComponent("Image")
|
||||
NovaAPI.SetImageColor(self.SelectTogPreLvLock, colorSelectLock)
|
||||
@@ -546,9 +546,9 @@ function ActivityLevelsSelectCtrl:RefreshInstanceInfo(nType, nHard, bLocation, b
|
||||
self._mapNode.togCtrl[i]:SetDefaultActivity(i == nHard, colorSelect, colorUnSelect)
|
||||
local tmpImageSelect = self._mapNode.togCtrl[i].gameObject.transform:Find("AnimRoot/AnimSwitch/rtLockInfo/imgLockMask"):GetComponent("Image")
|
||||
if i == nHard then
|
||||
self:SetActivityAtlasSprite_New(tmpImageSelect, "10104/SpriteAtlas_1010401", "btn_spring_4")
|
||||
self:SetActivityAtlasSprite_New(tmpImageSelect, "10104/SpriteAtlas/1010401", "btn_spring_4")
|
||||
else
|
||||
self:SetActivityAtlasSprite_New(tmpImageSelect, "10104/SpriteAtlas_1010401", "btn_spring_3")
|
||||
self:SetActivityAtlasSprite_New(tmpImageSelect, "10104/SpriteAtlas/1010401", "btn_spring_3")
|
||||
end
|
||||
tmpImageSelect:SetNativeSize()
|
||||
end
|
||||
|
||||
@@ -50,7 +50,7 @@ function ActivityShopGoodsItemCtrl:RefreshInfo()
|
||||
end
|
||||
self._mapNode.imgExpire.gameObject:SetActive(mapItemCfg.ExpireType > 0)
|
||||
local sPath = "db_spring_shop_" .. AllEnum.FrameColor_New[mapItemCfg.Rarity]
|
||||
self:SetActivityAtlasSprite_New(self._mapNode.imgRare, "10104/SpriteAtlas_1010404", sPath)
|
||||
self:SetActivityAtlasSprite_New(self._mapNode.imgRare, "10104/SpriteAtlas/1010404", sPath)
|
||||
local bLimit = 0 < self.mapData.nMaximumLimit
|
||||
if bLimit then
|
||||
NovaAPI.SetTMPText(self._mapNode.txtLeft, orderedFormat(ConfigTable.GetUIText("Shop_Left"), self.mapData.nMaximumLimit - self.mapData.nBoughtCount))
|
||||
|
||||
@@ -40,8 +40,6 @@ function ActivityLevelsLvCtrl:InitData(parent, nType, activityData, data, isOpen
|
||||
self._mapNode.rtLockPreLv:SetActive(false)
|
||||
local day = activityData:GetUnLockDay(nType, data.baseData.Id)
|
||||
if day == 0 then
|
||||
self._mapNode.lock:SetActive(false)
|
||||
self._mapNode.attaCount:SetActive(true)
|
||||
local timerCount = function()
|
||||
local hour, min, sec = parent.activityLevelsData:GetUnLockHour(nType, data.baseData.Id)
|
||||
if 0 < hour then
|
||||
@@ -57,8 +55,6 @@ function ActivityLevelsLvCtrl:InitData(parent, nType, activityData, data, isOpen
|
||||
timerCount()
|
||||
end, true, true, false)
|
||||
else
|
||||
self._mapNode.lock:SetActive(false)
|
||||
self._mapNode.attaCount:SetActive(true)
|
||||
NovaAPI.SetTMPText(self._mapNode.txtLockCondition, orderedFormat(ConfigTable.GetUIText("ActivityLevels_Lock_Day_Color_Common"), "08d3d4", day))
|
||||
end
|
||||
end
|
||||
|
||||
@@ -123,6 +123,7 @@ ActivityLevelsSelectCtrl._mapNodeConfig = {
|
||||
imgBuild = {sComponentName = "Image"},
|
||||
TMPName = {sComponentName = "TMP_Text"},
|
||||
TMPLevel = {sComponentName = "TMP_Text"},
|
||||
detailDescSc = {sComponentName = "Transform"},
|
||||
detailDesc = {sComponentName = "TMP_Text"},
|
||||
btnEnemyInfo = {
|
||||
sComponentName = "UIButton",
|
||||
@@ -156,6 +157,10 @@ ActivityLevelsSelectCtrl._mapNodeConfig = {
|
||||
sComponentName = "UIButton",
|
||||
callback = "OnClickBtnGo"
|
||||
},
|
||||
txtBtnGoRaidUnlock = {
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Maninline_Btn_Go"
|
||||
},
|
||||
txtBtnGo = {
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Maninline_Btn_Go"
|
||||
@@ -185,6 +190,7 @@ ActivityLevelsSelectCtrl._mapEventConfig = {
|
||||
ActivityLevelsSelectCtrl._mapRedDotConfig = {}
|
||||
function ActivityLevelsSelectCtrl:Awake()
|
||||
self.lvListMsgView = self._mapNode.rtToggles.transform:Find("Viewport").gameObject
|
||||
self.detailDescContent = self._mapNode.detailDescSc:Find("Viewport/Content").transform
|
||||
self.curRequireEnergy = 0
|
||||
local param = self:GetPanelParam()
|
||||
if type(param) == "table" then
|
||||
@@ -277,7 +283,7 @@ function ActivityLevelsSelectCtrl:RefreshTogTypeCount()
|
||||
break
|
||||
end
|
||||
end
|
||||
objAdventureCert:SetActive(false)
|
||||
objAdventureCert:SetActive(true)
|
||||
for i, v in pairs(self.activityLevelsData.levelTabAdventure) do
|
||||
if v.Star < 3 then
|
||||
objAdventureCert:SetActive(false)
|
||||
@@ -532,6 +538,7 @@ function ActivityLevelsSelectCtrl:RefreshInstanceInfo(nType, nHard, isInit)
|
||||
end
|
||||
NovaAPI.SetTMPText(self._mapNode.TMPLevel, strTitle)
|
||||
NovaAPI.SetTMPText(self._mapNode.detailDesc, self.selectLevelData.baseData.Desc)
|
||||
self.detailDescContent:DOLocalMoveY(0, 0)
|
||||
self.curStar = self.selectLevelData.Star
|
||||
local tbCond = {
|
||||
self.selectLevelData.baseData.OneStarDesc,
|
||||
|
||||
@@ -50,7 +50,7 @@ function ActivityShopGoodsItemCtrl:RefreshInfo()
|
||||
end
|
||||
self._mapNode.imgExpire.gameObject:SetActive(mapItemCfg.ExpireType > 0)
|
||||
local sPath = "db_winternight_shop_" .. AllEnum.FrameColor_New[mapItemCfg.Rarity]
|
||||
self:SetActivityAtlasSprite_New(self._mapNode.imgRare, "10105/SpriteAtlas_1010504", sPath)
|
||||
self:SetActivityAtlasSprite_New(self._mapNode.imgRare, "10105/SpriteAtlas/1010504", sPath)
|
||||
local bLimit = 0 < self.mapData.nMaximumLimit
|
||||
if bLimit then
|
||||
NovaAPI.SetTMPText(self._mapNode.txtLeft, orderedFormat(ConfigTable.GetUIText("Shop_Left"), self.mapData.nMaximumLimit - self.mapData.nBoughtCount))
|
||||
|
||||
@@ -99,6 +99,7 @@ function WinterNightStoryCtrl:OnRefreshGrid(grid, index)
|
||||
local imgStory = RootNode:Find("imgStory"):GetComponent("Image")
|
||||
local goNotOpen = RootNode:Find("goNotOpen").gameObject
|
||||
local txtLevel = RootNode:Find("txtLevel"):GetComponent("TMP_Text")
|
||||
local txtLevelLock = goNotOpen.transform:Find("txtLevelLock"):GetComponent("TMP_Text")
|
||||
local imgStoryTitleBg = RootNode:Find("imgStoryTitleBg")
|
||||
local imgBattleTitleBg = RootNode:Find("imgBattleTitleBg")
|
||||
local RedDot = RootNode:Find("RedDot").gameObject
|
||||
@@ -123,14 +124,22 @@ function WinterNightStoryCtrl:OnRefreshGrid(grid, index)
|
||||
self:SetPngSprite(imgStory, string.format("Icon/ActivityStory/ep_event04_%02d", nIndex))
|
||||
NovaAPI.SetTMPText(txtTitle, avgcfg.Title)
|
||||
NovaAPI.SetTMPText(txtLevel, avgcfg.Index)
|
||||
NovaAPI.SetTMPText(txtLevelLock, avgcfg.Index)
|
||||
txtTitle.gameObject:SetActive(isUnlock and bOpen)
|
||||
goImgTime.gameObject:SetActive(not bOpen)
|
||||
goComplete.gameObject:SetActive(isUnlock and isReaded)
|
||||
goLock.gameObject:SetActive(not isUnlock)
|
||||
goComplete.gameObject:SetActive(isUnlock and isReaded and bOpen)
|
||||
goLock.gameObject:SetActive(not isUnlock and bOpen)
|
||||
goNotOpen.gameObject:SetActive(not bOpen)
|
||||
imgBattleTitleBg.gameObject:SetActive(avgcfg.IsBattle and isUnlock and bOpen)
|
||||
imgStoryTitleBg.gameObject:SetActive(not avgcfg.IsBattle and isUnlock and bOpen)
|
||||
imgBg2.gameObject:SetActive(self.curIndex == gridIndex and isUnlock and bOpen)
|
||||
if avgcfg.IsBattle == true then
|
||||
local txtPlot = imgBattleTitleBg:Find("txtPlot"):GetComponent("TMP_Text")
|
||||
NovaAPI.SetTMPText(txtPlot, ConfigTable.GetUIText("SelectTeam_StartBattle"))
|
||||
else
|
||||
local txtPlot = imgStoryTitleBg:Find("txtPlot"):GetComponent("TMP_Text")
|
||||
NovaAPI.SetTMPText(txtPlot, ConfigTable.GetUIText("TowerDef_Story"))
|
||||
end
|
||||
if not bOpen then
|
||||
local strTime = self:GetRemainTimeStr(nOpenTime, avgcfg.DayOpen)
|
||||
if self.tbGridTimer[goInstanceID] ~= nil then
|
||||
@@ -259,13 +268,13 @@ function WinterNightStoryCtrl:GetRemainTimeStr(nOpenTime, openDay)
|
||||
local min = math.floor((nRemainTime - hour * 3600) / 60)
|
||||
local sec = nRemainTime - hour * 3600 - min * 60
|
||||
if 0 < day then
|
||||
timeStr = orderedFormat(ConfigTable.GetUIText("ActivityLevels_Lock_Day_Color_Common"), "f3772c", day)
|
||||
timeStr = orderedFormat(ConfigTable.GetUIText("ActivityLevels_Lock_Day_Color_Common"), "08d3d4", day)
|
||||
elseif 0 < hour then
|
||||
timeStr = orderedFormat(ConfigTable.GetUIText("ActivityLevels_Lock_Hour_Color_Common"), "f3772c", hour)
|
||||
timeStr = orderedFormat(ConfigTable.GetUIText("ActivityLevels_Lock_Hour_Color_Common"), "08d3d4", hour)
|
||||
elseif 0 < min then
|
||||
timeStr = orderedFormat(ConfigTable.GetUIText("ActivityLevels_Lock_Min_Color_Common"), "f3772c", min)
|
||||
timeStr = orderedFormat(ConfigTable.GetUIText("ActivityLevels_Lock_Min_Color_Common"), "08d3d4", min)
|
||||
elseif 0 < sec then
|
||||
timeStr = orderedFormat(ConfigTable.GetUIText("ActivityLevels_Lock_Sec_Color_Common"), "f3772c", sec)
|
||||
timeStr = orderedFormat(ConfigTable.GetUIText("ActivityLevels_Lock_Sec_Color_Common"), "08d3d4", sec)
|
||||
end
|
||||
return timeStr, 0 < nRemainTime
|
||||
end
|
||||
|
||||
@@ -2,6 +2,7 @@ local BaseCtrl = require("GameCore.UI.BaseCtrl")
|
||||
local WinterNightThemeCtrl = class("WinterNightThemeCtrl", BaseCtrl)
|
||||
local ClientManager = CS.ClientManager.Instance
|
||||
local TimerManager = require("GameCore.Timer.TimerManager")
|
||||
local LocalData = require("GameCore.Data.LocalData")
|
||||
WinterNightThemeCtrl._mapNodeConfig = {
|
||||
btnEntrance_ = {
|
||||
nCount = 5,
|
||||
@@ -19,12 +20,12 @@ WinterNightThemeCtrl._mapNodeConfig = {
|
||||
imgMiniGame = {sComponentName = "Image"},
|
||||
txtMiniGame = {
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Activity_Mini_Game_Cookie"
|
||||
sLanguageId = "Activity_MiniGame_ThrowGifts"
|
||||
},
|
||||
imgMiniGameEnd = {},
|
||||
txtMiniGameEnd = {
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Activity_Mini_Game_Cookie"
|
||||
sLanguageId = "Activity_MiniGame_ThrowGifts"
|
||||
},
|
||||
txtMiniGame_End = {},
|
||||
txtTask = {
|
||||
@@ -35,6 +36,14 @@ WinterNightThemeCtrl._mapNodeConfig = {
|
||||
imgTaskActivityTime = {},
|
||||
txtTaskActivityTime = {sComponentName = "TMP_Text"},
|
||||
imgStory = {sComponentName = "Image"},
|
||||
txtStory = {
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Activity_Story"
|
||||
},
|
||||
txtStory_End = {
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Activity_Story"
|
||||
},
|
||||
goStoryEnd = {},
|
||||
txtStoryEnd = {
|
||||
sComponentName = "TMP_Text",
|
||||
@@ -59,6 +68,14 @@ WinterNightThemeCtrl._mapNodeConfig = {
|
||||
imgShopActivityTime = {},
|
||||
txtShopActivityTime = {sComponentName = "TMP_Text"},
|
||||
imgLevel = {sComponentName = "Image"},
|
||||
txtLevel = {
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Activity_Level"
|
||||
},
|
||||
txtLevel_End = {
|
||||
sComponentName = "TMP_Text",
|
||||
sLanguageId = "Activity_Level"
|
||||
},
|
||||
goLevelEnd = {},
|
||||
txtLevelEnd = {
|
||||
sComponentName = "TMP_Text",
|
||||
@@ -99,12 +116,12 @@ WinterNightThemeCtrl._mapNodeConfig = {
|
||||
txtShop_End = {},
|
||||
txtTaskProgressEnd = {sComponentName = "TMP_Text"},
|
||||
dbTaskEnd = {},
|
||||
miniGameRedDot = {},
|
||||
redDotEntrance2 = {},
|
||||
storyRedDot = {},
|
||||
reddotLevel = {},
|
||||
goMiniGameEnd = {},
|
||||
imgStoryEnd = {},
|
||||
txtStory_End = {}
|
||||
imgStoryEnd = {}
|
||||
}
|
||||
WinterNightThemeCtrl._mapEventConfig = {}
|
||||
local ActivityState = {
|
||||
@@ -121,15 +138,27 @@ function WinterNightThemeCtrl:Awake()
|
||||
if self.WinterNightData ~= nil then
|
||||
self.ActivityGroupCfg = self.WinterNightData.actGroupConfig
|
||||
end
|
||||
for k, v in pairs(self._mapNode.btnEntrance_) do
|
||||
v.interactable = false
|
||||
end
|
||||
end
|
||||
function WinterNightThemeCtrl:FadeIn()
|
||||
EventManager.Hit(EventId.SetTransition)
|
||||
local sAnimName = "WinterNightPanel_in_02"
|
||||
if self.animRoot ~= nil then
|
||||
self.animRoot:Play("WinterNightPanel_in_02", 0, 0)
|
||||
self.animRoot = self.gameObject:GetComponent("Animator")
|
||||
sAnimName = "WinterNightPanel_in_02"
|
||||
else
|
||||
self.animRoot = self.gameObject:GetComponent("Animator")
|
||||
self.animRoot:Play("WinterNightPanel_in_01", 0, 0)
|
||||
sAnimName = "WinterNightPanel_in_01"
|
||||
end
|
||||
self.animRoot:Play(sAnimName, 0, 0)
|
||||
local nAnimLength = NovaAPI.GetAnimClipLength(self.animRoot, {sAnimName})
|
||||
self:AddTimer(1, nAnimLength, function()
|
||||
for k, v in pairs(self._mapNode.btnEntrance_) do
|
||||
v.interactable = true
|
||||
end
|
||||
end, true, true, true)
|
||||
end
|
||||
function WinterNightThemeCtrl:OnEnable()
|
||||
self:RefreshPanel()
|
||||
@@ -158,6 +187,9 @@ function WinterNightThemeCtrl:OnEnable()
|
||||
self.nActId,
|
||||
nActId
|
||||
}, self._mapNode.storyRedDot)
|
||||
elseif i == AllEnum.ActivityThemeFuncIndex.MiniGame then
|
||||
local nActId = actData.ActivityId
|
||||
RedDotManager.RegisterNode(RedDotDefine.Activity_ThrowGift_New, {nActId}, self._mapNode.miniGameRedDot)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -387,6 +419,11 @@ function WinterNightThemeCtrl:RefreshMiniGameButtonState(actData)
|
||||
self._mapNode.txtMiniGame_End:SetActive(state == ActivityState.Closed)
|
||||
self._mapNode.txtMiniGameEnd.gameObject:SetActive(state == ActivityState.Closed)
|
||||
self._mapNode.goMiniGameEnd.gameObject:SetActive(state == ActivityState.Closed)
|
||||
if state ~= ActivityState.Open then
|
||||
RedDotManager.SetValid(RedDotDefine.Activity_ThrowGift_New, {
|
||||
actData.ActivityId
|
||||
}, false)
|
||||
end
|
||||
self.tbActState[activityId] = state
|
||||
end
|
||||
end
|
||||
@@ -450,7 +487,7 @@ function WinterNightThemeCtrl:RefreshStoryButtonState(actData)
|
||||
self._mapNode.imgStoryActivityUnlockTime:SetActive(state == ActivityState.NotOpen)
|
||||
self._mapNode.goStoryEnd:SetActive(state == ActivityState.Closed)
|
||||
self._mapNode.imgStoryEnd:SetActive(state == ActivityState.Closed)
|
||||
self._mapNode.txtStory_End:SetActive(state == ActivityState.Closed)
|
||||
self._mapNode.txtStory_End.gameObject:SetActive(state == ActivityState.Closed)
|
||||
self.tbActState[activityId] = state
|
||||
end
|
||||
end
|
||||
@@ -479,6 +516,7 @@ function WinterNightThemeCtrl:RefreshLevelButtonState(actData)
|
||||
self._mapNode.imgLevelActivityUnlockTime:SetActive(state == ActivityState.NotOpen)
|
||||
self._mapNode.imgLevelEnd:SetActive(state == ActivityState.Closed)
|
||||
self._mapNode.goLevelEnd:SetActive(state == ActivityState.Closed)
|
||||
self._mapNode.txtLevel_End.gameObject:SetActive(state == ActivityState.Closed)
|
||||
self.tbActState[activityId] = state
|
||||
end
|
||||
end
|
||||
@@ -553,11 +591,14 @@ function WinterNightThemeCtrl:OnBtn_ClickActivityEntrance(btn, nIndex)
|
||||
end
|
||||
if actData.PanelId ~= nil and ActivityState.Open == state then
|
||||
if nIndex == AllEnum.ActivityThemeFuncIndex.MiniGame then
|
||||
local nRandom = math.random(31, 32)
|
||||
LocalData.SetPlayerLocalData("Activity_ThrowGift_New", true)
|
||||
RedDotManager.SetValid(RedDotDefine.Activity_ThrowGift_New, {
|
||||
actData.ActivityId
|
||||
}, false)
|
||||
local func = function()
|
||||
EventManager.Hit(EventId.OpenPanel, actData.PanelId, actData.ActivityId, self.nActId)
|
||||
end
|
||||
EventManager.Hit(EventId.SetTransition, nRandom, func)
|
||||
EventManager.Hit(EventId.SetTransition, 37, func)
|
||||
else
|
||||
EventManager.Hit(EventId.OpenPanel, actData.PanelId, actData.ActivityId)
|
||||
end
|
||||
|
||||
@@ -50,7 +50,7 @@ function ActivityShopGoodsItemCtrl:RefreshInfo()
|
||||
end
|
||||
self._mapNode.imgExpire.gameObject:SetActive(mapItemCfg.ExpireType > 0)
|
||||
local sPath = "db_arkanoid_shop_" .. AllEnum.FrameColor_New[mapItemCfg.Rarity]
|
||||
self:SetActivityAtlasSprite_New(self._mapNode.imgRare, "30101/SpriteAtlas_3010103", sPath)
|
||||
self:SetActivityAtlasSprite_New(self._mapNode.imgRare, "30101/SpriteAtlas/3010103", sPath)
|
||||
local bLimit = 0 < self.mapData.nMaximumLimit
|
||||
if bLimit then
|
||||
NovaAPI.SetTMPText(self._mapNode.txtLeft, orderedFormat(ConfigTable.GetUIText("Shop_Left"), self.mapData.nMaximumLimit - self.mapData.nBoughtCount))
|
||||
|
||||
@@ -238,6 +238,10 @@ function ActivityLevelsInstancePauseCtrl:OnEvent_Reopen(sName)
|
||||
if sName ~= "ActivityLevelsInstancePauseCtrl" then
|
||||
return
|
||||
end
|
||||
local nUIType = GamepadUIManager.GetCurUIType()
|
||||
if nUIType == AllEnum.GamepadUIType.Other then
|
||||
return
|
||||
end
|
||||
self._mapNode.ActionBar.gameObject:SetActive(true)
|
||||
end
|
||||
return ActivityLevelsInstancePauseCtrl
|
||||
|
||||
Reference in New Issue
Block a user