Merge remote-tracking branch 'origin/develop' into develop-preview

# Conflicts:
#	Packages/src/CHANGELOG.md
#	Packages/src/package.json

.github/workflows/test.yml

@@ -10,6 +10,7 @@ env:
   MINIMUM_VERSION: 2019.4
   # EXCLUDE_FILTER: The excluded versions of Unity.
   EXCLUDE_FILTER: "(2020.2.0|2021.1|2023.3)"
+  PROJECT_PATH: .
 
 on:
   workflow_dispatch:
@@ -21,7 +22,7 @@ on:
   push:
     branches:
       - develop
-      - develop-preview
+      - "develop-*"
     tags:
       - "!*"
     paths-ignore:
@@ -71,11 +72,11 @@ jobs:
     steps:
       - name: 🚚 Checkout ($${{ github.ref }})
         if: github.event_name == 'push'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: 🚚 Checkout pull request (pull_request_target)
         if: github.event_name == 'pull_request_target'
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           fetch-depth: 0
@@ -85,25 +86,27 @@ jobs:
         run: |
           git config user.name "GitHub Actions"
           git config user.email "actions@github.com"
-          git merge origin/${{ github.event.pull_request.base.ref }} --no-edit
+          git rebase ${{ github.event.pull_request.base.sha }}
+          git log --oneline -n 10
 
       - name: 📥 Cache library
         uses: actions/cache@v4
         with:
-          path: Library
-          key: Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }}
+          path: ${{ env.PROJECT_PATH }}/Library
+          key: ${{ env.PROJECT_PATH }}-Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }}
           restore-keys: |
-            Library-${{ matrix.unityVersion }}-
-            Library-
+            ${{ env.PROJECT_PATH }}-Library-${{ matrix.unityVersion }}-
+            ${{ env.PROJECT_PATH }}-Library-
 
       - name: 🛠️ Build Unity Project (Test)
-        uses: game-ci/unity-builder@v4
+        uses: game-ci/unity-builder@main
         timeout-minutes: 45
         with:
           customImage: ghcr.io/mob-sakai/unity3d:${{ matrix.unityVersion }}
           targetPlatform: StandaloneLinux64
           allowDirtyBuild: true
           customParameters: -nographics
+          projectPath: ${{ env.PROJECT_PATH }}
         env:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
@@ -118,6 +121,7 @@ jobs:
           customParameters: -nographics
           checkName: ${{ matrix.unityVersion }} Test Results
           githubToken: ${{ github.token }}
+          projectPath: ${{ env.PROJECT_PATH }}
         env:
           UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
           UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}

Assets/ProjectSettings/NanoMonitor.asset

@@ -18,11 +18,12 @@ MonoBehaviour:
   m_EnabledInEditor: 1
   m_AlwaysIncludeAssembly: 1
   m_InstantiateOnLoad: 1
-  m_Prefab: {fileID: 7211429669315726685, guid: b73940fc30a2f4eb9a73783e9c1f8da6,
+  m_Prefab: {fileID: 4567906826058368312, guid: 7cebff2d255b9433cbe23b243c193329,
     type: 3}
   m_Interval: 0.5
   m_Anchor: 0
   m_Width: 750
+  m_HelpUrl: https://github.com/mob-sakai/ParticleEffectForUGUI
   m_CustomMonitorItems:
   - m_Format: Screen:{0}x{1}
     m_Arg0:

Assets/ProjectSettings/NanoMonitor.prefab.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b73940fc30a2f4eb9a73783e9c1f8da6
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/ProjectSettings/UIParticleProjectSettings.asset

@@ -10,7 +10,7 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: f22a23b9d98e440478697f4adf30e61c, type: 3}
-  m_Name: UIParticle
+  m_Name: UIParticleProjectSettings
   m_EditorClassIdentifier: 
   m_EnableLinearToGamma: 1
   m_HideGeneratedObjects: 1

Assets/ProjectSettings/UIParticleProjectSettings.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4b9df7b8a4193489299b8f477348ae0c
+guid: a5b9278dfbd194d04b1c6ae7031928c1
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000

Assets/Tests/Editor/NewTestScript.cs

@@ -1,16 +1,21 @@
 using System.Collections;
+using Coffee.UIParticleInternal;
 using NUnit.Framework;
