diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 357df52c3a..cc46b6f328 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2428,7 +2428,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner04_zh", name = Languag [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 = 0,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}, diff --git a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua index 70b80ecad1..d8a19163ae 100644 --- a/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Main/MainPanel.lua @@ -504,7 +504,7 @@ function this:BindEvent() local types = {} local activiteIds = {} for i = 1, #rankKingList do - if rankKingList[i].isRankingMainPanelShow > 0 then + if rankKingList[i].isRankingMainPanelShow == 1 or rankKingList[i].isRankingMainPanelShow == 2 then table.insert(types,rankKingList[i].rankType) table.insert(activiteIds,rankKingList[i].activiteId) end @@ -1684,6 +1684,7 @@ function this.RefreshBattleUpLvTip() end local roleRefreshNum = 0 function this.OnMainPlayerNPCRefresh() + -- Log("roleRefreshNum asd ") if roleRefreshNum < 20 then roleRefreshNum = roleRefreshNum + 1 -- LogRed("roleRefreshNum "..roleRefreshNum) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua index 98edcfb24d..3b59ab7da6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingManager.lua @@ -23,7 +23,7 @@ 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 then isCross = 1 end end @@ -46,7 +46,7 @@ function this.RequestNextWarPowerPageData(fun) --LogGreen(Language[12215]) return end - Log("cur_rankIndex "..cur_rankIndex) + -- Log("cur_rankIndex "..cur_rankIndex) NetManager.RequestRankInfo(cur_rankType, function (msg)--请求数据 this.ReceiveNextRankingData(msg,fun) end,cur_activiteId,cur_rankIndex)