From ae5b5962b8802ae8e8a58cc66b1df8427de45b45 Mon Sep 17 00:00:00 2001 From: wangzhenxing <1545929779@qq.com> Date: Mon, 16 Oct 2023 18:31:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E7=99=BB=E5=BD=95=E5=8F=91?= =?UTF-8?q?=E9=80=81=E9=B8=BF=E8=92=99=E9=98=B5=E8=AF=B7=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua | 2 +- .../~Lua/Modules/Guild/Skill/HeroPotencyPanel.lua | 2 +- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 4 ++-- .../ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua | 2 ++ 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua index 41b1d3b0f2..89309fcbf2 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyLvUpPanel.lua @@ -70,7 +70,7 @@ function this:InitComponent() end function this.IsTabLock(index) - LogError("检测是否上锁") + --LogError("检测是否上锁") if data[_TabData[index].type] then return false else diff --git a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyPanel.lua b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyPanel.lua index 299fcdd548..fd712f2983 100644 --- a/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Guild/Skill/HeroPotencyPanel.lua @@ -149,7 +149,7 @@ function this.RefreshWindowData() if data[type] then local lv=data[type].lv --LogError("lv======================="..lv.." giftlv==="..data[type].giftLv) - item.lv.text=lv + item.lv.text=lv+giftLv --判断下一级是否可以升级 local lvConfig=ConfigManager.TryGetConfigDataByDoubleKey(ConfigName.PotentialNew,"Type",type,"Level",lv+1) if lvConfig then diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 721d2c9dbd..098d08b4c6 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -670,7 +670,7 @@ function this.ExecuteLoading() --[[[2] = ]]function() NetManager.RequestMission(LoadingPanel.OnStep) end, -- 任务信息 --[[[3] = ]]function() NetManager.ItemInfoRequest(0, LoadingPanel.OnStep) end, -- 物品信息 -- [[[4] = ]]function() NetManager.AllEquipRequest(0, LoadingPanel.OnStep) end, -- 装备(走背包了) - --[[[5] = ]]function() NetManager.AllEquipTreasureRequest(0, LoadingPanel.OnStep) end, -- 宝物 + --[[[4] = ]]function() NetManager.AllEquipTreasureRequest(0, LoadingPanel.OnStep) end, -- 宝物 --[[[5] = ]]function() NetManager.GetAllFaXiangRequest(1, LoadingPanel.OnStep) end, -- 法相 -- [[[6] = ]]function() NetManager.GetSoulPrintDataRequest(0, LoadingPanel.OnStep) end, -- 魂印(走背包了) --[[[7] = ]]function() NetManager.DiffMonsterRequest(0,LoadingPanel.OnStep) end, -- 异妖 @@ -706,7 +706,7 @@ function this.ExecuteLoading() --[[[35] =]]function() NetManager.GetFourElementGetInfo(LoadingPanel.OnStep) end, --四灵试炼 --[[[35] =]]function() NetManager.GetChallengeCopyInfo(LoadingPanel.OnStep) end, --挑战副本 --[[[36] =]]function() MonsterCampManager.SetMyHelpHeroData(nil,nil,LoadingPanel.OnStep) end,--助战神将 - --[[[37] =]]function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵 + --[[[37] =]]--function() NetManager.HongMengInfoResponse(LoadingPanel.OnStep) end, --鸿蒙阵 --[[[38] =]]function() NetManager.AllBookEnableResponse(LoadingPanel.OnStep) end, --天枢密卷 --[[[39] =]]function() NetManager.AllEndLessHeroDataResponse(0, LoadingPanel.OnStep) end,--无尽英雄数据 --[[[40] =]]function() NetManager.GetEndlessTreasureInfoResponse(LoadingPanel.OnStep) end,--无尽密保 diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua index 8fecd8089e..126ea9a249 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoPanel.lua @@ -122,6 +122,7 @@ function RoleInfoPanel:InitComponent() this.giftImg.sprite=this.spLoader:LoadSprite("UI_hz_shenjiang_33") this.giftRedPoint=Util.GetGameObject(this.giftBtn,"redPoint") --潜能 + this.potencyObj=Util.GetGameObject(self.transform,"rightGrid/potencyBtn") this.potencyBtn=Util.GetGameObject(self.transform,"rightGrid/potencyBtn/Image") this.potencyImg=Util.GetGameObject(self.transform,"rightGrid/potencyBtn/Image"):GetComponent("Image") this.potencyImg.sprite=this.spLoader:LoadSprite("UI_hz_shenjiang_33") @@ -715,6 +716,7 @@ end function this:UpdateHeroInfoData() this:UpdateBtnList() this.GodSoulBtn.gameObject:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.shenhun) and curHeroData.heroConfig.IsSoulOpen) + this.potencyObj:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.Potency)) this.giftBtn.gameObject:SetActive(CheckFunctionOpen(FUNCTION_OPEN_TYPE.Gift)) for k,v in pairs(this.PageList) do v:OnHide()