+using UnityEngine;
 using UnityEngine.TestTools;
 
 namespace Coffee.UIParticle.Editor.Tests
 {
     public class NewTestScript
     {
-        // A Test behaves as an ordinary method
-        [Test]
-        public void NewTestScriptSimplePasses()
+        [TestCase(-1)]
+        [TestCase(0)]
+        [TestCase(2048)]
+        [TestCase(3000)]
+        public void GetParticleArray(int requiredSize)
         {
-            // Use the Assert class to test conditions
+            var array = ParticleSystemExtensions.GetParticleArray(requiredSize);
+            Debug.Log($"requiredSize: {requiredSize}, array.Length: {array.Length}");
         }
 
         // A UnityTest behaves like a coroutine in Play Mode. In Edit Mode you can use

Packages/packages-lock.json

@@ -5,14 +5,14 @@
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "52987fb6e66e7fc48498d8d164c3c8808de4de6b"
+      "hash": "3c280f1a8f4db5038b881ff07f270efd9638fa31"
     },
     "com.coffee.minimal-resource": {
       "version": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/MinimalResource",
       "depth": 0,
       "source": "git",
       "dependencies": {},
-      "hash": "52987fb6e66e7fc48498d8d164c3c8808de4de6b"
+      "hash": "3c280f1a8f4db5038b881ff07f270efd9638fa31"
     },
     "com.coffee.nano-monitor": {
       "version": "https://github.com/mob-sakai/Coffee.Internal.git?path=Packages/NanoMonitor",
@@ -21,7 +21,7 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "hash": "52987fb6e66e7fc48498d8d164c3c8808de4de6b"
+      "hash": "3c280f1a8f4db5038b881ff07f270efd9638fa31"
     },
     "com.coffee.ui-particle": {
       "version": "file:src",

Packages/src/CHANGELOG.md

@@ -1,3 +1,32 @@
+# [5.0.0-preview.16](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/5.0.0-preview.15...5.0.0-preview.16) (2025-03-15)
+
+
+### Bug Fixes
+
+* IL2CPP build fails on older versions of Unity ([0da6525](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/0da652520cd165b43de7404c0b0ab1fbcf9349d1))
+* NRE on enable ([0cff50e](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/0cff50ef696aa53fb7c46a9a737b7cf3a05b7b9b)), closes [#359](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/359)
+
+# [5.0.0-preview.15](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/5.0.0-preview.14...5.0.0-preview.15) (2025-02-21)
+
+
+### Bug Fixes
+
+* component icons will no longer be displayed in the scene view ([6dfbdae](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/6dfbdae38d3822ab9c2c6f0e4ca1ca32ee98a239))
+* editor crashed on exit play mode (editor, windows) ([47ee45c](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/47ee45cbbe651a8f87ca2b8a3948f8b88db8211e)), closes [#351](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/351)
+
+
+### Features
+
+* add 'TimeScaleMultiplier' option ([925af0b](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/925af0b6046f65f23a778f67cefa8ff9cbedb513))
+
+# [5.0.0-preview.14](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/5.0.0-preview.13...5.0.0-preview.14) (2025-01-03)
+
+
+### Bug Fixes
+
+* sub-emitter particles may not render correctly in certain scenarios ([8276684](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/8276684c3b1646f0490ed64557547ba15281664a)), closes [#348](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/348)
+* sub-emitter's `inherit velocity` module doubles at runtime ([67de3d1](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/67de3d1bd3e16dc9b564625cb990c53d75769506)), closes [#349](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/349)
+
 # [5.0.0-preview.13](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/5.0.0-preview.12...5.0.0-preview.13) (2025-01-03)
 
 

Packages/src/Editor/UIParticleEditor.cs

@@ -61,6 +61,7 @@ namespace Coffee.UIExtensions
         private SerializedProperty _autoScalingMode;
         private SerializedProperty _useCustomView;
         private SerializedProperty _customViewSize;
+        private SerializedProperty _timeScaleMultiplier;
         private ReorderableList _ro;
         private bool _showMax;
         private bool _is3DScaleMode;
@@ -97,6 +98,7 @@ namespace Coffee.UIExtensions
             _autoScalingMode = serializedObject.FindProperty("m_AutoScalingMode");
             _useCustomView = serializedObject.FindProperty("m_UseCustomView");
             _customViewSize = serializedObject.FindProperty("m_CustomViewSize");
+            _timeScaleMultiplier = serializedObject.FindProperty("m_TimeScaleMultiplier");
 
             var sp = serializedObject.FindProperty("m_Particles");
             _ro = new ReorderableList(sp.serializedObject, sp, true, true, true, true)
@@ -241,6 +243,9 @@ namespace Coffee.UIExtensions
                 _customViewSize.floatValue = Mathf.Max(0.1f, _customViewSize.floatValue);
             }
 
+            // Time Scale Multiplier
+            EditorGUILayout.PropertyField(_timeScaleMultiplier);
+
             // Target ParticleSystems.
             EditorGUI.BeginChangeCheck();
             _ro.DoLayoutList();

Packages/src/Icons.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7a55e246f37df405bac88eac692e3a86
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/src/README.md

@@ -146,7 +146,7 @@ _This package requires **Unity 2019.3 or later**._
 
 ### Install as Embedded Package
 
-1. Download the `Source code (zip)` file from [Releases](https://github.com/mob-sakai/SoftMaskForUGUI/releases) and
+1. Download the `Source code (zip)` file from [Releases](https://github.com/mob-sakai/ParticleEffectForUGUI/releases) and
    extract it.
 2. Move the `<extracted_dir>/Packages/src` directory into your project's `Packages` directory.  
    ![](https://github.com/user-attachments/assets/187cbcbe-5922-4ed5-acec-cf19aa17d208)
@@ -179,7 +179,7 @@ _This package requires **Unity 2019.3 or later**._
 
 `UIParticle` controls the ParticleSystems that are attached to its own game objects and child game objects.
 
-![](https://github.com/mob-sakai/ParticleEffectForUGUI/assets/12690315/1cf5753b-33fc-4cef-91c3-413c515a954f)
+![](https://github.com/user-attachments/assets/bc9eb783-afce-4102-ac61-aee9ea8d6f2f)
 
 - **Maskable**: Does this graphic allow maskable.
 - **Scale**: Scale the rendering particles. When the `3D` toggle is enabled, 3D scale (x, y, z) is supported.
@@ -201,6 +201,7 @@ _This package requires **Unity 2019.3 or later**._
   - **UIParticle:** UIParticle.scale will be adjusted.
 - **Use Custom View:** Use this if the particles are not displayed correctly due to min/max particle size.
   - **Custom view size:** Change the bake view size.
+- **Time Scale Multiplier:** Time scale multiplier.
 - **Rendering Order**: The ParticleSystem list to be rendered. You can change the order and the materials.
 
 **NOTE:** Press the `Refresh` button to reconstruct the rendering order based on children ParticleSystem's sorting order
@@ -231,7 +232,7 @@ and z-position.
 If you want to mask particles, set a stencil-supported shader (such as `UI/UIAdditive`) to the material for
 ParticleSystem.
 If you use some custom shaders, see
-the [How to Make a Custom Shader to Support Mask/RectMask2D Component](#how-to-make-a-custom-shader-to-support-maskrectmask2d-component)
+the [How to Make a Custom Shader to Support Mask/RectMask2D Component](#how-to-make-a-custom-shader-to-support-mask-and-rectmask2d-component)
 section.
 
 ![](https://user-images.githubusercontent.com/12690315/95017591-3b512700-0695-11eb-864e-04166ea1809a.png)

Packages/src/Runtime/Internal/Extensions/ComponentExtensions.cs

@@ -204,7 +204,7 @@ namespace Coffee.UIParticleInternal
             target.enabled = false;
 
             // Find MonoScript of the specified component.
-            foreach (var script in Resources.FindObjectsOfTypeAll<MonoScript>())
+            foreach (var script in MonoImporter.GetAllRuntimeMonoScripts())
             {
                 if (script.GetClass() != typeof(T))
                 {

Packages/src/Runtime/Internal/Utilities/Misc.cs

@@ -3,11 +3,16 @@ using System.Diagnostics;
 using UnityEditor;
 using UnityEngine;
 using Object = UnityEngine.Object;
-#if UNITY_EDITOR && UNITY_2021_2_OR_NEWER
+#if UNITY_EDITOR
+using System.IO;
+using System.Linq;
+using System.Reflection;
+#if UNITY_2021_2_OR_NEWER
 using UnityEditor.SceneManagement;
-#elif UNITY_EDITOR
+#else
 using UnityEditor.Experimental.SceneManagement;
 #endif
+#endif
 
 namespace Coffee.UIParticleInternal
 {
@@ -72,5 +77,56 @@ namespace Coffee.UIParticleInternal
 
         public static bool isBatchOrBuilding => Application.isBatchMode || BuildPipeline.isBuildingPlayer;
 #endif
+
+        [Conditional("UNITY_EDITOR")]
+        public static void QueuePlayerLoopUpdate()
+        {
+#if UNITY_EDITOR
+            if (!EditorApplication.isPlaying)
+            {
+                EditorApplication.QueuePlayerLoopUpdate();
+            }
+#endif
+        }
     }
+
+#if !UNITY_2021_2_OR_NEWER
+    [AttributeUsage(AttributeTargets.Class)]
+    [Conditional("UNITY_EDITOR")]
+    internal class IconAttribute : Attribute
+    {
+        private readonly string _path;
+
+        public IconAttribute(string path)
+        {
+            _path = path;
+        }
+
+#if UNITY_EDITOR
+        private static Action<Object, Texture2D> s_SetIconForObject = typeof(EditorGUIUtility)
+            .GetMethod("SetIconForObject", BindingFlags.Static | BindingFlags.NonPublic)
+            .CreateDelegate(typeof(Action<Object, Texture2D>), null) as Action<Object, Texture2D>;
+
+        [InitializeOnLoadMethod]
+        private static void InitializeOnLoadMethod()
+        {
+            if (Misc.isBatchOrBuilding) return;
+
+            var types = TypeCache.GetTypesWithAttribute<IconAttribute>();
+            var scripts = MonoImporter.GetAllRuntimeMonoScripts();
+            foreach (var type in types)
+            {
+                var script = scripts.FirstOrDefault(x => x.GetClass() == type);
+                if (!script) continue;
+
+                var path = type.GetCustomAttribute<IconAttribute>()?._path;
+                var icon = AssetDatabase.LoadAssetAtPath<Texture2D>(path);
+                if (!icon) continue;
+
+                s_SetIconForObject(script, icon);
+            }
+        }
+#endif
+    }
+#endif
 }

Packages/src/Runtime/UIParticle.cs

@@ -9,6 +9,7 @@ using UnityEngine.Serialization;
 using Random = UnityEngine.Random;
 
 [assembly: InternalsVisibleTo("Coffee.UIParticle.Editor")]
+[assembly: InternalsVisibleTo("Coffee.UIParticle.Editor.Tests")]
 [assembly: InternalsVisibleTo("Coffee.UIParticle.PerformanceDemo")]
 [assembly: InternalsVisibleTo("Coffee.UIParticle.Demo")]
 
@@ -17,6 +18,7 @@ namespace Coffee.UIExtensions
     /// <summary>
     /// Render maskable and sortable particle effect ,without Camera, RenderTexture or Canvas.
     /// </summary>
+    [Icon("Packages/com.coffee.ui-particle/Editor/UIParticleIcon.png")]
     [ExecuteAlways]
     [RequireComponent(typeof(RectTransform))]
     [RequireComponent(typeof(CanvasRenderer))]
@@ -119,6 +121,10 @@ namespace Coffee.UIExtensions
                  "Change the bake view size.")]
         private float m_CustomViewSize = 10;
 
+        [SerializeField]
+        [Tooltip("Time scale multiplier.")]
+        private float m_TimeScaleMultiplier = 1;
+
         [SerializeField]
         private bool m_Maskable = true;
 
@@ -285,6 +291,15 @@ namespace Coffee.UIExtensions
             set => m_CustomViewSize = Mathf.Max(0.1f, value);
         }
 
+        /// <summary>
+        /// Time scale multiplier.
+        /// </summary>
+        public float timeScaleMultiplier
+        {
+            get => m_TimeScaleMultiplier;
+            set => m_TimeScaleMultiplier = value;
+        }
+
         internal bool useMeshSharing => m_MeshSharing != MeshSharing.None;
 
         internal bool isPrimary =>

Packages/src/Runtime/UIParticle.cs.meta

@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {fileID: 2800000, guid: 5f0675613942149309588d556e33d990, type: 3}
+  icon: {instanceID: 0}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Packages/src/Runtime/UIParticleRenderer.cs

@@ -15,6 +15,7 @@ using UnityEngine.UI;
 
 namespace Coffee.UIExtensions
 {
+    [Icon("Packages/com.coffee.ui-particle/Editor/UIParticleIcon.png")]
     [ExecuteAlways]
     [RequireComponent(typeof(RectTransform))]
     [RequireComponent(typeof(CanvasRenderer))]
@@ -282,10 +283,6 @@ namespace Coffee.UIExtensions
                 || !transform.lossyScale.GetScaled(_parent.scale3DForCalc).IsVisible() // Scale is not visible.
                 || (!_particleSystem.IsAlive() && !_particleSystem.isPlaying) // No particle.
                 || (_isTrail && !_particleSystem.trails.enabled) // Trail, but it is not enabled.
-#if UNITY_2018_3_OR_NEWER
-                || canvasRenderer.GetInheritedAlpha() <
-                0.01f // #102: Do not bake particle system to mesh when the alpha is zero.
-#endif
             )
             {
                 Profiler.BeginSample("[UIParticleRenderer] Clear Mesh");
@@ -314,6 +311,13 @@ namespace Coffee.UIExtensions
 #endif
                 {
                     ResolveResolutionChange(psPos, scale);
+
+                    // fix: second and subsequent bursts not displayed when world simulation and non-looping. (#326)
+                    if (!_particleSystem.IsLocalSpace() && !main.loop && _particleSystem.time == 0)
+                    {
+                        _delay = true;
+                    }
+
                     Simulate(scale, _parent.isPaused || _delay);
 
                     if (_delay && !_parent.isPaused)
@@ -628,6 +632,7 @@ namespace Coffee.UIExtensions
                 : main.useUnscaledTime
                     ? Time.unscaledDeltaTime
                     : Time.deltaTime;
+            deltaTime *= _parent.timeScaleMultiplier;
 
             // Pre-warm:
             if (0 < deltaTime && _preWarm)

Packages/src/Runtime/UIParticleRenderer.cs.meta

@@ -5,7 +5,7 @@ MonoImporter:
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0
-  icon: {fileID: 2800000, guid: 5f0675613942149309588d556e33d990, type: 3}
+  icon: {instanceID: 0}
   userData: 
   assetBundleName: 
   assetBundleVariant: 

Packages/src/Runtime/UIParticleUpdater.cs

@@ -40,13 +40,26 @@ namespace Coffee.UIExtensions
 
 #if UNITY_EDITOR
         [InitializeOnLoadMethod]
+        private static void InitializeOnLoad()
+        {
+            UIExtraCallbacks.onAfterCanvasRebuild += Refresh;
+
+            EditorApplication.playModeStateChanged += state =>
+            {
+                UIExtraCallbacks.onAfterCanvasRebuild -= Refresh;
+                if (state == PlayModeStateChange.EnteredEditMode || state == PlayModeStateChange.EnteredPlayMode)
+                {
+                    UIExtraCallbacks.onAfterCanvasRebuild += Refresh;
+                }
+            };
+        }
 #else
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
-#endif
         private static void InitializeOnLoad()
         {
             UIExtraCallbacks.onAfterCanvasRebuild += Refresh;
         }
+#endif
 
         private static void Refresh()
         {

Packages/src/Runtime/Utilities/ParticleSystemExtensions.cs

@@ -13,11 +13,7 @@ namespace Coffee.UIParticleInternal
         {
             if (s_TmpParticles.Length < size)
             {
-                while (s_TmpParticles.Length < size)
-                {
-                    size = Mathf.NextPowerOfTwo(size);
-                }
-
+                size = Mathf.NextPowerOfTwo(size);
                 s_TmpParticles = new ParticleSystem.Particle[size];
             }
 
@@ -187,7 +183,11 @@ namespace Coffee.UIParticleInternal
 
         public static bool IsSubEmitterOf(this ParticleSystem self, ParticleSystem parent)
         {
+            if (!self || !parent) return false;
+
             var subEmitters = parent.subEmitters;
+            if (!subEmitters.enabled) return false; // No sub emitters.
+
             var count = subEmitters.subEmittersCount;
             for (var i = 0; i < count; i++)
             {

Packages/src/package.json

@@ -2,7 +2,7 @@
   "name": "com.coffee.ui-particle",
   "displayName": "UI Particle",
   "description": "This package provides a component to render particle effects for uGUI.\nThe particle rendering is maskable and sortable, without the need for an extra Camera, RenderTexture, or Canvas.",
-  "version": "5.0.0-preview.13",
+  "version": "5.0.0-preview.16",
   "unity": "2019.3",
   "license": "MIT",
   "repository": {