diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index f6592a26a9..a48383ee60 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -3048,10 +3048,10 @@ BATTLE_TYPE = { } --isRankingMainPanelShow:_1 本服 _2 跨服 3_跨服不显示在排行主界面 4 用于十绝阵特殊判断 --0非跨服界面内排行榜(达人) --本服排行 -rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "星数排行" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,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}, +rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "星数排行" ,rankType = RANK_TYPE.FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 1,sort=2}, + [2] = { bgImage = "r_zjm_paihangbang_banner02_zh", name = Language[12097] ,rankType = RANK_TYPE.FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 2,sort=3}, + [3] = { bgImage = "r_zjm_paihangbang_banner03_zh", name = Language[12098] ,rankType = RANK_TYPE.GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 3,sort=4}, + [4] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = Language[12099] ,rankType = RANK_TYPE.MONSTER_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 4,sort=5}, --达人部分 [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}, @@ -3074,10 +3074,10 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "星 [32] = { bgImage = "", name = "七界试炼排行" ,rankType = RANK_TYPE.QIJIESHILIAN_RANK,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 0},--跨服排行版部分 [33] = { bgImage = "", name = "灵脉秘境排行" ,rankType = RANK_TYPE.LINGMAIMIJING_RANK,activiteId = 0,isRankingMainPanelShow = 3,RankingListMainSortId = 0},--跨服排行版部分 --排行榜按钮中跨服排行 - [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}, + [19] = { bgImage = "r_zjm_paihangbang_banner002_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FORCE_CURR_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 5,sort=6}, + [20] = { bgImage = "r_zjm_paihangbang_banner001_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_MONSTER_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 6,sort = 7}, + [21] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_FIGHTLEVEL_STAR,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 7,sort = 8}, + [22] = { bgImage = "r_zjm_paihangbang_banner003_zh", name = "排行榜" ,rankType = RANK_TYPE.JUMPSERVER_GUILD_FORCE_RANK,activiteId = 0,isRankingMainPanelShow= 2,RankingListMainSortId = 8,sort =9}, --未分组前显示本服--分组后全服的 [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}, @@ -3092,7 +3092,7 @@ rankKingList={ [1] = { bgImage = "r_zjm_paihangbang_banner004_zh", name = "星 [35] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_SINGLE,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [36] = { bgImage = "", name = "" ,rankType = RANK_TYPE.GUILD_CAR_DELEAY_GUILD,activiteId = 0,isRankingMainPanelShow = 4,RankingListMainSortId = 0}, [37] = { bgImage = "", name = "探索排行" ,rankType = RANK_TYPE.ExploreRank,activiteId = 0,isRankingMainPanelShow = false}, - [38] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 9}, + [38] = { bgImage = "r_zjm_paihangbang_banner01_zh", name = Language[12096] ,rankType = RANK_TYPE.FIGHT_LEVEL_RANK,activiteId = 0,isRankingMainPanelShow = 1,RankingListMainSortId = 9,sort = 1}, [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}, diff --git a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua index 6a15ba0df6..fadd1d2998 100644 --- a/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/ActivityGift/OpenSeverWelfarePanel.lua @@ -90,11 +90,13 @@ function this.OnShowPanelData(isTop,isAni) local missions={} local first={} for i = 1, #activityData.mission do - if activityData.mission[i].missionId==20016 then + local missionId=activityData.mission[i].missionId + if activityRewardConfig[missionId] and activityRewardConfig[missionId].Sort==1 then first=activityData.mission[i] else table.insert(missions,activityData.mission[i]) end + end ActivityGiftManager.OpenSeverWelfareRewardTabsSort(missions) this.ScrollView:SetData(missions, function (index, go) diff --git a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua index 75254da649..09f9c4eed1 100644 --- a/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Fight/FightPointPassMainPanel.lua @@ -1772,10 +1772,12 @@ function this.UpdateOpenSeverWelfare() if activityId and activityId > 0 and activityData and #activityData.mission > 0 then --ActivityGiftManager.OpenSeverWelfareRewardTabsSort(activityData.mission) local curMissionConfig = nil + local maxConfig=nil local isShowRed = false for i = 1, #activityData.mission do + local id=activityData.mission[i].missionId if activityData.mission[i].state == 0 and not curMissionConfig then - curMissionConfig = activityRewardConfig[activityData.mission[i].missionId] + curMissionConfig = activityRewardConfig[id] --LogError("activityData.mission[i].missionId=="..activityData.mission[i].missionId) -- local value = curMissionConfig.Values[2][1] -- local isPass = FightPointPassManager.IsFightPointPass2(value) @@ -1786,11 +1788,14 @@ function this.UpdateOpenSeverWelfare() if activityData.mission[i].state == 1 then isShowRed = true end + if activityRewardConfig[id].Sort==1 then + maxConfig=activityRewardConfig[id] + end end local isAll=false if not curMissionConfig then isAll=true - curMissionConfig = activityRewardConfig[20016] + curMissionConfig = maxConfig end if activityData and activityData.mission then this.btnOpenSeverWelfare:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua index f985698244..b6a49d1573 100644 --- a/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua +++ b/Assets/ManagedResources/~Lua/Modules/NewShenZun/ActivityChongRank.lua @@ -338,7 +338,7 @@ function this.UpdateRankInfo(go,data) Util.GetGameObject(go,"warPower/Text"):GetComponent("Text").text = data.rankInfo.param1 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) + infoTxt.text=string.format("第%s关",data.rankInfo.param1) --GetLanguageStrById(ConfigManager.GetConfigData(ConfigName.MainLevelConfig,data.rankInfo.param1).Name) elseif rankType==RANK_TYPE.MONSTER_RANK or rankType==RANK_TYPE.Demons_chong then --心魔试炼 infoTxt.gameObject:SetActive(true) infoTxt.text=Language[11689].. data.rankInfo.param1 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua index 5a283136ae..e325c53f15 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/PlayerManager.lua @@ -236,7 +236,7 @@ end function this.BcakUpdateUserExp(_msg) if not UIManager.IsOpen(UIName.FightMopUpEndPanel) then - Log("后端更新玩家等级 和 经验 ".._msg.level.." ".._msg.exp) + LogError("后端更新玩家等级 和 经验 ".._msg.level.." ".._msg.exp) this.exp = _msg.exp local oldLevel = this.level @@ -277,7 +277,7 @@ function this.BcakUpdateUserExp(_msg) end --跟具经验进行升级 function this.PromoteLevel(exp) - --Log("增加经验值 " .. exp) + LogError("增加经验值 " .. exp) local maxPlayerLv = GameDataBase.SheetBase.GetKeys(this.userLevelData) this.exp = this.exp + exp while this.exp >= this.userLevelData[this.level].Exp and this.level < #maxPlayerLv do diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/SmallSoldierFailPop.lua b/Assets/ManagedResources/~Lua/Modules/Popup/SmallSoldierFailPop.lua index c0ef496d8d..d22e5f240a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/SmallSoldierFailPop.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/SmallSoldierFailPop.lua @@ -56,7 +56,7 @@ function SmallSoldierFailPop:OnOpen(battlePanel, showRecord, backPanel,_fightTyp fightType = _fightType end - this.btnGrowUp:SetActive(false) + this.btnGrowUp:SetActive(true) end diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua index 27ffe9a09a..f6f5c8a90c 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingListMainPanel.lua @@ -122,6 +122,10 @@ function this.SwitchView(index) table.insert(currankKingList, rankKingList[i]) end end + table.sort(currankKingList,function(a,b) + return a.sort