From 5a2d599145865944ec22df659da465bfdff368e2 Mon Sep 17 00:00:00 2001 From: "DESKTOP-RH64908\\Administrator" Date: Wed, 28 Jan 2026 14:01:46 +0800 Subject: [PATCH] 1 --- .../~Lua/Common/GlobalDefine.lua | 2 ++ .../~Lua/Modules/Player/JumpManager.lua | 20 +++++++++++++++++++ .../ManagedResources/~Lua/View/ItemView.lua | 4 ++-- 3 files changed, 24 insertions(+), 2 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 3ac8283687..5e552a932e 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -1287,6 +1287,8 @@ JumpType = { Gem = 122, --命格 Explor = 123, --探索 HomeLand = 124, --家园 + GodsWayTower_1 = 139, --多对塔1 + GodsWayTower_2 = 140, --多对塔2 BuyVigor = 10000, --体力购买 BuyGold = 10001, --金币购买 Privilege = 10003, -- 特权 diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 66cefd3d95..3f4fc8fa5f 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -543,6 +543,26 @@ local jumpDic = { if data then index = data[2] end UIManager.OpenPanel(UIName.DailyCarbonPanel,index) end, + [JumpType.GodsWayTower_1] = function(data) --多对塔 + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GodsWayTower_1) then + local time = PlayerPrefs.GetInt(PlayerManager.uid .. "openFightLevelTime") + NetManager.RequestDuoduiInfoRequest(function() + UIManager.OpenPanel(UIName.GodsWayListPanel) + end) + else + PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.GodsWayTower_1)) + end + end, + [JumpType.GodsWayTower_2] = function(data) --多对塔 + if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GodsWayTower_2) then + local time = PlayerPrefs.GetInt(PlayerManager.uid .. "openFightLevelTime") + NetManager.RequestDuoduiInfoRequest(function() + UIManager.OpenPanel(UIName.GodsWayListPanel) + end) + else + PopupTipPanel.ShowTip(ActTimeCtrlManager.SystemOpenTip(FUNCTION_OPEN_TYPE.GodsWayTower_2)) + end + end, [JumpType.DeathPos] = function()--十绝阵 if ActTimeCtrlManager.SingleFuncState(FUNCTION_OPEN_TYPE.GUILD) then if PlayerManager.familyId == 0 then diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index c383ec3705..e1b3a84480 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -1042,12 +1042,12 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage) local bagAllNum = BagManager.GetItemCountById(itemSId) if bagAllNum >= itemNum then self.addImage:SetActive(false) - self.num:GetComponent("Text").text = string.format("%s/%s", PrintWanNum2(bagAllNum), PrintWanNum2(itemNum)) + self.num:GetComponent("Text").text = string.format("%s/%s", bagAllNum, itemNum) self.num:GetComponent("Text").color = Color.New(1, 1, 1, 1) --self.pokemonNum:GetComponent("Text").text = string.format("%s/%s", PrintWanNum(bagAllNum), PrintWanNum(itemNum)) --self.pokemonNum:GetComponent("Text").color = Color.New(1, 1, 1, 1) else - self.num:GetComponent("Text").text = string.format("%s/%s", PrintWanNum2(bagAllNum), PrintWanNum2(itemNum)) + self.num:GetComponent("Text").text = string.format("%s/%s", bagAllNum, itemNum) self.num:GetComponent("Text").color = UIColor.NOT_ENOUGH_RED --self.pokemonNum:GetComponent("Text").text = string.format("%s/%s", PrintWanNum(bagAllNum), PrintWanNum(itemNum)) --self.pokemonNum:GetComponent("Text").color = UIColor.NOT_ENOUGH_RED