From 1f2a21a5878eb3a7b14638d4a56cfbede3845854 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Mon, 30 Aug 2021 16:24:30 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A8=E8=8D=90=E5=B7=A5=E4=BC=9A?= =?UTF-8?q?=E3=80=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua | 6 +++--- Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua index 8d80b78ad1..ef2a4b0998 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua @@ -48,7 +48,7 @@ function GuildFindPopup:BindEvent() local name = this.input.text if name == "" then this.input.text = "" - this.RefreshRecommandList() + this.RefreshRecommandList(true,true) PopupTipPanel.ShowTip(Language[10879]) return end @@ -175,10 +175,10 @@ function this.CloseSelf() end -- 刷新推荐列表 -function this.RefreshRecommandList() +function this.RefreshRecommandList(isTop,isAnim) GuildManager.RecommandGuildList = {} GuildManager.RequestRecommandGuildList(this.curPage,function() - this.SetListType(1) + this.SetListType(1,isTop,isAnim) end) end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua index 6d72d48abf..8274b5783c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua @@ -11,11 +11,17 @@ end -- 请求推荐公会列表 function GuildManager.RequestRecommandGuildList(page,func) + this.RecommandGuildList = {} NetManager.RequestRecommandGuild(page,function(msg) local len = #this.RecommandGuildList for i, info in ipairs(msg.familyRecomandInfo) do this.RecommandGuildList[len+i] = info end + if #msg.familyRecomandInfo < 10 then + this.MaxNumber = true + else + this.MaxNumber = false + end if func then func() end end) end