Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
90c2171f2c
|
|
@ -5228,10 +5228,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 5284122085650758520}
|
m_Father: {fileID: 5284122085650758520}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0, y: 1}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0, y: 1}
|
m_AnchorMax: {x: 0, y: 0}
|
||||||
m_AnchoredPosition: {x: 540, y: -673.45}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 1080, y: 480.9}
|
m_SizeDelta: {x: 1080, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!114 &6567857664112827461
|
--- !u!114 &6567857664112827461
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
|
|
@ -5245,9 +5245,9 @@ MonoBehaviour:
|
||||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||||
m_Name:
|
m_Name:
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
m_IgnoreLayout: 1
|
m_IgnoreLayout: 0
|
||||||
m_MinWidth: -1
|
m_MinWidth: -1
|
||||||
m_MinHeight: -1
|
m_MinHeight: 460
|
||||||
m_PreferredWidth: -1
|
m_PreferredWidth: -1
|
||||||
m_PreferredHeight: -1
|
m_PreferredHeight: -1
|
||||||
m_FlexibleWidth: -1
|
m_FlexibleWidth: -1
|
||||||
|
|
@ -60523,9 +60523,9 @@ RectTransform:
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: -0.00012207, y: -216.5}
|
m_AnchoredPosition: {x: -0.00012207031, y: -16}
|
||||||
m_SizeDelta: {x: 1080, y: 0}
|
m_SizeDelta: {x: 1080, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 1}
|
||||||
--- !u!222 &5283433521350433378
|
--- !u!222 &5283433521350433378
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -60551,7 +60551,7 @@ MonoBehaviour:
|
||||||
m_Right: 0
|
m_Right: 0
|
||||||
m_Top: 0
|
m_Top: 0
|
||||||
m_Bottom: 0
|
m_Bottom: 0
|
||||||
m_ChildAlignment: 4
|
m_ChildAlignment: 1
|
||||||
m_Spacing: 0
|
m_Spacing: 0
|
||||||
m_ChildForceExpandWidth: 0
|
m_ChildForceExpandWidth: 0
|
||||||
m_ChildForceExpandHeight: 0
|
m_ChildForceExpandHeight: 0
|
||||||
|
|
|
||||||
|
|
@ -273,7 +273,8 @@ function this.SingleFuncState(id)
|
||||||
local qualifiled = this.IsQualifiled(id)
|
local qualifiled = this.IsQualifiled(id)
|
||||||
local isOpen = this.IsSwitchOpen(id)
|
local isOpen = this.IsSwitchOpen(id)
|
||||||
local isActive = this.FuncTimeJudge(id)
|
local isActive = this.FuncTimeJudge(id)
|
||||||
if isOpen and qualifiled and isActive then
|
local isSpecialActive = this.IsSpecialActive(id)
|
||||||
|
if isOpen and qualifiled and isActive and isSpecialActive then
|
||||||
isOpen = true
|
isOpen = true
|
||||||
else
|
else
|
||||||
isOpen = false
|
isOpen = false
|
||||||
|
|
@ -555,4 +556,13 @@ function this.SystemOpenTip(type)
|
||||||
return str
|
return str
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- 一些功能特殊判断
|
||||||
|
function this.IsSpecialActive(id)
|
||||||
|
if id == FUNCTION_OPEN_TYPE.WEEK_CARD then
|
||||||
|
return WeekCardManager.IsWeekCardOpen()
|
||||||
|
end
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
return this
|
return this
|
||||||
|
|
@ -91,4 +91,13 @@ function this.CheckRedReward()
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
return false
|
return false
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 根据是否有周卡数据,判断周卡功能是否开启
|
||||||
|
function this.IsWeekCardOpen()
|
||||||
|
local list = this.GetWeekCardDataArray()
|
||||||
|
if list and #list > 0 then
|
||||||
|
return true
|
||||||
|
end
|
||||||
|
return false
|
||||||
end
|
end
|
||||||
|
|
@ -130,7 +130,7 @@ function WeekCardPage:SetCardShow(index, data)
|
||||||
pre.icon2.sprite = sprite
|
pre.icon2.sprite = sprite
|
||||||
pre.icon3.sprite = sprite
|
pre.icon3.sprite = sprite
|
||||||
|
|
||||||
local rechargeCfg = _RechargeCommodityConfig[data.id]
|
local rechargeCfg = _RechargeCommodityConfig[config.RechargeId]
|
||||||
if not rechargeCfg then
|
if not rechargeCfg then
|
||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
@ -163,7 +163,7 @@ function WeekCardPage:SetCardShow(index, data)
|
||||||
pre.red:SetActive(false)
|
pre.red:SetActive(false)
|
||||||
Util.SetGray(pre.btn, false)
|
Util.SetGray(pre.btn, false)
|
||||||
Util.AddOnceClick(pre.btn, function()
|
Util.AddOnceClick(pre.btn, function()
|
||||||
PayManager.Pay(data.id, function(id)
|
PayManager.Pay(config.RechargeId, function(id)
|
||||||
-- 前端修改购买状态
|
-- 前端修改购买状态
|
||||||
data.isBuy = true
|
data.isBuy = true
|
||||||
WeekCardManager.UpdateWeekCardData(data)
|
WeekCardManager.UpdateWeekCardData(data)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue