From 6ef00a44989161e1804d46ca68ce942d01bef8be Mon Sep 17 00:00:00 2001 From: wangzhenxing Date: Wed, 19 Jan 2022 16:57:17 +0800 Subject: [PATCH] =?UTF-8?q?[=E9=A3=9E=E5=8D=87]=3D=3D=3D=3D=3D=E7=BB=86?= =?UTF-8?q?=E8=8A=82=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/Formation/FormationPanelV2.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleInfoLayout.lua | 2 +- .../~Lua/Modules/RoleInfo/RoleListPanel.lua | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua index 304faf0e15..dedce72056 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationPanelV2.lua @@ -827,7 +827,7 @@ function this.SingleHeroDataShow(_go, _heroData) starSize = Vector2.New(60,57) end SetHeroStars(this.spLoader, starGrid, star,starType,starSize,starScale) - local effect=SetHeroFlyEffect(go,this.spLoader,heroData.star,this.sortingOrder,1,3) + local effect=SetHeroFlyEffect(go,this.spLoader,heroData.star,this.sortingOrder,1,4) if effect then local meshs2=effect:GetComponentsInChildren(typeof(UnityEngine.SkinnedMeshRenderer)) for key, value in pairs(meshs2:ToTable()) do diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua index 9ab95a8816..c6aefcba2e 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua @@ -429,7 +429,7 @@ function this.GetSkillsData() heroSkill.Skilltips = nil - local OpenPassiveSkillRules = curHeroData.star == HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules + local OpenPassiveSkillRules = curHeroData.star >= HeroManager.awakeNextStarIndex and curHeroData.heroConfig.Awaken or curHeroData.heroConfig.OpenPassiveSkillRules if OpenPassiveSkillRules then local openlists,compoundOpenNum,compoundNum,allUpStarOpenData = HeroManager.GetAllPassiveSkillIds(curHeroData.heroConfig,curHeroData.breakId,curHeroData.upStarId) heroSkill.Name = #openlists - compoundOpenNum .."/"..#OpenPassiveSkillRules - compoundNum diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua index e3c1fb1e62..dadf2d94b6 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleListPanel.lua @@ -80,7 +80,7 @@ function RoleListPanel:InitComponent() if not this.playerInfoView then this.playerInfoView = SubUIManager.Open(SubUIConfig.PlayerInfoView, this.transform) - this.playerInfoView.gameObject:AddComponent(typeof(UnityEngine.Canvas)).overrideSorting=true + -- this.playerInfoView.gameObject:AddComponent(typeof(UnityEngine.Canvas)).overrideSorting=true --this.playerInfoView.overrideSorting=true end this.BtView =SubUIManager.Open(SubUIConfig.BtView, self.gameObject.transform) @@ -182,8 +182,8 @@ function this:OnSortingOrderChange() -- -- 头像层级 if this.playerInfoView then - this.playerInfoView:SetLayer(self.sortingOrder+2) - SetParticleSortLayer(this.playerInfoView,self.sortingOrder+2) + --this.playerInfoView:SetLayer(self.sortingOrder+2) + --SetParticleSortLayer(this.playerInfoView,self.sortingOrder+2) end -- if this.UpView then -- SetParticleSortLayer(this.UpView,self.sortingOrder+2)