diff --git a/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab b/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab index 90e1e045f5..0f27a61610 100644 --- a/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Formation/FormationEditPopup.prefab @@ -1374,7 +1374,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Material: {fileID: 2100000, guid: 42263669b8cc5c04a96720be44775913, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: diff --git a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab index e713576648..ed8050904d 100644 --- a/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Harmony/HongMengEnvoyPanel.prefab @@ -2981,7 +2981,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Material: {fileID: 2100000, guid: 42263669b8cc5c04a96720be44775913, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 0} m_RaycastTarget: 1 m_OnCullStateChanged: diff --git a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab index b78f26e7ed..c69723ff8b 100644 --- a/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab +++ b/Assets/ManagedResources/Prefabs/UI/RoleInfo/RoleUpStarListPanel.prefab @@ -1895,7 +1895,7 @@ MonoBehaviour: m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 9f6415c5993d0154eba0d2d3bd1ffe93, type: 2} + m_Material: {fileID: 2100000, guid: 42263669b8cc5c04a96720be44775913, type: 2} m_Color: {r: 1, g: 1, b: 1, a: 1} m_RaycastTarget: 1 m_OnCullStateChanged: diff --git a/Assets/ManagedResources/~Lua/Common/functions.lua b/Assets/ManagedResources/~Lua/Common/functions.lua index 966e0eca97..e61fc01899 100644 --- a/Assets/ManagedResources/~Lua/Common/functions.lua +++ b/Assets/ManagedResources/~Lua/Common/functions.lua @@ -417,7 +417,7 @@ function GetStarOrGodSoulLv(index,data) end return data.star,index end -function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY) +function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY,isList) local effect=Util.GetGameObject(par, "c_long_touxiang_lizi(Clone)") local img=Util.GetGameObject(par,"flyImg") local y=0 @@ -483,6 +483,15 @@ function SetHeroFlyEffect(par,spLoader,_star,_layer,_scale,imgFloor,addY) -- long2:SetActive(true) go.sprite=spLoader:LoadSprite("r_tongyong_tianfufeisheng_daoju2") end + if isList and isList==true then + local particles=effect:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(particles:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="YXZ/Effect/Mix Masking(Without Moving)_alphablend" then + mat.material.shader=poolManager:LoadAsset("YXZ_MixMaskingWithoutMoving_alphablend_1",poolManager.AssetType.Other) + end + end + end else go.gameObject:SetActive(false) if effect~=nil then diff --git a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua index 7cca00673e..12331da0ad 100644 --- a/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua +++ b/Assets/ManagedResources/~Lua/Modules/Formation/FormationEditPopup.lua @@ -33,7 +33,8 @@ function FormationEditPopup:InitComponent() this.cardPre = Util.GetGameObject(this.gameObject, "item") this.grid = Util.GetGameObject(this.gameObject, "bg/scroll") this.desc=Util.GetGameObject(this.gameObject,"bg/desc"):GetComponent("Text") - + local particles=this.cardPre:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + --筛选按钮 for i = 0, 4 do tabs[i] = Util.GetGameObject(this.gameObject, "bg/Tabs/Grid/Btn" .. i) @@ -277,7 +278,23 @@ function this.SingleHeroDataShow(_go, _heroData) local starPre = Util.GetGameObject(go, "starPre") local star,starType = heroData.GetStar(1) SetHeroStars(this.spLoader, starGrid, star,starType) - SetHeroFlyEffect(Util.GetGameObject(go, "GameObject"),this.spLoader,heroData.star,this.sortingOrder + 1,1,2) + local effect=SetHeroFlyEffect(Util.GetGameObject(go, "GameObject"),this.spLoader,heroData.star,this.sortingOrder + 1,1,3) + if effect then + local particles=effect:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(particles:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="YXZ/Effect/Mix Masking(Without Moving)_alphablend" then + mat.material.shader=poolManager:LoadAsset("YXZ_MixMaskingWithoutMoving_alphablend_1",poolManager.AssetType.Other) + end + end + end + local meshs1=starGrid:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(meshs1:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="UI Particles/Additive" then + mat.material.shader=poolManager:LoadAsset("UI-Particle-Add_1",poolManager.AssetType.Other) + end + end Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) this.SetHeroBlood(hpExp, heroHp, go) -- Click On diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua index 36eb8796ba..05026f967a 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/EnvoyItem/EnvoyItem.lua @@ -122,7 +122,7 @@ function EnvoyItem:SetItem(go,data) local star,starType = heroSingleData.GetStar(1) SetHeroStars(self.spLoader, self.starGrid, star,starType,nil,nil,Vector2.New(0,1)) - SetHeroFlyEffect(self.heroGo,self.spLoader,heroSingleData.star,sortingOrder+1,1,2) + SetHeroFlyEffect(self.heroGo,self.spLoader,heroSingleData.star,sortingOrder+1,1,2,20) ForceRebuildLayout(self.starGrid.transform) else self.Empty:SetActive(true) diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyUnloadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyUnloadPanel.lua index 51b8db9874..842387f772 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyUnloadPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengEnvoyUnloadPanel.lua @@ -99,7 +99,7 @@ function HongMengUnLoadPanel:SetItem(go,data,index) local starGrid = Util.GetGameObject(go.transform, "star") local star,starType = heroSingleData.GetStar(1) SetHeroStars(this.spLoader, starGrid, star,starType,nil,nil,Vector2.New(0,1)) - SetHeroFlyEffect(go,this.spLoader,heroSingleData.star,this.sortingOrder + 1,1.15,2) + SetHeroFlyEffect(go,this.spLoader,heroSingleData.star,this.sortingOrder + 1,1,2,20) Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua index c112d5fd02..a5e9616901 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/Panel/HongMengUnLoadPanel.lua @@ -122,6 +122,7 @@ function HongMengUnLoadPanel:SetItem(go,data,index) local starGrid = Util.GetGameObject(go.transform, "star") local star,starType = data.GetStar(1) SetHeroStars(this.spLoader, starGrid, star,starType,nil,nil,Vector2.New(0,1)) + SetHeroFlyEffect(go,this.spLoader,data.star,this.sortingOrder + 1,1,2,20) Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) end diff --git a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua index 492890976f..aac018f226 100644 --- a/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua +++ b/Assets/ManagedResources/~Lua/Modules/Harmony/View/HarmonyScrllow.lua @@ -265,7 +265,23 @@ function this.SingleItemDataShow(clone,Itemdata) local starGrid = Util.GetGameObject(clone.transform, "GameObject/star") local star,starType = Itemdata.GetStar(1) SetHeroStars(this.spLoader, starGrid, star,starType,nil,nil,Vector2.New(0,1)) - SetHeroFlyEffect(Util.GetGameObject(clone.transform, "GameObject"),this.spLoader,Itemdata.star,this.sortingOrder+1,1.2) + local effect=SetHeroFlyEffect(Util.GetGameObject(clone.transform, "GameObject"),this.spLoader,Itemdata.star,this.sortingOrder+1,1,4,20) + if effect then + local particles=effect:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(particles:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="YXZ/Effect/Mix Masking(Without Moving)_alphablend" then + mat.material.shader=poolManager:LoadAsset("YXZ_MixMaskingWithoutMoving_alphablend_1",poolManager.AssetType.Other) + end + end + end + local meshs1=starGrid:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(meshs1:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="UI Particles/Additive" then + mat.material.shader=poolManager:LoadAsset("UI-Particle-Add_1",poolManager.AssetType.Other) + end + end Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) end diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua index 1e8845cacb..f496c25058 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleChooseListPanel.lua @@ -169,7 +169,23 @@ function this.OnShowSingleCardData(go,heroData,index)--isSelect 1选择 2 没 local starGrid = Util.GetGameObject(go.transform, "star") local star,starType = heroData.GetStar(1) SetHeroStars(this.spLoader, starGrid, star,starType,nil,nil,Vector2.New(0,1)) - SetHeroFlyEffect(go,this.spLoader,heroData.star,this.sortingOrder + 1,1,2) + local effect=SetHeroFlyEffect(go,this.spLoader,heroData.star,this.sortingOrder + 1,1,3) + if effect then + local particles=effect:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(particles:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="YXZ/Effect/Mix Masking(Without Moving)_alphablend" then + mat.material.shader=poolManager:LoadAsset("YXZ_MixMaskingWithoutMoving_alphablend_1",poolManager.AssetType.Other) + end + end + end + local meshs1=starGrid:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(meshs1:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="UI Particles/Additive" then + mat.material.shader=poolManager:LoadAsset("UI-Particle-Add_1",poolManager.AssetType.Other) + end + end Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) local cardBtn = Util.GetGameObject(go.transform, "icon") local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask") diff --git a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua index 6ca4647074..084282dc47 100644 --- a/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleUpStarListPanel.lua @@ -184,7 +184,6 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local starGrid = Util.GetGameObject(go.transform, "star") local cardBtn = Util.GetGameObject(go.transform, "icon") local GongMingMask = Util.GetGameObject(go.transform, "GongMingMask") - LogError("22222222222") if heroData.type == RoleUpStarMatType.hero then frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(heroData.heroConfig.Quality,heroData.star)) lvGo:SetActive(true) @@ -199,7 +198,16 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 local star,starType = heroData.GetStar(1) SetHeroStars(this.spLoader, starGrid, star,starType,nil,nil,Vector2.New(0,1)) LogError("hero star=="..star) - SetHeroFlyEffect(go,this.spLoader,heroData.star,this.sortingOrder+1,1) + local effect=SetHeroFlyEffect(go,this.spLoader,heroData.star,this.sortingOrder+1,1) + if effect then + local particles=effect:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(particles:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="YXZ/Effect/Mix Masking(Without Moving)_alphablend" then + mat.material.shader=poolManager:LoadAsset("YXZ_MixMaskingWithoutMoving_alphablend_1",poolManager.AssetType.Other) + end + end + end Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) GongMingMask:SetActive(false)--最后检测是否共鸣 if heroData.lockState == 1 or (heroData.isFormation ~= "" and heroData.isFormation ~= Language[10410]) then @@ -261,6 +269,7 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 UIManager.OpenPanel(UIName.RoleInfoPopup,heroData) end, 0.5) elseif heroData.type == RoleUpStarMatType.item then + LogError("22222222222") local itemConfig = ConfigManager.TryGetConfigData(ConfigName.ItemConfig,heroData.id) if not itemConfig then return end frame.sprite = this.spLoader:LoadSprite(GetHeroQuantityImageByquality(itemConfig.Quantity,itemConfig.HeroStar[1])) @@ -279,7 +288,23 @@ function this.OnShowSingleCardData(go,heroData)--isSelect 1选择 2 没选择 GongMingMask:SetActive(false) name.text = SubString2(GetLanguageStrById(itemConfig.Name),8) SetHeroStars(this.spLoader,starGrid, itemConfig.HeroStar[1] or 6,1,nil,nil,Vector2.New(0,1)) - SetHeroFlyEffect(go,this.spLoader,itemConfig.HeroStar[1] or 6,this.sortingOrder+1,1) + local effect=SetHeroFlyEffect(go,this.spLoader,itemConfig.HeroStar[1] or 6,this.sortingOrder+1,1) + if effect then + local particles=effect:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(particles:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="YXZ/Effect/Mix Masking(Without Moving)_alphablend" then + mat.material.shader=poolManager:LoadAsset("YXZ_MixMaskingWithoutMoving_alphablend_1",poolManager.AssetType.Other) + end + end + end + local meshs1=starGrid:GetComponentsInChildren(typeof(UnityEngine.ParticleSystem)) + for key, value in pairs(meshs1:ToTable()) do + local mat=value:GetComponent(typeof(UnityEngine.Renderer)) + if mat.material.shader.name=="UI Particles/Additive" then + mat.material.shader=poolManager:LoadAsset("UI-Particle-Add_1",poolManager.AssetType.Other) + end + end Util.SetParticleSortLayer(starGrid,this.sortingOrder + 1) Util.AddOnceClick(cardBtn, function() local isSelect = false