Merge branch 'xma/dev' of http://60.1.1.230/gaoxin/JL_Client into xma/dev
commit
1acfbabcde
File diff suppressed because it is too large
Load Diff
|
|
@ -1597,7 +1597,7 @@ RectTransform:
|
|||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -218}
|
||||
m_SizeDelta: {x: 800, y: 802}
|
||||
m_SizeDelta: {x: 852, y: 802}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5023145414514262656
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ function this:InitComponent(gameObject)
|
|||
local rootHight = this.Scroll.transform.rect.height
|
||||
local width = this.Scroll.transform.rect.width
|
||||
this.ScrollView = SubUIManager.Open(SubUIConfig.ScrollCycleView, this.Scroll.transform,
|
||||
this.itemPre, nil, Vector2.New(width, rootHight), 1, 2, Vector2.New(0, 0))
|
||||
this.itemPre, nil, Vector2.New(860, rootHight), 1, 2, Vector2.New(0, 0))
|
||||
this.ScrollView.moveTween.MomentumAmount = 1
|
||||
this.ScrollView.moveTween.Strength = 2
|
||||
end
|
||||
|
|
|
|||
|
|
@ -16,6 +16,15 @@ function TrialRewardPopup:InitComponent()
|
|||
this.scroll=Util.GetGameObject(this.panel,"Scroll")
|
||||
pres[1]=Util.GetGameObject(this.panel,"Scroll/Pre")
|
||||
pres[2]=Util.GetGameObject(this.panel,"Scroll/Pre3")
|
||||
|
||||
scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll.transform,pres[MonsterCampManager.preType], nil,
|
||||
Vector2.New(this.scroll.transform.rect.width,this.scroll.transform.rect.height),1,1,Vector2.New(0,5))
|
||||
scrollView.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0)
|
||||
scrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5)
|
||||
scrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)
|
||||
scrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
|
||||
scrollView.moveTween.MomentumAmount = 1
|
||||
scrollView.moveTween.Strength = 2
|
||||
end
|
||||
|
||||
function TrialRewardPopup:BindEvent()
|
||||
|
|
@ -43,26 +52,17 @@ function TrialRewardPopup:OnOpen(...)
|
|||
end
|
||||
|
||||
function TrialRewardPopup:OnShow()
|
||||
scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll.transform,pres[MonsterCampManager.preType], nil,
|
||||
Vector2.New(this.scroll.transform.rect.width,this.scroll.transform.rect.height),1,1,Vector2.New(0,5))
|
||||
scrollView.gameObject:GetComponent("RectTransform").anchoredPosition= Vector2.New(0,0)
|
||||
scrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5)
|
||||
scrollView.gameObject:GetComponent("RectTransform").anchorMax = Vector2.New(0.5, 0.5)
|
||||
scrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
|
||||
scrollView.moveTween.MomentumAmount = 1
|
||||
scrollView.moveTween.Strength = 2
|
||||
this.RefreshPanel(true,true)
|
||||
sortingOrder = self.sortingOrder
|
||||
end
|
||||
|
||||
function TrialRewardPopup:OnClose()
|
||||
--GameObject.DestroyImmediate(scrollView.gameObject)
|
||||
SubUIManager.Close(scrollView)
|
||||
itemList = {}
|
||||
end
|
||||
|
||||
function TrialRewardPopup:OnDestroy()
|
||||
scrollView=nil
|
||||
itemList = {}
|
||||
end
|
||||
|
||||
--0 已经领取,1 可领取,2不能领取·
|
||||
|
|
|
|||
Loading…
Reference in New Issue