From 076df36a1dc8d13a8a5d6648971d20b7b50f1e1e Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Thu, 10 Nov 2022 18:31:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E6=9C=8D=E5=86=B2=E6=A6=9C=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Common/GlobalDefine.lua | 15 +++++++++- .../Modules/NewShenZun/ActivityChongRank.lua | 28 ++++++++++++------- 2 files changed, 32 insertions(+), 11 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 9803bc4bd0..6fb436561e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -2404,6 +2404,13 @@ RANK_TYPE = { UpStar =101, --升星排行榜 EquipRank =102, --装备排行榜 SoulSign =103, --魂印排行榜 + UpStar2 =100101, --升星排行榜(冲榜) + EquipRank2 =100102, --装备排行榜(冲榜) + SoulSign2 =100103, --魂印排行榜(冲榜) + Level_chong=1003, --关卡排行榜(冲榜) + FightValue_chong=10022,--战力排行榜(冲榜) + Demons_chong=1004,--心魔排行榜(冲榜) + ShanHe_chong=10030,--山河排行榜(冲榜) } --东海寻仙弹窗类型 @@ -2908,7 +2915,13 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "星 [39] = { bgImage = "", name = "升星排行" ,rankType = RANK_TYPE.UpStar,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [40] = { bgImage = "", name = "装备排行" ,rankType = RANK_TYPE.EquipRank,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [41] = { bgImage = "", name = "魂印排行" ,rankType = RANK_TYPE.SoulSign,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, - + [42] = { bgImage = "", name = "升星排行" ,rankType = RANK_TYPE.UpStar2,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, + [43] = { bgImage = "", name = "装备排行" ,rankType = RANK_TYPE.EquipRank2,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, + [44] = { bgImage = "", name = "魂印排行" ,rankType = RANK_TYPE.SoulSign2,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, + [45] = { bgImage = "", name = "关卡冲榜" ,rankType = RANK_TYPE.Level_chong,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, + [46] = { bgImage = "", name = "战力冲榜" ,rankType = RANK_TYPE.FightValue_chong,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, + [47] = { bgImage = "", name = "心魔冲榜" ,rankType = RANK_TYPE.Demons_chong,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, + [48] = { bgImage = "", name = "山河冲榜" ,rankType = RANK_TYPE.ShanHe_chong,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, } diff --git a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua index 666d569420..62ff39a830 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua @@ -70,13 +70,12 @@ local qaId=0 function this:OnShow() PlayerPrefs.SetInt(PlayerManager.uid.."kaifuchongbang",1) end - +local state=0 function this.TabBtnOnClick(config,btn) local time=0 local openTime=this.actData.startTime+config.OpenTime local closeTime=this.actData.startTime+config.CloseTime - local state=0 if openTime>GetTimeStamp() then --活动未开启 time =openTime - GetTimeStamp() state=1 @@ -135,8 +134,17 @@ end function this.ChangeWindow(config) this.titleImg.sprite=this.spLoader:LoadSprite(config.Icon) curConfig=config - RankingManager.InitData(config.RankType,function() + if state==3 then + rankType=config.BackRankType + else rankType=config.RankType + end + RankingManager.InitData(rankType,function() + if state==3 then + rankType=config.BackRankType + else + rankType=config.RankType + end LogError("ranktype=="..rankType) local ranks,myRank = RankingManager.GetRankingInfo() ownRank=myRank.rank @@ -311,27 +319,27 @@ function this.UpdateRankInfo(go,data) _PlayerHeadList[go]:SetScale(Vector3.one*0.7) _PlayerHeadList[go]:SetLayer(this.sortingOrder) _PlayerHeadList[go]:SetEffectScale(0.75) - if rankType==RANK_TYPE.FORCE_CURR_RANK then --战力排行 + if rankType==RANK_TYPE.FORCE_CURR_RANK or rankType==RANK_TYPE.FightValue_chong then --战力排行 warPower:SetActive(true) Util.GetGameObject(go,"warPower/Text"):SetActive(true) Util.GetGameObject(go,"warPower/Text"):GetComponent("Text").text = data.rankInfo.param1 - elseif rankType==RANK_TYPE.FIGHT_LEVEL_RANK then --关卡排行 + elseif rankType==RANK_TYPE.FIGHT_LEVEL_RANK or rankType==RANK_TYPE.Level_chong then --关卡排行 infoTxt.gameObject:SetActive(true) infoTxt.text=GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,data.rankInfo.param1).Name) - elseif rankType==RANK_TYPE.MONSTER_RANK then --心魔试炼 + elseif rankType==RANK_TYPE.MONSTER_RANK or rankType==RANK_TYPE.Demons_chong then --心魔试炼 infoTxt.gameObject:SetActive(true) infoTxt.text=Language[11689].. data.rankInfo.param1 - elseif rankType==RANK_TYPE.FIGHTLEVEL_STAR then --山河社稷图 升星排行 + elseif rankType==RANK_TYPE.FIGHTLEVEL_STAR or rankType==RANK_TYPE.ShanHe_chong then --山河社稷图 升星排行 starImg:SetActive(true) infoTxt.gameObject:SetActive(true) infoTxt.text= data.rankInfo.param1 - elseif rankType==RANK_TYPE.EquipRank then + elseif rankType==RANK_TYPE.EquipRank or rankType==RANK_TYPE.EquipRank2 then infoTxt.gameObject:SetActive(true) infoTxt.text="装备:"..data.rankInfo.param1 - elseif rankType==RANK_TYPE.SoulSign then + elseif rankType==RANK_TYPE.SoulSign or rankType==RANK_TYPE.SoulSign2 then infoTxt.gameObject:SetActive(true) infoTxt.text="魂印:"..data.rankInfo.param1 - elseif rankType==RANK_TYPE.UpStar then + elseif rankType==RANK_TYPE.UpStar or rankType==RANK_TYPE.UpStar2 then infoTxt.gameObject:SetActive(true) infoTxt.text="英雄:"..data.rankInfo.param1 end