diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua index 852c527645..28d9638302 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonMainPanel.lua @@ -157,6 +157,7 @@ function this:OnSortingOrderChange() cvs:GetComponent("Canvas").sortingOrder = this.sortingOrder + 2 end orginLayer = self.sortingOrder + CheckRedPointStatus(RedPointType.Pokemon_Fetter) end function this.ShowSinglePokemonList(go,singleData,liveIndex) local goParent = go.transform.parent.gameObject diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua index 0b50e2d39b..67eb2a7ac1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/PokemonManager.lua @@ -533,7 +533,8 @@ end --可激活的羁绊 function this.RefreshPokemonFetterRedPoint() - TianShuMiJuanManger.CheckRedPoint(3) + return TianShuMiJuanManger.CheckRedPoint(3) + --TianShuMiJuanManger.CheckFetterStatus(3) end --免费抽卡次数 diff --git a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua index d8f538b5c0..e9554611b1 100644 --- a/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/TianShuMiJuan/TianShuMiJuanMainPanel.lua @@ -57,7 +57,7 @@ function TianShuMiJuanMainPanel:InitComponent() self.scroll = SubUIManager.Open(SubUIConfig.ScrollCycleView,grid.transform,self.fetterItem,nil,Vector2.New(v21.width, v21.height), 1, 2, Vector2.New(30,50)) self.empty = Util.GetGameObject(self.gameObject,"bg/NoneImage") - self.Image = Util.GetGameObject(self.gameObject,"bg/static/Image (1)"):GetComponent("RectTransform") + --self.Image = Util.GetGameObject(self.gameObject,"bg/static/Image (1)"):GetComponent("RectTransform") end function TianShuMiJuanMainPanel.SetTabAdapter(newTab, index, status) @@ -159,7 +159,7 @@ function TianShuMiJuanMainPanel:OnShow() end function TianShuMiJuanMainPanel:RefreshData() - self:ChengeSize() + --self:ChengeSize() self:SortData() self.scroll:ForeachItemGO(function(index,go) go.gameObject:SetActive(false)