diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index cc46b6f328..b1a8f26fb9 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2410,7 +2410,7 @@ BATTLE_TYPE = { BACK_BATTLE = 1000, -- 系统战斗回放 EndlessMpaFight = 22, -- 无尽副本 } ---_1 本服 _2 跨服 +--_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 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}, @@ -2435,6 +2435,11 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag [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}, + [26] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_DEATHPOS_ALLGUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 26}, + } SoulPrintSpriteByQuantity={ diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua index 35263a028f..18815b96d9 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -23,17 +23,16 @@ function this.InitData(rankType,fun,id,rankIndex) local isCross = 0 for i = 1, #rankKingList do if rankType == rankKingList[i].rankType then - if rankKingList[i].isRankingMainPanelShow >= 2 then + if rankKingList[i].isRankingMainPanelShow == 2 or rankKingList[i].isRankingMainPanelShow == 3 then isCross = 1 end + if rankKingList[i].isRankingMainPanelShow == 4 then--跨服十绝阵判断 + if PlayerManager.isCross == 1 then + isCross = 1 + end + end end end - --跨服十绝阵判断 - -- if cur_rankType == RANK_TYPE.GUILD_DEATHPOS_PERSON or cur_rankType == RANK_TYPE.GUILD_DEATHPOS_GUILD or cur_rankType == RANK_TYPE.GUILD_DEATHPOS_ALLPERSON or cur_rankType == RANK_TYPE.GUILD_DEATHPOS_ALLGUILD then - -- if PlayerManager.isCross == 1 then - -- isCross = 1 - -- end - -- end -- LogYellow("cur_rankType "..cur_rankType.." isCross "..isCross) NetManager.RequestRankInfo(rankType, function (msg)--请求数据 this.ReceiveRankingData(msg,fun) @@ -50,9 +49,14 @@ function this.RequestNextWarPowerPageData(fun) local isCross = 0 for i = 1, #rankKingList do if cur_rankType == rankKingList[i].rankType then - if rankKingList[i].isRankingMainPanelShow >= 2 then + if rankKingList[i].isRankingMainPanelShow == 2 or rankKingList[i].isRankingMainPanelShow == 3 then isCross = 1 end + if rankKingList[i].isRankingMainPanelShow == 4 then + if PlayerManager.isCross == 1 then + isCross = 1 + end + end end end NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据