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

3.0.0-preview.23

Browse Source 
# [3.0.0-preview.23](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v3.0.0-preview.22...v3.0.0-preview.23) (2020-08-31)

### Bug Fixes

* the default value of IgnoreCanvasScaler is true ([966fae1](966fae1d22))
This commit is contained in:
semantic-release-bot
2020-08-31 00:28:38 +00:00
parent 58465259ad
commit 0eb76a6432
65 changed files with 16716 additions and 79897 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Scripts/Editor/UIParticleEditor.cs
View File

@@ -14,14 +14,14 @@ namespace Coffee.UIExtensions
//################################
// Constant or Static Members.
//################################
private static readonly GUIContent s_ContentAdvancedOptions = new GUIContent("Advanced Options");
private static readonly GUIContent s_ContentRenderingOrder = new GUIContent("Rendering Order");
private static readonly GUIContent s_ContentRefresh = new GUIContent("Refresh");
private SerializedProperty _spScale;
private SerializedProperty _spIgnoreCanvasScaler;
private SerializedProperty _spAnimatableProperties;
private ReorderableList _ro;
private bool _xyzMode;
private static readonly List<string> s_MaskablePropertyNames = new List<string>
{
@@ -54,17 +54,18 @@ namespace Coffee.UIExtensions
{
rect.y += 1;
rect.height = EditorGUIUtility.singleLineHeight;
EditorGUI.PropertyField(rect, sp.GetArrayElementAtIndex(index), GUIContent.none);
EditorGUI.ObjectField(rect, sp.GetArrayElementAtIndex(index), GUIContent.none);
};
_ro.drawHeaderCallback += rect =>
{
EditorGUI.LabelField(new Rect(rect.x, rect.y, 150, rect.height), "Rendering Order");
EditorGUI.LabelField(new Rect(rect.x, rect.y, 150, rect.height), s_ContentRenderingOrder);
if (!GUI.Button(new Rect(rect.width - 80, rect.y - 1, 80, rect.height), "Reset", EditorStyles.miniButton)) return;
foreach (UIParticle t in targets)
if (GUI.Button(new Rect(rect.width - 80, rect.y - 1, 80, rect.height), s_ContentRefresh, EditorStyles.miniButton))
{
t.RefreshParticles();
foreach (UIParticle t in targets)
{
t.RefreshParticles();
}
}
};
}
@@ -79,10 +80,6 @@ namespace Coffee.UIExtensions
serializedObject.Update();
// Advanced Options
EditorGUILayout.Space();
EditorGUILayout.LabelField(s_ContentAdvancedOptions, EditorStyles.boldLabel);
// IgnoreCanvasScaler
EditorGUILayout.PropertyField(_spIgnoreCanvasScaler);
@@ -99,7 +96,7 @@ namespace Coffee.UIExtensions
{
foreach (var mat in current.materials)
{
if (!mat || !mat.shader) continue;
if (!mat || !mat.shader) continue;
var shader = mat.shader;
foreach (var propName in s_MaskablePropertyNames)
{
@@ -109,7 +106,6 @@ namespace Coffee.UIExtensions
break;
}
}
}
serializedObject.ApplyModifiedProperties();

8
Scripts/Editor/UIParticleMenu.cs
View File

@@ -60,11 +60,17 @@ namespace Coffee.UIExtensions
AssetDatabase.ImportAsset(dst, ImportAssetOptions.ImportRecursive);
}
[MenuItem("Assets/Samples/Import UIParticle Sample")]
[MenuItem("Assets/Samples/Import UIParticle Demo")]
static void ImportSample()
{
ImportSample("com.coffee.ui-particle", "Demo");
}
[MenuItem("Assets/Samples/Import UIParticle Demo (Cartoon FX & War FX Demo)")]
static void ImportSample_CFX()
{
ImportSample("com.coffee.ui-particle", "Cartoon FX & War FX Demo");
}
#endif
[MenuItem("GameObject/UI/Particle System (Empty)", false, 2018)]

2
Scripts/UIParticle.cs
View File

@@ -321,6 +321,8 @@ namespace Coffee.UIExtensions
return;
}
m_IgnoreCanvasScaler = true;
// refresh.
#if UNITY_EDITOR
if (!Application.isPlaying)