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

refactor: refactor

pull/120/head
mob-sakai 2020-11-16 03:07:35 +09:00
parent 08273cb0c3
commit fc4bd708fd
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Scripts/Editor/UIParticleEditor.cs
View File

@ -89,11 +89,11 @@ namespace Coffee.UIExtensions
{ {
EditorGUI.LabelField(new Rect(rect.x, rect.y, 150, rect.height), s_ContentRenderingOrder); EditorGUI.LabelField(new Rect(rect.x, rect.y, 150, rect.height), s_ContentRenderingOrder);
#if UNITY_2019_3_OR_NEWER #if UNITY_2019_3_OR_NEWER
rect = new Rect(rect.width - 55, rect.y, 80, rect.height); rect = new Rect(rect.width - 55, rect.y, 80, rect.height);
#else #else
rect = new Rect(rect.width - 55, rect.y - 1, 80, rect.height); rect = new Rect(rect.width - 55, rect.y - 1, 80, rect.height);
#endif #endif
if (GUI.Button(rect, s_ContentRefresh, EditorStyles.miniButton)) if (GUI.Button(rect, s_ContentRefresh, EditorStyles.miniButton))
{ {

3
Scripts/UIParticle.cs
View File

@ -42,8 +42,7 @@ namespace Coffee.UIExtensions
private List<ParticleSystem> m_Particles = new List<ParticleSystem>(); private List<ParticleSystem> m_Particles = new List<ParticleSystem>();
#if !SERIALIZE_FIELD_MASKABLE #if !SERIALIZE_FIELD_MASKABLE
[SerializeField] [SerializeField] private bool m_Maskable = true;
private bool m_Maskable = true;
#endif #endif
private bool _shouldBeRemoved; private bool _shouldBeRemoved;

6
Scripts/Utils.cs
View File

@ -210,10 +210,10 @@ namespace Coffee.UIParticleExtensions
// Z position & sortingFudge: descending // Z position & sortingFudge: descending
var aTransform = a.transform; var aTransform = a.transform;
var bTransform = b.transform; var bTransform = b.transform;
var aPos = tr.InverseTransformPoint(aTransform.position).z+ aRenderer.sortingFudge; var aPos = tr.InverseTransformPoint(aTransform.position).z + aRenderer.sortingFudge;
var bPos = tr.InverseTransformPoint(bTransform.position).z+ bRenderer.sortingFudge; var bPos = tr.InverseTransformPoint(bTransform.position).z + bRenderer.sortingFudge;
if (!Mathf.Approximately(aPos, bPos)) if (!Mathf.Approximately(aPos, bPos))
return (int)Mathf.Sign(bPos - aPos); return (int) Mathf.Sign(bPos - aPos);
// Material instance ID: match // Material instance ID: match
if (aMat.GetInstanceID() == bMat.GetInstanceID()) if (aMat.GetInstanceID() == bMat.GetInstanceID())