diff --git a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua index a700ef49e7..aacccbc613 100644 --- a/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Arena/View/ArenaView.lua @@ -306,8 +306,8 @@ function this.RefreshEnemyData() table.insert(prefab,node) local lv_name = Util.GetGameObject(node, "name") local integral = Util.GetGameObject(node, "integralTip") - Util.GetGameObject(node, "power"):SetActive(false) - Util.GetGameObject(node, "integral"):SetActive(false) + -- Util.GetGameObject(node, "power"):SetActive(false) + -- Util.GetGameObject(node, "integral"):SetActive(false) local power = Util.GetGameObject(node, "powerTip") local headroot = Util.GetGameObject(node, "headroot") local bg = Util.GetGameObject(node, "bg") diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index cff8c1f72a..156bb8b5f3 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -629,7 +629,7 @@ function this.OnConnect(network) .. "&token=" .. LoginManager.token .. "&platform=4" .. "&sub_channel=" .. LoginRoot_SubChannel - .. "&admin=d53b3e8ef74bf72d8aafce3a1c8671a0" + .. "&admin="--d53b3e8ef74bf72d8aafce3a1c8671a0" .. "&version=" .. LoginRoot_PackageVersion, this.OnReceiveLogin, nil, nil, nil) end diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua index fe9922db9a..6dade328bf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/TrialRewardPopup.lua @@ -52,14 +52,14 @@ 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 + -- 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 @@ -90,7 +90,7 @@ function this.RefreshPanel(isTop,isAni) scrollView:SetData(rewardConfig,function(index,root) this.SetScrollPre(root,rewardConfig[index]) end,not isTop,not isAni) - scrollView:SetIndex(1) + -- scrollView:SetIndex(1) end --设置每条数据