foldcc/ParticleEffectForUGUI
1
0
Fork 0
mirror of https://github.com/mob-sakai/ParticleEffectForUGUI.git synced 2026-06-29 11:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into develop-preview

Browse Source
This commit is contained in:
mob-sakai
2026-06-25 20:19:12 +09:00
parent 946254d4f5 42e4aa20e0
commit 6dae890b3b
80 changed files with 5385 additions and 124 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
Packages/src/Editor/UIParticleEditor.cs
View File

@@ -1,3 +1,4 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text.RegularExpressions;
@@ -7,12 +8,11 @@ using UnityEngine;
using UnityEngine.Profiling;
using UnityEngine.UI;
using Coffee.UIParticleInternal;
using Object = UnityEngine.Object;
#if UNITY_2021_2_OR_NEWER
using UnityEditor.Overlays;
#else
using System;
using System.Reflection;
using Object = UnityEngine.Object;
#endif
#if UNITY_2021_2_OR_NEWER
using UnityEditor.SceneManagement;
@@ -48,6 +48,7 @@ namespace Coffee.UIExtensions
private static readonly GUIContent s_ContentRandom = new GUIContent("Random");
private static readonly GUIContent s_ContentScale = new GUIContent("Scale");
private static readonly GUIContent s_ContentPrimary = new GUIContent("Primary");
private static readonly GUIContent s_ViewSize = new GUIContent("View Size");
private static readonly Regex s_RegexBuiltInGuid = new Regex(@"^0{16}.0{15}$", RegexOptions.Compiled);
private static readonly List<Material> s_TempMaterials = new List<Material>();
@@ -65,6 +66,7 @@ namespace Coffee.UIExtensions
private ReorderableList _ro;
private bool _showMax;
private bool _is3DScaleMode;
private GameObject[] _gameObjects;
private static readonly HashSet<Shader> s_Shaders = new HashSet<Shader>();
#if UNITY_2018 || UNITY_2019
@@ -180,6 +182,13 @@ namespace Coffee.UIExtensions
y.hasMultipleDifferentValues ||
z.hasMultipleDifferentValues;
}
// Add temporary ParticleSystem for preview if enabled.
if (UIParticleProjectSettings.previewOnSelect)
{
_gameObjects = targets.OfType<UIParticle>().Select(x => x.gameObject).ToArray();
ParticleSystemPreviewSystem.Register(_gameObjects);
}
}
/// <summary>
@@ -194,7 +203,10 @@ namespace Coffee.UIExtensions
serializedObject.Update();
// Maskable
EditorGUILayout.PropertyField(_maskable);
if (_maskable != null)
{
EditorGUILayout.PropertyField(_maskable);
}
// Scale
EditorGUI.BeginDisabledGroup(!_meshSharing.hasMultipleDifferentValues && _meshSharing.intValue == 4);
@@ -232,16 +244,24 @@ namespace Coffee.UIExtensions
// Custom View Size
EditorGUILayout.PropertyField(_useCustomView);
EditorGUI.BeginChangeCheck();
EditorGUI.BeginDisabledGroup(!_useCustomView.boolValue);
EditorGUI.indentLevel++;
EditorGUILayout.PropertyField(_customViewSize);
EditorGUI.indentLevel--;
EditorGUI.EndDisabledGroup();
if (EditorGUI.EndChangeCheck())
if (_useCustomView.boolValue)
{
_customViewSize.floatValue = Mathf.Max(0.1f, _customViewSize.floatValue);
EditorGUI.BeginChangeCheck();
EditorGUILayout.PropertyField(_customViewSize);
if (EditorGUI.EndChangeCheck())
{
_customViewSize.floatValue = Mathf.Max(0.1f, _customViewSize.floatValue);
}
}
else
{
EditorGUI.BeginDisabledGroup(!_useCustomView.boolValue);
EditorGUILayout.FloatField(s_ViewSize, UIParticleProjectSettings.defaultViewSizeForBaking);
EditorGUI.EndDisabledGroup();
}
EditorGUI.indentLevel--;
// Time Scale Multiplier
EditorGUILayout.PropertyField(_timeScaleMultiplier);
@@ -341,6 +361,10 @@ namespace Coffee.UIExtensions
}
}
#endif
// Remove the temporary ParticleSystem.
ParticleSystemPreviewSystem.DrawWarningForTemporary(_gameObjects);
Profiler.EndSample();
}
@@ -481,7 +505,7 @@ namespace Coffee.UIExtensions
#endif
}
private static bool FixButton(bool show, string text)
private static bool FixButton(bool show, string text, GUIContent buttonText = null)
{
if (!show) return false;
using (new EditorGUILayout.HorizontalScope(GUILayout.ExpandWidth(true)))
@@ -489,7 +513,7 @@ namespace Coffee.UIExtensions
EditorGUILayout.HelpBox(text, MessageType.Warning, true);
using (new EditorGUILayout.VerticalScope())
{
return GUILayout.Button(s_ContentFix, GUILayout.Width(30));
return GUILayout.Button(buttonText ?? s_ContentFix, GUILayout.ExpandWidth(false));
}
}
}