From a39bc32ef622c671dfaf7e876867c86af8d5dd41 Mon Sep 17 00:00:00 2001 From: jiaoyangna <3046463818@qq.com> Date: Wed, 4 Nov 2020 23:00:32 +0800 Subject: [PATCH] =?UTF-8?q?=E7=81=B5=E5=85=BD=E7=BE=81=E7=BB=8A=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Modules/Pokemon/view/PokemonListPanel_Fetter.lua | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua index bac12f0812..9f430d48d2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua +++ b/Assets/ManagedResources/~Lua/Modules/Pokemon/view/PokemonListPanel_Fetter.lua @@ -36,18 +36,19 @@ end function this.ShowPokemonFetterData() local curGetAllPokemonFetter = PokemonManager.GetAllPokemonFetterDatas() + LogBlue("#羁绊个数:"..#curGetAllPokemonFetter) + for i,v in ipairs(curGetAllPokemonFetter) do + LogGreen("v.id:"..v.id.." v.enabled:"..v.enabled) + end curPokemonSidList = PokemonManager.GetAllPokemonGetDatas() LogGreen("#curPokemonSidList:"..LengthOfTable(curPokemonSidList)) table.sort(curGetAllPokemonFetter, function(a,b) if a.enabled == b.enabled then return a.id < b.id else - return a.enabled > b.enabled + return a.enabled < b.enabled end end) - for k,v in pairs(fetterPreList) do - v.gameObject:SetActive(false) - end this.sv:SetData(curGetAllPokemonFetter, function(dataIndex, go) this.SingleItemDataShow(go,curGetAllPokemonFetter[dataIndex]) table.insert(fetterPreList,go) @@ -157,6 +158,7 @@ function this:OnDestroy() fetterPreList = {} fetterPreItemList = {} fetterPreAddList = {} + this.sv = {} end return this \ No newline at end of file