pengtaihao
/
ParticleEffectForUGUI
mirror of https://github.com/mob-sakai/ParticleEffectForUGUI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: mainTex will be ignored

release-preview
mob-sakai 2024-09-30 02:35:13 +09:00
parent 2c1ac4b5e9
commit 2ee69d0424
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Packages/src/Runtime/UIParticleRenderer.cs
View File

@ -24,7 +24,6 @@ namespace Coffee.UIExtensions
private static readonly CombineInstance[] s_CombineInstances = { new CombineInstance() }; private static readonly CombineInstance[] s_CombineInstances = { new CombineInstance() };
private static readonly List<Material> s_Materials = new List<Material>(2); private static readonly List<Material> s_Materials = new List<Material>(2);
private static MaterialPropertyBlock s_Mpb; private static MaterialPropertyBlock s_Mpb;
private static readonly List<Color32> s_Colors = new List<Color32>();
private static readonly Vector3[] s_Corners = new Vector3[4]; private static readonly Vector3[] s_Corners = new Vector3[4];
private bool _delay; private bool _delay;
private int _index; private int _index;
@ -189,7 +188,6 @@ namespace Coffee.UIExtensions
if (!IsActive() || !_parent) if (!IsActive() || !_parent)
{ {
MaterialRepository.Release(ref _modifiedMaterial); MaterialRepository.Release(ref _modifiedMaterial);
_modifiedMaterial = null;
return baseMaterial; return baseMaterial;
} }
@ -215,10 +213,11 @@ namespace Coffee.UIExtensions
); );
if (!MaterialRepository.Valid(hash, _modifiedMaterial)) if (!MaterialRepository.Valid(hash, _modifiedMaterial))
{ {
MaterialRepository.Get(hash, ref _modifiedMaterial, () => new Material(modifiedMaterial) MaterialRepository.Get(hash, ref _modifiedMaterial, x => new Material(x.mat)
{ {
hideFlags = HideFlags.HideAndDontSave hideFlags = HideFlags.HideAndDontSave,
}); mainTexture = x.texture ? x.texture : x.mat.mainTexture
}, (mat: modifiedMaterial, texture));
} }
return _modifiedMaterial; return _modifiedMaterial;