diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 079ddbd84c..0c9ab50369 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1075,6 +1075,7 @@ JumpType = { JumpServerHightLadder = 82,--灵兽山 HongMengZhen = 86,-- 鸿蒙阵 FightLevel = 107,-- 山河社稷图 + QiJieShiLian = 112,--七界试炼 BuyVigor = 10000, --体力购买 BuyGold = 10001, --金币购买 @@ -1114,7 +1115,6 @@ JumpType = { firstRecharge = 30001, ZhiZunJiangShi = 30002, SurpriseBox = 40001,--惊喜礼盒 - QiJieShiLian = 40026,--七界试炼 linglongShangShi = 20005, } @@ -1210,10 +1210,10 @@ FORMATION_TYPE = { XUANYUAN_MIRROR=20, GUILD_TRANSCRIPT=21, FIGHTLEVEL=22, - FOUR_ELEMENT = 24, JUMPSERVER_HIGHTLADDER=23,--跨服 - WORLDARENA=24,--玉虚论道（3队） - QIJIESHILIAN=25,--七界试炼编队 + FOUR_ELEMENT = 24, + WORLDARENA=25,--玉虚论道（3队） + QIJIESHILIAN=26,--七界试炼编队 } --活动Type定义 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 8cd759a1ae..e968f8effd 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -571,7 +571,8 @@ function this.OnClickTabBtn(_proId, isTop,isAni) end this.empty:SetActive(#heros<=0) this.SetRoleList(heros, isTop,isAni) - if panelType == FORMATION_TYPE.FOUR_ELEMENT then + + if this.opView.SetCampIconByCurType then this.opView.SetCampIconByCurType(tabs,this.selectBtn) else for i = 0 , #tabs do @@ -588,7 +589,7 @@ end --设置英雄列表数据 function this.SetRoleList(_roleDatas, isTop,isAni) - if panelType == FORMATION_TYPE.FOUR_ELEMENT then + if this.opView.SortHeroDatas then this.opView.SortHeroDatas(_roleDatas) else this.SortHeroDatas(_roleDatas) diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua index 62887b16fb..462d532b0f 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/GeneralTreasurePanel.lua @@ -105,15 +105,33 @@ function GeneralTreasurePanel:showTaskList(isTop,isAni) end,not isTop,not isAni) --4 未达成 3 可再次领取 2 可领取 1 已领取 -1 完美领取（充钱领取过的） --定位打开界面时位置 - local t = 0 - local State = self.treasureData.treasureState == 0 and 2 or 3 - for i = 1, #self.treasureData.dataList do - if self.treasureData.dataList[i].State == State or self.treasureData.dataList[i].State == 4 then - t = i - break + -- if isTop then + local t = 0 + if self.treasureData.treasureState == 0 then + for i = 1, #self.treasureData.dataList do + if self.treasureData.dataList[i].State == 2 then + t = i + break + end + end + else + for i = 1, #self.treasureData.dataList do + if self.treasureData.dataList[i].State == 2 or self.treasureData.dataList[i].State == 3 then + t = i + break + end + end end - end - self.ScrollView:SetIndex(t-1) + if t == 0 then + for i = 1, #self.treasureData.dataList do + if self.treasureData.dataList[i].State == 4 then + t = i + break + end + end + end + self.ScrollView:SetIndex(t-1) + -- end end --单个任务 diff --git a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua index ea08680fbf..af8fc78464 100644 --- a/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua +++ b/Assets/ManagedResources/~Lua/Modules/GeneralPanel/View/GeneralBigPopup_QiJieTreasure.lua @@ -96,7 +96,7 @@ end function QiJieTreasure:Refresh(_tabNum) self.dataList = QiJieShiLianManager.FormatTreasureData(_tabNum) - self.treasureNum.text = string.format( "%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList) + self.treasureNum.text = string.format( "解锁遗物：%s/%s",#QiJieShiLianManager.treasureActiveList,#QiJieShiLianManager.treasureList) self.ScrollView:SetData(self.dataList, function(index, go) self:SetSingleData(index,go,self.dataList[index]) end) diff --git a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua index 4e2b013d6a..fc70ad63f5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Popup/View/GeneralPopup_HeavenUnlockExtraRewardPanel.lua @@ -290,13 +290,13 @@ function this:AddListener() end function this:RemoveListener() - Game.GlobalEvent:AddEvent(GameEvent.QiJieShiLian.CloseBuyTreasure, self.CheckClose,self) + Game.GlobalEvent:RemoveEvent(GameEvent.QiJieShiLian.CloseBuyTreasure, self.CheckClose,self) end --界面关闭时调用（用于子类重写） function this:CheckClose() if curType == 4 then - this:ClosePanel() + parent:ClosePanel() end end diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua index bab99484a5..79b90ad95d 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianManager.lua @@ -153,7 +153,9 @@ end function this.MixTreasureServerAndLocalData(msg) this.treasureActiveList = {} for i = 1, #msg.info do - table.insert(this.treasureActiveList,msg.info[i].id) + if msg.info[i].status == 1 then + table.insert(this.treasureActiveList,msg.info[i].id) + end if this.treasureList[msg.info[i].id] then this.treasureList[msg.info[i].id].state = msg.info[i].status else @@ -202,22 +204,25 @@ function this.GetBattleResult() local config = QijieStage[this.curLevelId] local data = {} data[1] = "阵容加成: "..(#this.battleResult.teamBuffIds)*(config.ConditionValue[1][2]/100).."%\n("..#this.battleResult.teamBuffIds.."条)" - data[2] = "遗物加成: "..(#this.battleResult.relicIds*10).."%\n("..#this.battleResult.relicIds.."个)" - local bonue = config.RoundReward[1][2] - for i = 1, #config.RoundReward do - if this.battleResult.round > config.RoundReward[i][1] then + data[2] = "遗物加成: "..(this.GetBttleResultRelicdsAddition(this.battleResult.relicIds)).."%\n("..#this.battleResult.relicIds.."个)" + local bonue = 0 + for i = #config.RoundReward, 1, -1 do + if this.battleResult.round <= config.RoundReward[i][1] then bonue = config.RoundReward[i][2] - if config.RoundReward[i+1] then - bonue = config.RoundReward[i][2] - else - bonue = 0 - end end end data[3] = "回合加成: "..(bonue/100).."%\n("..this.battleResult.round.."回合)" return data end +function this.GetBttleResultRelicdsAddition(treasureList) + local num = 0 + for i = 1, #treasureList do + num = num + QijieHolyConfig[treasureList[i]].Addition + end + return num/100 +end + --获取遗物效果 function this.GetTreasureEffect(treasureList) local moneyString = "" @@ -276,13 +281,13 @@ function this.GetSring(stringList,type) local str = "" for k,v in pairs(stringList) do -- LogPink("Desc1:"..tostring(v.title)) - str = str..v.title for m,n in pairs(v) do if tonumber(m) then + str = str..v.title -- LogBlue("m2:"..tostring(tonumber(m))) -- LogBlue("Desc2:"..tostring(n.Desc)) -- LogBlue("Value2:"..tostring(n.Value)) - str = str..string.format(n.Desc,""..n.Value.."%") + str = str..string.format(n.Desc,n.Value.."%") if type and type == 1 then str = str.."\n" end diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index d03473b138..c7cc056453 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -313,7 +313,7 @@ function this.SetHeadsInfo(data,root,index,name,level) elseif sData.rankType == RANK_TYPE.WORLDARENA then--玉虚论道 UIManager.OpenPanel(UIName.WorldArenaOtherTeamPanel, data.uid,2) elseif sData.rankType == RANK_TYPE.QIJIESHILIAN_RANK then--七界试炼 - UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.QIJIESHILIAN,data.serverName and data.serverName or nil) + UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid,PLAYER_INFO_VIEW_TYPE.NORMAL,data.serverName and data.serverName or nil) else UIManager.OpenPanel(UIName.PlayerInfoPopup, data.uid) end