From d6f2808d5baa9ea22f55326cc2cdfa5432fe53e8 Mon Sep 17 00:00:00 2001 From: "DESKTOP-MMO982B\\User" <752966621@qq.com> Date: Mon, 28 Jul 2025 00:25:23 +0700 Subject: [PATCH] 1 --- .../Modules/Battle/View/Unit/SkillCaster.lua | 1 + .../~Lua/Modules/Formation/FormationPanelV2.lua | 17 +++++++++-------- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua index e87a4541b7..e9cca44a98 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/SkillCaster.lua @@ -565,6 +565,7 @@ function SkillCaster:CheckFullSceenSkill(combat, skill,skillduration) elseif combat.EffectType == 5 then local offset = combat.Offset and Vector3.New(combat.Offset[1], combat.Offset[2], 0) or Vector3.zero local sortingOrder = self.effectRoot:GetComponent("Canvas").sortingOrder + LogError("全屏特效屏幕中心"..tostring(combat.Id)) local go2 = BattleManager.LoadAsset(combat.Bullet, sortingOrder) go2.transform:SetParent(self.effectRoot.transform) -- 检测特效旋转 diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index a348a524dc..b09549b08b 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -93,6 +93,7 @@ function this:InitComponent() for i = 1, 6 do bgListGo[i]=Util.GetGameObject(this.gameObject,"RoleGrid/Bg"..i) heroListGo[i] = Util.GetGameObject(this.gameObject,"RoleGrid/Bg"..i.."/Hero"..i) + Util.GetGameObject(heroListGo[i],"lv"):SetActive(false) maskListGo[i]=Util.GetGameObject(this.gameObject,"RoleGrid/Mask"..i) if not dragViewListGo[i] then dragViewListGo[i] = SubUIManager.Open(SubUIConfig.DragView, bgListGo[i].transform) @@ -127,9 +128,9 @@ function this:InitComponent() tabs[i] = Util.GetGameObject(this.gameObject, "Grid/Tabs/Btn" .. i) Util.GetGameObject(tabs[i], "Text"):GetComponent("Text"):GetComponent("Text").text=PropertyType[i] tabs[i]:SetActive(true) - -- if tabsImg[i + 1] then - -- tabs[i]:GetComponent("Image").sprite = this.spLoader:LoadSprite(tabsImg[i + 1]) - -- end + if tabsImg[i + 1] then + tabs[i]:GetComponent("Image").sprite = this.spLoader:LoadSprite(tabsImg[i + 1]) + end end this.selectBtn = Util.GetGameObject(this.gameObject, "Grid/selectBtn") this.selectTxt=Util.GetGameObject(this.gameObject, "Grid/selectBtn/Text"):GetComponent("Text") @@ -186,20 +187,18 @@ function this:InitComponent() this.jumpFightBtn=Util.GetGameObject(self.transform, "jumpFight/btn") this.jumpFightGou=Util.GetGameObject(self.transform, "jumpFight/Image") ---[[ - this.ProListObj=Util.GetGameObject(self.gameObject, "selectBar") - this.selectObj=Util.GetGameObject(self.gameObject, "selectBar/selectBtn") + this.ProListObj=Util.GetGameObject(self.gameObject, "Grid") + this.selectObj=Util.GetGameObject(self.gameObject, "Grid/selectBtn") this.signBtnList={} for i=1,4 do local proObj={} - local btn=Util.GetGameObject(self.gameObject, "selectBar/btn"..i) + local btn=Util.GetGameObject(self.gameObject, "Grid/Tabs/Btn"..i) proObj.img=btn:GetComponent("Image") proObj.img.sprite=this.spLoader:LoadSprite(GetProStrImageByProNum(i)) proObj.btn=btn this.signBtnList[i]=proObj end this.ProListObj:SetActive(false) - ]] end function this:BindEvent() @@ -531,6 +530,7 @@ function this.SetCardSingleData(o, heroId, _pos, _heroData) local bg=Util.GetGameObject(o,"Bg1"):GetComponent("Image") local icon=Util.GetGameObject(o,"Bg1/icon"):GetComponent("Image") local lv=Util.GetGameObject(o,"lv/Text"):GetComponent("Text") + Util.GetGameObject(o,"lv"):SetActive(true) local hp = Util.GetGameObject(o,"hpProgress/hp"):GetComponent("Image") local hpPass = Util.GetGameObject(o,"hpProgress/hpPass"):GetComponent("Image") local rage = Util.GetGameObject(o,"rageProgress/rage"):GetComponent("Image") @@ -852,6 +852,7 @@ function this.SingleHeroDataShow(_go, _heroData) local frame=Util.GetGameObject(go,"frame"):GetComponent("Image") local icon=Util.GetGameObject(go, "icon"):GetComponent("Image") local lv= Util.GetGameObject(go, "lv/Text"):GetComponent("Text") + Util.GetGameObject(go,"lv"):SetActive(true) local pro= Util.GetGameObject(go, "proIcon"):GetComponent("Image") local pos= Util.GetGameObject(go, "posIcon"):GetComponent("Image") local teamList={}