From 614ec0b6e1ac39dff6fdcffcabc4046f6fc9c918 Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 22 Mar 2023 10:45:26 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=98=9F=E5=A1=94=E6=8E=92=E8=A1=8C?= =?UTF-8?q?=E6=A6=9C=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Common/functions.lua | 2 +- .../~Lua/Modules/JumpServer/GodsWayListPanel.lua | 7 ++++++- .../~Lua/Modules/Ranking/RankingSingleListPanel.lua | 7 +++++++ .../~Lua/Modules/WorldArena/GodsWayTowerManager.lua | 7 ++++++- 4 files changed, 20 insertions(+), 3 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 47a6461890..c8cd5f84ea 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -2842,7 +2842,7 @@ function CheckFunctionOpen(_funId) return false elseif openRule[1] == 4 and not OperatingManager.IsBuyGift(openRule[2]) then return false - elseif openRule[1] == 5 and GodsWayTowerManager.GetTowerFloorByType(1)>= openRule[2] then + elseif openRule[1] == 5 and GodsWayTowerManager.GetTowerFloorByType(1) < openRule[2] then return false end end diff --git a/Assets/ManagedResources/~Lua/Modules/JumpServer/GodsWayListPanel.lua b/Assets/ManagedResources/~Lua/Modules/JumpServer/GodsWayListPanel.lua index ba15666982..fce55969fe 100644 --- a/Assets/ManagedResources/~Lua/Modules/JumpServer/GodsWayListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/JumpServer/GodsWayListPanel.lua @@ -8,7 +8,6 @@ function GodsWayListPanel:InitComponent() -- 屏幕适配修改 for i = 1, 2 do local item = Util.GetGameObject(self.gameObject, "circle/otherBtn"..i) - LogError("aaaaaaaaaaaaaaaaaaaaaaaaaa") --self.itemList[i]=item table.insert(self.itemList,item) end @@ -74,6 +73,12 @@ function GodsWayListPanel:OnShow(...) if isOpen then UIManager.OpenPanel(UIName.GodsWayTowerPanel,i) self:ClosePanel() + else + if i==1 then + --PopupTipPanel.ShowTip(Language[11330]) + else + PopupTipPanel.ShowTip("需二队塔通关100层后开启") + end end end) diff --git a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua index 92fa794a00..14c93fe9f2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Ranking/RankingSingleListPanel.lua @@ -641,6 +641,13 @@ function this.SetInfoShow(go,data,rankType,Value0) arenaScore:SetActive(true) local score = data.rankInfo.param1 >= 0 and data.rankInfo.param1 or 0 arenaScore:GetComponent("Text").text = "探索杀敌数: ".. score + elseif rankType==RANK_TYPE.GodsWayTower then + trial:SetActive(true) + if Value0 then + Value0:GetComponent("Text").text = ""..data.userName.."" + end + Util.GetGameObject(go,"trial/Text"):SetActive(false) + Util.GetGameObject(go,"trial/tip"):GetComponent("Text").text = Language[11689].. data.rankInfo.param1 end end return RankingSingleListPanel diff --git a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayTowerManager.lua b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayTowerManager.lua index f0a45810cb..21d505d031 100644 --- a/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayTowerManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/WorldArena/GodsWayTowerManager.lua @@ -30,9 +30,14 @@ function this.GetTowerDataByType(_type) if floor<0 then floor=0 end + if floor>=300-10 then + floor=300-10 + end for i = floor+1, floor+10 do local data=this.GetFourMonsterInfoByWave(_type,i) - table.insert(towerList,data) + if data then + table.insert(towerList,data) + end end return towerList end