From 6175b80a530f7c147e757aecc7fb111dfded64f6 Mon Sep 17 00:00:00 2001 From: "PC-202302260912\\Administrator" <419983115@qq.com> Date: Fri, 15 Aug 2025 16:42:33 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E5=92=8C=E9=83=A8=E5=88=86?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab | 4 ++-- Assets/ManagedResources/~Lua/Common/GlobalDefine.lua | 2 ++ .../~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua | 5 +++++ .../~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua | 3 +-- .../~Lua/Modules/Recruit/RecruitEquipPanelNew.lua | 2 +- Assets/ManagedResources/~Lua/View/UpView.lua | 4 +++- 7 files changed, 15 insertions(+), 7 deletions(-) diff --git a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab index 37014f0130..3432d1df2a 100644 --- a/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/GeneralPanel/GeneralTreasurePanel.prefab @@ -2449,7 +2449,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 50.4, y: 104.200195} + m_AnchoredPosition: {x: 50.399902, y: 104.200195} m_SizeDelta: {x: 99, y: 179} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3241267629619513684 @@ -2777,7 +2777,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.85098046, g: 0.83921576, b: 0.8313726, a: 1} + m_Color: {r: 0.972549, g: 0.6039216, b: 0.30588236, a: 1} m_RaycastTarget: 0 m_OnCullStateChanged: m_PersistentCalls: diff --git a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua index 2bff18d527..624babcfda 100644 --- a/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua +++ b/Assets/ManagedResources/~Lua/Common/GlobalDefine.lua @@ -635,6 +635,7 @@ UpViewRechargeType = { HomeLand_BeiChenZhiSui = 1297, --北辰之髓 xianChongQuan = 1350, --仙充券 SilverBar = 124, --银条 + Lianqibi = 22302, --炼器币 } SHOP_PAGE = { @@ -1345,6 +1346,7 @@ JumpType = { zhongzhichengcheng = 96001, --众志成城 zhongzhichengcheng_Explor = 96002, --众志成城跳转探索功能 player = 108, --主角界面 + shuangduibipin = 139, --双队三队比拼 } NPCPosType = { diff --git a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua index 7e8279f0e9..c2f9bdafc9 100644 --- a/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/MonsterCamp/GodsWayTowerPanel.lua @@ -209,7 +209,7 @@ end --界面打开时调用(用于子类重写) function GodsWayTowerPanel:OnShow() - LogError("刷新多队塔界面---------") + LogError("刷新多队塔界面---------"..tostring(curType)) --trailData = MonsterCampManager.GetCurFourElementMonsterInfo(curType) -- if trailData.openState == 0 then -- self:ClosePanel() diff --git a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua index 7ebaa4cae4..66cefd3d95 100644 --- a/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Player/JumpManager.lua @@ -912,6 +912,11 @@ local jumpDic = { end UIManager.OpenPanel(UIName.ExploreMainPanel) end, + [JumpType.shuangduibipin] = function(data) + NetManager.RequestDuoduiInfoRequest(function() + UIManager.OpenPanel(UIName.GodsWayTowerPanel,data[1]) + end) + end, } function this.JumpActivity(data,skipfactor, guideType) diff --git a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua index eba7764196..2876076269 100644 --- a/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/QiJieShiLian/QiJieShiLianPanel.lua @@ -29,9 +29,8 @@ function QiJieShiLianPanel:InitComponent() --屏蔽七界排名奖励 self.rewardBtn:SetActive(false) self.sortBtn = Util.GetGameObject(self.rightBtns,"sortBtn") - --屏蔽七界商店 + --七界商店 self.shopBtn = Util.GetGameObject(self.rightBtns,"shopBtn") - self.shopBtn:SetActive(false) --下部 self.bottomBar = Util.GetGameObject(self.gameObject,"BottomBar") --挑战加成 diff --git a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua index 80bb538ee8..72d2e0e5fb 100644 --- a/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua +++ b/Assets/ManagedResources/~Lua/Modules/Recruit/RecruitEquipPanelNew.lua @@ -54,7 +54,7 @@ function RecruitEquipPanelNew:InitComponent() self.wishPre = Util.GetGameObject(self.wish,"upHeroPre") self.lsth = Util.GetGameObject(self.gameObject,"btngroup/zqbg") - Util.GetGameObject(self.gameObject,"btngroup/zqbg/Text"):GetComponent("Text").text="珍奇宝阁" + Util.GetGameObject(self.gameObject,"btngroup/zqbg/Text"):GetComponent("Text").text="意念礼包" self.lsth.gameObject:SetActive(ActivityGiftManager.IsActivityTypeOpen(20015)~=nil) self.zqbgRed = Util.GetGameObject(self.gameObject,"btngroup/zqbg/red") BindRedPointObject(RedPointType.WishEquipStore,self.zqbgRed) diff --git a/Assets/ManagedResources/~Lua/View/UpView.lua b/Assets/ManagedResources/~Lua/View/UpView.lua index c83db3eb57..e87f271c1d 100644 --- a/Assets/ManagedResources/~Lua/View/UpView.lua +++ b/Assets/ManagedResources/~Lua/View/UpView.lua @@ -73,6 +73,7 @@ local _ShowPlusType = { UpViewRechargeType.HomeLand_BeiChenZhiSui, UpViewRechargeType.xianChongQuan, UpViewRechargeType.SilverBar, + UpViewRechargeType.Lianqibi, } -- 判断是否显示加号 @@ -430,7 +431,8 @@ function UpView:RechargeType(_type) _type == UpViewRechargeType.qianmianhuan or _type == UpViewRechargeType.xianChongQuan or _type == UpViewRechargeType.SilverBar or - _type == UpViewRechargeType.HomeLand_BeiChenZhiSui then + _type == UpViewRechargeType.HomeLand_BeiChenZhiSui or + _type == UpViewRechargeType.Lianqibi then UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _type) elseif _type == UpViewRechargeType.GodPrintStone then -- LogError("1111111")