【修改bug】提交 竞技场 + 试炼奖励优化list重叠
parent
6dda93f175
commit
c945f53946
|
@ -306,8 +306,8 @@ function this.RefreshEnemyData()
|
||||||
table.insert(prefab,node)
|
table.insert(prefab,node)
|
||||||
local lv_name = Util.GetGameObject(node, "name")
|
local lv_name = Util.GetGameObject(node, "name")
|
||||||
local integral = Util.GetGameObject(node, "integralTip")
|
local integral = Util.GetGameObject(node, "integralTip")
|
||||||
Util.GetGameObject(node, "power"):SetActive(false)
|
-- Util.GetGameObject(node, "power"):SetActive(false)
|
||||||
Util.GetGameObject(node, "integral"):SetActive(false)
|
-- Util.GetGameObject(node, "integral"):SetActive(false)
|
||||||
local power = Util.GetGameObject(node, "powerTip")
|
local power = Util.GetGameObject(node, "powerTip")
|
||||||
local headroot = Util.GetGameObject(node, "headroot")
|
local headroot = Util.GetGameObject(node, "headroot")
|
||||||
local bg = Util.GetGameObject(node, "bg")
|
local bg = Util.GetGameObject(node, "bg")
|
||||||
|
|
|
@ -629,7 +629,7 @@ function this.OnConnect(network)
|
||||||
.. "&token=" .. LoginManager.token
|
.. "&token=" .. LoginManager.token
|
||||||
.. "&platform=4"
|
.. "&platform=4"
|
||||||
.. "&sub_channel=" .. LoginRoot_SubChannel
|
.. "&sub_channel=" .. LoginRoot_SubChannel
|
||||||
.. "&admin=d53b3e8ef74bf72d8aafce3a1c8671a0"
|
.. "&admin="--d53b3e8ef74bf72d8aafce3a1c8671a0"
|
||||||
.. "&version=" .. LoginRoot_PackageVersion,
|
.. "&version=" .. LoginRoot_PackageVersion,
|
||||||
this.OnReceiveLogin, nil, nil, nil)
|
this.OnReceiveLogin, nil, nil, nil)
|
||||||
end
|
end
|
||||||
|
|
|
@ -52,14 +52,14 @@ function TrialRewardPopup:OnOpen(...)
|
||||||
end
|
end
|
||||||
|
|
||||||
function TrialRewardPopup:OnShow()
|
function TrialRewardPopup:OnShow()
|
||||||
scrollView=SubUIManager.Open(SubUIConfig.ScrollCycleView,this.scroll.transform,pres[MonsterCampManager.preType], nil,
|
-- 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))
|
-- 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").anchoredPosition= Vector2.New(0,0)
|
||||||
scrollView.gameObject:GetComponent("RectTransform").anchorMin = Vector2.New(0.5, 0.5)
|
-- 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").anchorMax = Vector2.New(0.5, 0.5)
|
||||||
scrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
|
-- scrollView.gameObject:GetComponent("RectTransform").pivot = Vector2.New(0.5, 0.5)
|
||||||
scrollView.moveTween.MomentumAmount = 1
|
-- scrollView.moveTween.MomentumAmount = 1
|
||||||
scrollView.moveTween.Strength = 2
|
-- scrollView.moveTween.Strength = 2
|
||||||
this.RefreshPanel(true,true)
|
this.RefreshPanel(true,true)
|
||||||
sortingOrder = self.sortingOrder
|
sortingOrder = self.sortingOrder
|
||||||
end
|
end
|
||||||
|
@ -90,7 +90,7 @@ function this.RefreshPanel(isTop,isAni)
|
||||||
scrollView:SetData(rewardConfig,function(index,root)
|
scrollView:SetData(rewardConfig,function(index,root)
|
||||||
this.SetScrollPre(root,rewardConfig[index])
|
this.SetScrollPre(root,rewardConfig[index])
|
||||||
end,not isTop,not isAni)
|
end,not isTop,not isAni)
|
||||||
scrollView:SetIndex(1)
|
-- scrollView:SetIndex(1)
|
||||||
end
|
end
|
||||||
|
|
||||||
--设置每条数据
|
--设置每条数据
|
||||||
|
|
Loading…
Reference in New Issue