Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-04-06 16:44:07 +08:00
commit 53d8603044
3 changed files with 1796 additions and 23 deletions

View File

@ -252,8 +252,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -3, y: -8}
m_SizeDelta: {x: 663, y: 0}
m_AnchoredPosition: {x: -4.3, y: -8}
m_SizeDelta: {x: 650.4, y: 243.6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &413880669
CanvasRenderer:
@ -290,7 +290,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 300
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -1732,8 +1732,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -3, y: -8}
m_SizeDelta: {x: 663, y: 0}
m_AnchoredPosition: {x: -3, y: -10.6}
m_SizeDelta: {x: 663, y: 240.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5845149226984315401
CanvasRenderer:
@ -1770,7 +1770,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 45
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
@ -3397,8 +3397,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -3, y: -8}
m_SizeDelta: {x: 663, y: 0}
m_AnchoredPosition: {x: -3, y: -8.8}
m_SizeDelta: {x: 663, y: 238.7}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5281767225777058133
CanvasRenderer:
@ -3435,13 +3435,13 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 3
m_MaxSize: 45
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 1
m_LineSpacing: 1
m_Text: "\u795E\u5668\u5927\u8F6C\u76D8\uFF01\u6700\u540E\u9009\n\u4E2D\u7684\u683C\u5B50\u4E3A\u6700\u7EC8\u5956\u52B1\u3002"
m_Text: "\u795E\u5668\u5927\u8F6C\u76D8\uFF01\u6700\u540E\u9009\u4E2D\u7684\u683C\u5B50\u4E3A\u6700\u7EC8\u5956\u52B1\u3002"
LanguageIndex: 0
--- !u!1 &1689866177290623398
GameObject:
@ -5987,8 +5987,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -3, y: -8}
m_SizeDelta: {x: 663, y: 0}
m_AnchoredPosition: {x: 0, y: -7.4}
m_SizeDelta: {x: 653.9, y: 243.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3017325564966967097
CanvasRenderer:
@ -6925,8 +6925,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -3, y: -8}
m_SizeDelta: {x: 663, y: 0}
m_AnchoredPosition: {x: -3.6, y: -8.7}
m_SizeDelta: {x: 651.7, y: 244.2}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8273454428336063794
CanvasRenderer:
@ -6963,7 +6963,7 @@ MonoBehaviour:
m_BestFit: 0
m_MinSize: 4
m_MaxSize: 104
m_Alignment: 3
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0

View File

@ -135,10 +135,12 @@ end
function FifteenDayGift:SetSingleReward(sData,go,index)
-- LogPink("index"..tostring(index).." sData.Progress:"..tostring(sData.Progress).." sData.State:"..tostring(sData.State))
local front = Util.GetGameObject(go,"front")
local name = Util.GetGameObject(go,"name"):GetComponent("Text")
local icon = Util.GetGameObject(go,"icon"):GetComponent("Image")
local num = Util.GetGameObject(go,"num"):GetComponent("Text")
local name = Util.GetGameObject(front,"name"):GetComponent("Text")
local icon = Util.GetGameObject(front,"icon"):GetComponent("Image")
local num = Util.GetGameObject(front,"num"):GetComponent("Text")
local back = Util.GetGameObject(go,"back")
local red = Util.GetGameObject(front,"red")
red:SetActive(false)
local curTime = GetTimeStamp()
--弄一个ItemView提供点击方法
@ -156,6 +158,7 @@ function FifteenDayGift:SetSingleReward(sData,go,index)
if sData.Progress <= curTime and sData.State == 0 then
table.insert(frontList,front)
table.insert(backList,back)
red:SetActive(true)
end
--如果已领取、可领取、不可领取显示第几天;下一领取显示时间
if sData.Progress > curTime and sData.Progress - 86400 <= curTime then