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
+          path: ${{ env.PROJECT_PATH }}/Library
-          key: Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }}
+          key: ${{ env.PROJECT_PATH }}-Library-${{ matrix.unityVersion }}-${{ github.event.pull_request.head.sha || github.sha }}
           restore-keys: |
-            Library-${{ matrix.unityVersion }}-
+            ${{ env.PROJECT_PATH }}-Library-${{ matrix.unityVersion }}-
-            Library-
+            ${{ 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
+        [TestCase(-1)]
-        [Test]
+        [TestCase(0)]
-        public void NewTestScriptSimplePasses()
+        [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,11 @@
+# [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)
 
 

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)

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,7 +18,7 @@ namespace Coffee.UIExtensions
     /// <summary>
     /// Render maskable and sortable particle effect ,without Camera, RenderTexture or Canvas.
     /// </summary>
-    [Icon("Packages/com.coffee.ui-particle/Icons/UIParticleIcon.png")]
+    [Icon("Packages/com.coffee.ui-particle/Editor/UIParticleIcon.png")]
     [ExecuteAlways]
     [RequireComponent(typeof(RectTransform))]
     [RequireComponent(typeof(CanvasRenderer))]

Packages/src/Runtime/UIParticleProjectSettings.cs

@@ -5,7 +5,6 @@ using UnityEngine;
 
 namespace Coffee.UIExtensions
 {
-    [Icon("Packages/com.coffee.ui-particle/Icons/UIParticleIcon.png")]
     public class UIParticleProjectSettings : PreloadedProjectSettings<UIParticleProjectSettings>
     {
         [Header("Setting")]

Packages/src/Runtime/UIParticleProjectSettings.cs.meta

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

Packages/src/Runtime/UIParticleRenderer.cs

@@ -15,7 +15,7 @@ using UnityEngine.UI;
 
 namespace Coffee.UIExtensions
 {
-    [Icon("Packages/com.coffee.ui-particle/Icons/UIParticleIcon.png")]
+    [Icon("Packages/com.coffee.ui-particle/Editor/UIParticleIcon.png")]
     [ExecuteAlways]
     [RequireComponent(typeof(RectTransform))]
     [RequireComponent(typeof(CanvasRenderer))]
@@ -283,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");
@@ -315,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)

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.15",
+  "version": "5.0.0-preview.16",
   "unity": "2019.3",
   "license": "MIT",
   "repository": {