Merge branch 'Branch_oumei' of http://192.168.1.21:3000/root/sk-client into Branch_oumei
commit
555ba17820
|
|
@ -11,7 +11,10 @@ local _TabData = {
|
|||
[1] = { default = "X1_tongyong_fenlan_weixuanzhong_02", select = "X1_tongyong_fenlan_yixuanzhong_02", name = GetLanguageStrById(12523) },
|
||||
[2] = { default = "X1_tongyong_fenlan_weixuanzhong_02", select = "X1_tongyong_fenlan_yixuanzhong_02", name = GetLanguageStrById(12524) },
|
||||
}
|
||||
|
||||
local _TabData2 = {
|
||||
[1] = { default = "X1_tongyong_fenlan_weixuanzhong_02", select = "X1_tongyong_fenlan_yixuanzhong_02", name = GetLanguageStrById(12523) },
|
||||
--[2] = { default = "X1_tongyong_fenlan_weixuanzhong_02", select = "X1_tongyong_fenlan_yixuanzhong_02", name = GetLanguageStrById(12524) },
|
||||
}
|
||||
--初始化组件(用于子类重写)
|
||||
function ClimbTowerRewardPopup:InitComponent()
|
||||
this.BackMask = Util.GetGameObject(self.gameObject, "BackMask")
|
||||
|
|
@ -112,8 +115,12 @@ function ClimbTowerRewardPopup:OnShow()
|
|||
this.configDataVip = ClimbTowerManager.GetChallengeConfigVipData()
|
||||
this.curTier = ClimbTowerManager.fightId - 1 --< 通过层数
|
||||
_tabIdx = 1
|
||||
|
||||
this.tabCtrl:Init(this.tabBox, _TabData)
|
||||
local channelConfig = GetChannelConfig()
|
||||
if channelConfig.Button_PlayerSet_Exchange then
|
||||
this.tabCtrl:Init(this.tabBox, _TabData)
|
||||
else
|
||||
this.tabCtrl:Init(this.tabBox, _TabData2)
|
||||
end
|
||||
ClimbTowerRewardPopup.ChangeTab(_tabIdx)
|
||||
|
||||
this.Tier:GetComponent("Text").text = tostring(this.curTier)
|
||||
|
|
|
|||
|
|
@ -170,11 +170,11 @@ function this:UIChange()
|
|||
|
||||
--特权
|
||||
local isActive = PrivilegeManager.GetPrivilegeOpenStatusById(33)
|
||||
this.privilegePanel:SetActive(not isActive)
|
||||
local channelConfig = GetChannelConfig()
|
||||
this.privilegePanel:SetActive(not isActive and channelConfig.Button_PlayerSet_Exchange)
|
||||
Util.GetGameObject(this.privilegePanel, "desc"):GetComponent("Text").text = GetLanguageStrById(PrivilegeConfig.Desc)
|
||||
Util.GetGameObject(this.btnBuyPrivilege, "Text"):GetComponent("Text").text = MoneyUtil.GetMoney(PrivilegeConfig.Price)
|
||||
local grid = Util.GetGameObject(this.privilegePanel, "grid")
|
||||
|
||||
this.activatedPanel:SetActive(isActive)
|
||||
if isActive then
|
||||
local time = PrivilegeManager.GetPrivilegeLeftTimeById(33)
|
||||
|
|
|
|||
|
|
@ -122,6 +122,10 @@ function FirstRechargePanel:OnOpen(context,_fun)
|
|||
end
|
||||
|
||||
function FirstRechargePanel:OnShow()
|
||||
if not GetChannelConfig().Button_PlayerSet_Exchange then
|
||||
self:ClosePanel()
|
||||
return
|
||||
end
|
||||
self:OnTabChanged(self.selectTabIndex)
|
||||
local activityInfo = ActivityGiftManager.GetActivityTypeInfo(ActivityTypeDef.FirstRecharge)
|
||||
local AccumRecharge = 0
|
||||
|
|
|
|||
|
|
@ -72,7 +72,7 @@ local _GuildBuildConfig = {
|
|||
end,
|
||||
},
|
||||
[GUILD_MAP_BUILD_TYPE.REDBAG] = { --联盟红包
|
||||
isOpen = true,
|
||||
isOpen = GetChannelConfig().Button_PlayerSet_Exchange,
|
||||
rpType = RedPointType.Guild_RedPacket,
|
||||
btnName = "btnRedBag",
|
||||
btnFunc = function()
|
||||
|
|
|
|||
|
|
@ -26,7 +26,8 @@ function LeadPanel:InitComponent()
|
|||
|
||||
this.normal = Util.GetGameObject(this.gameObject, "Research/normal")--普通
|
||||
this.privilege = Util.GetGameObject(this.gameObject, "Research/privilege")--特权
|
||||
|
||||
local channelConfig = GetChannelConfig()
|
||||
this.privilege:SetActive(channelConfig.Button_PlayerSet_Exchange)
|
||||
this.ordproText = Util.GetGameObject(this.gameObject, "ordproText")--普通
|
||||
this.prigeproText = Util.GetGameObject(this.gameObject, "prigeproText")--特权
|
||||
|
||||
|
|
|
|||
|
|
@ -787,20 +787,22 @@ function GiftView:TimeCountDown()
|
|||
|
||||
if RECHARGEABLE then--(是否开启充值)
|
||||
self.localTimerV2 = Timer.New(function()
|
||||
local t1,t2 = timerList[1].freshTime, timerList[2].freshTime
|
||||
t1 = t1-1
|
||||
t2 = t2-1
|
||||
if t1 < 0 then
|
||||
if timerList[1] and timerList[2] then
|
||||
local t1,t2 = timerList[1].freshTime, timerList[2].freshTime
|
||||
t1 = t1-1
|
||||
t2 = t2-1
|
||||
if t1 < 0 then
|
||||
-- body刷新
|
||||
-- self:RefreshGiftData()
|
||||
end
|
||||
if t2 < 0 then
|
||||
end
|
||||
if t2 < 0 then
|
||||
-- body刷新
|
||||
-- self:RefreshGiftData()
|
||||
end
|
||||
end
|
||||
|
||||
timerList[1].pre.text = GetLanguageStrById(10561) .. self:SpecialTime(t1-GetTimeStamp())
|
||||
timerList[2].pre.text = GetLanguageStrById(10561) .. self:SpecialTime(t2-GetTimeStamp())
|
||||
timerList[1].pre.text = GetLanguageStrById(10561) .. self:SpecialTime(t1-GetTimeStamp())
|
||||
timerList[2].pre.text = GetLanguageStrById(10561) .. self:SpecialTime(t2-GetTimeStamp())
|
||||
end
|
||||
end,1,-1,true)
|
||||
self.localTimerV2:Start()
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue