From 12c2fd7316b26b62af76fb5b4d68c21c666ace2b Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Fri, 27 Aug 2021 15:59:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8E=A8=E8=8D=90=E5=85=AC=E4=BC=9A?= =?UTF-8?q?=E3=80=91=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 12 ++++++--- .../~Lua/Message/Family_pb.lua | 20 +++++++++++++++ .../~Lua/Modules/Guild/GuildFindPopup.lua | 13 +++++++--- .../~Lua/Modules/Guild/GuildManager.lua | 25 ++++++++++++++++--- .../~Lua/Modules/Net/NetManager.lua | 7 ++++-- 5 files changed, 65 insertions(+), 12 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f10a6e40aa..3260f6e4fc 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2411,11 +2411,13 @@ BATTLE_TYPE = { BACK_BATTLE = 1000, -- 系统战斗回放 EndlessMpaFight = 22, -- 无尽副本 } ---_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 +--isRankingMainPanelShow:_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 --0非跨服界面内排行榜(达人) + --本服排行 rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 1}, [2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 2}, [3] = { bgImage = "r_zjm_paihangbang_banner03_zh", name = Language[12098] ,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 3}, [4] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = Language[12099] ,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 4}, + --达人部分 [5] = { bgImage = "", name = Language[12100] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.GoldExper,isRankingMainPanelShow = 0,RankingListMainSortId = 9}, [6] = { bgImage = "", name = Language[12101] ,rankType = RANK_TYPE.ARENA_RANK,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 10}, [7] = { bgImage = "", name = Language[12102] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.FastExplore,isRankingMainPanelShow = 0,RankingListMainSortId = 11}, @@ -2426,16 +2428,18 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag [12] = { bgImage = "", name = Language[12106] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.slhjExper,isRankingMainPanelShow = 0,RankingListMainSortId = 15}, [13] = { bgImage = "", name = Language[11007] ,rankType = RANK_TYPE.GOLD_EXPER,activiteId = ActivityTypeDef.Celebration,isRankingMainPanelShow = 0,RankingListMainSortId = 16}, [14] = { bgImage = "", name = Language[11006] ,rankType = RANK_TYPE.CELEBRATION_GUILD,activiteId = ActivityTypeDef.Celebration,isRankingMainPanelShow = 0,RankingListMainSortId = 17}, + --山河社稷图部分 [15] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_PROGRESS,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 18}, [16] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = 0,RankingListMainSortId = 19}, [17] = { bgImage = "", name = "排行榜" ,rankType = RANK_TYPE.TASUILINGXIAO,activiteId = ActivityTypeDef.TaSuiLingXiao,isRankingMainPanelShow = 0,RankingListMainSortId = 20}, - [18] = { bgImage = "", name = "罗浮争锋排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 21}, - + --跨服(界面中) + [18] = { bgImage = "", name = "罗浮争锋排行" ,rankType = RANK_TYPE.JUMPSERVER_HIGHTLADDER,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 21},--跨服排行版部分 + --排行榜按钮中跨服排行 [19] = { bgImage = "r_zjm_paihangbang_banner002_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 5}, [20] = { bgImage = "r_zjm_paihangbang_banner001_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_MONSTER_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 6}, [21] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 7}, [22] = { bgImage = "r_zjm_paihangbang_banner003_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 8}, - + --未分组前显示本服--分组后全服的 [23] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_PERSON,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 23}, [24] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 24}, [25] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLPERSON,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 25}, diff --git a/Assets/ManagedResources/~Lua/Message/Family_pb.lua b/Assets/ManagedResources/~Lua/Message/Family_pb.lua index 253fdbe43b..4c8ff7a7f9 100644 --- a/Assets/ManagedResources/~Lua/Message/Family_pb.lua +++ b/Assets/ManagedResources/~Lua/Message/Family_pb.lua @@ -107,6 +107,8 @@ FAMILYJOINREQUEST = protobuf.Descriptor(); FAMILYJOINREQUEST_FAMILYID_FIELD = protobuf.FieldDescriptor(); FAMILYJOINRESPONSE = protobuf.Descriptor(); FAMILYJOINRESPONSE_FAMILYJOININDICAION_FIELD = protobuf.FieldDescriptor(); +FAMILYRECOMMANDREQUEST = protobuf.Descriptor(); +FAMILYRECOMMANDREQUEST_PAGE_FIELD = protobuf.FieldDescriptor(); FAMILYRECOMMANDRESPONSE = protobuf.Descriptor(); FAMILYRECOMMANDRESPONSE_FAMILYRECOMANDINFO_FIELD = protobuf.FieldDescriptor(); GETFAMILYMEMBERINFORESPONSE = protobuf.Descriptor(); @@ -1355,6 +1357,23 @@ FAMILYJOINRESPONSE.enum_types = {} FAMILYJOINRESPONSE.fields = {FAMILYJOINRESPONSE_FAMILYJOININDICAION_FIELD} FAMILYJOINRESPONSE.is_extendable = false FAMILYJOINRESPONSE.extensions = {} +FAMILYRECOMMANDREQUEST_PAGE_FIELD.name = "page" +FAMILYRECOMMANDREQUEST_PAGE_FIELD.full_name = ".rpc.protocols.FamilyRecommandRequest.page" +FAMILYRECOMMANDREQUEST_PAGE_FIELD.number = 1 +FAMILYRECOMMANDREQUEST_PAGE_FIELD.index = 0 +FAMILYRECOMMANDREQUEST_PAGE_FIELD.label = 1 +FAMILYRECOMMANDREQUEST_PAGE_FIELD.has_default_value = false +FAMILYRECOMMANDREQUEST_PAGE_FIELD.default_value = 0 +FAMILYRECOMMANDREQUEST_PAGE_FIELD.type = 5 +FAMILYRECOMMANDREQUEST_PAGE_FIELD.cpp_type = 1 + +FAMILYRECOMMANDREQUEST.name = "FamilyRecommandRequest" +FAMILYRECOMMANDREQUEST.full_name = ".rpc.protocols.FamilyRecommandRequest" +FAMILYRECOMMANDREQUEST.nested_types = {} +FAMILYRECOMMANDREQUEST.enum_types = {} +FAMILYRECOMMANDREQUEST.fields = {FAMILYRECOMMANDREQUEST_PAGE_FIELD} +FAMILYRECOMMANDREQUEST.is_extendable = false +FAMILYRECOMMANDREQUEST.extensions = {} FAMILYRECOMMANDRESPONSE_FAMILYRECOMANDINFO_FIELD.name = "familyRecomandInfo" FAMILYRECOMMANDRESPONSE_FAMILYRECOMANDINFO_FIELD.full_name = ".rpc.protocols.FamilyRecommandResponse.familyRecomandInfo" FAMILYRECOMMANDRESPONSE_FAMILYRECOMANDINFO_FIELD.number = 1 @@ -3790,6 +3809,7 @@ FamilyOperationApplyRequest = protobuf.Message(FAMILYOPERATIONAPPLYREQUEST) FamilyPositionUpdateIndication = protobuf.Message(FAMILYPOSITIONUPDATEINDICATION) FamilyQuickDefendRequest = protobuf.Message(FAMILYQUICKDEFENDREQUEST) FamilyRecomandInfo = protobuf.Message(FAMILYRECOMANDINFO) +FamilyRecommandRequest = protobuf.Message(FAMILYRECOMMANDREQUEST) FamilyRecommandResponse = protobuf.Message(FAMILYRECOMMANDRESPONSE) FamilySeachResponse = protobuf.Message(FAMILYSEACHRESPONSE) FamilySearchReqeust = protobuf.Message(FAMILYSEARCHREQEUST) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua index 60689f4f4b..0e5daa5518 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildFindPopup.lua @@ -158,6 +158,7 @@ end function GuildFindPopup:OnOpen(...) this._ListType = nil -- 刷新推荐列表 + this.curPage = 1 this.RefreshRecommandList() -- 控制挂机界面伤害文字显示 @@ -175,7 +176,7 @@ end -- 刷新推荐列表 function this.RefreshRecommandList() - GuildManager.RequestRecommandGuildList(function() + GuildManager.RequestRecommandGuildList(this.curPage,function() this.SetListType(1) end) end @@ -264,7 +265,7 @@ function this.JoinGuildSuccess() end -- 设置数据类型 -function this.SetListType(type) +function this.SetListType(type,isTop,isAnim) this._ListType = type local datalist = {} if this._ListType == 1 then @@ -279,7 +280,13 @@ function this.SetListType(type) -- 刷新列表显示 this.ScrollView:SetData(datalist, function(index, go) this.GuildItemAdapter(go, datalist[index]) - end) + if not GuildManager.MaxNumber and index == #datalist then + this.curPage = this.curPage + 1 + GuildManager.GetNextRecommendFamily(this.curPage,function () + this.SetListType(1,true,true) + end) + end + end,isTop,isAnim) end diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua index 4af8afa373..6d72d48abf 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/GuildManager.lua @@ -3,15 +3,19 @@ local this = GuildManager this.RecommandGuildList = {} this.SearchGuildList = {} +this.MaxNumber = false function GuildManager.Initialize() end -- 请求推荐公会列表 -function GuildManager.RequestRecommandGuildList(func) - NetManager.RequestRecommandGuild(function(msg) - this.RecommandGuildList = msg.familyRecomandInfo +function GuildManager.RequestRecommandGuildList(page,func) + NetManager.RequestRecommandGuild(page,function(msg) + local len = #this.RecommandGuildList + for i, info in ipairs(msg.familyRecomandInfo) do + this.RecommandGuildList[len+i] = info + end if func then func() end end) end @@ -210,4 +214,19 @@ function this.RefreshGuildAllRedState() CheckRedPointStatus(RedPointType.Guild_Shop) end + +function this.GetNextRecommendFamily(page,func) + if this.MaxNumber then return end + 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 + end + if func then func() end + end) +end + return GuildManager \ No newline at end of file diff --git a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua index 518387d86c..be7bf15906 100644 --- a/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Net/NetManager.lua @@ -2339,8 +2339,11 @@ function this.RequestCreateGuild(name, announce, func) end -- 请求推荐公会列表 -function this.RequestRecommandGuild(func) - Network:SendMessageWithCallBack(MessageTypeProto_pb.FAMILY_RECOMEND_REQUEST, MessageTypeProto_pb.FAMILY_RECOMEND_RESPONSE, nil, function(buffer) +function this.RequestRecommandGuild(page,func) + local data = Family_pb.FamilyRecommandRequest() + data.page = page + local msg = data:SerializeToString() + Network:SendMessageWithCallBack(MessageTypeProto_pb.FAMILY_RECOMEND_REQUEST, MessageTypeProto_pb.FAMILY_RECOMEND_RESPONSE, msg, function(buffer) local data = buffer:DataByte() local msg = Family_pb.FamilyRecommandResponse() msg:ParseFromString(data)