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

dev_chengFeng
ZhangBiao 2021-06-21 10:52:04 +08:00
commit cf38744969
3 changed files with 9 additions and 6 deletions

View File

@ -666,10 +666,10 @@ RectTransform:
m_Father: {fileID: 2384432804281337260}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -192.6}
m_SizeDelta: {x: -2, y: -719.2}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -192.59998}
m_SizeDelta: {x: 1078, y: 1830.8}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3090490801835799772
CanvasRenderer:

View File

@ -55,6 +55,7 @@ function FuXingGaoZhaoPanel:BindEvent()
self.timer = nil
end
self:Refresh()
CheckRedPointStatus(RedPointType.FuXingGaoZhaoPanel)
end)
end)
end
@ -62,6 +63,7 @@ function FuXingGaoZhaoPanel:BindEvent()
NetManager.GetActivityRewardRequest(-1,self.data.activityId,function (drop)
UIManager.OpenPanel(UIName.RewardItemPopup, drop, 1,function()
self:Refresh()
CheckRedPointStatus(RedPointType.FuXingGaoZhaoPanel)
end)
end)
end

View File

@ -36,6 +36,7 @@ function CommonActPage:InitComponent()
self.scrollItem = Util.GetGameObject(self.gameObject, "scrollItem")
self.scrollItemPos = self.scrollItem.transform.localPosition
self.scrollItemRect = self.scrollItem.transform.rect
self.time = Util.GetGameObject(self.gameObject, "time")
self.timeText = Util.GetGameObject(self.time, "timeText"):GetComponent("Text")
self.btnHelp = Util.GetGameObject(self.gameObject, "btnHelp")
@ -131,8 +132,8 @@ function CommonActPage:OnShow(_sortingOrder)
end
if not self.scrollView then
local rootHight = self.scrollItem.transform.rect.height
local width = self.scrollItem.transform.rect.width
local rootHight = self.scrollItemRect.height
local width = self.scrollItemRect.width
if self.actType == ActivityTypeDef.DynamicAct then
self.itemPre:GetComponent("RectTransform").sizeDelta = Vector2.New(1080,225)
local vec = self.scrollItem.transform.localPosition