chore(release): 4.6.6 [skip ci]

## [4.6.6](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.5...v4.6.6) (2024-05-23)

### Bug Fixes

* fix release workflow ([30b0076](30b00762f6))

.github/workflows/release.yml

@@ -4,8 +4,9 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - preview
       - release
+      - release-preview
+      - release-v4
     tags-ignore:
       - "**"
 
@@ -22,7 +23,8 @@ jobs:
       released: ${{ steps.release.outputs.new_release_published }}
       tag: ${{ steps.release.outputs.new_release_git_tag }}
       version: ${{ steps.release.outputs.new_release_version }}
-      notes: ${{ steps.release.outputs.new_release_notes }}
+      merge_to: ${{ steps.summary.outputs.merge_to }}
+      split_to: ${{ steps.summary.outputs.split_to }}
     steps:
       - name: 🚚 Checkout (${{ github.ref_name }})
         uses: actions/checkout@v4
@@ -38,38 +40,51 @@ jobs:
         env:
           GITHUB_TOKEN: ${{ github.token }}
 
-      - run: |
+      - id: summary
+        run: |
           echo "🔖 New release published: '${{ steps.release.outputs.new_release_published }}'" | tee -a $GITHUB_STEP_SUMMARY
           echo "🔖 New release version: '${{ steps.release.outputs.new_release_version }}'" | tee -a $GITHUB_STEP_SUMMARY
           echo "🔖 New release channel: '${{ steps.release.outputs.new_release_channel }}'" | tee -a $GITHUB_STEP_SUMMARY
           echo "🔖 New release git tag: '${{ steps.release.outputs.new_release_git_tag }}'" | tee -a $GITHUB_STEP_SUMMARY
-          echo '${{ steps.release.outputs.new_release_notes }}' | tee -a $GITHUB_STEP_SUMMARY
+          
+          if [ '${{ steps.release.outputs.new_release_published }}' = 'false' ]; then
+            echo "No new release published." | tee -a $GITHUB_STEP_SUMMARY
+          elif [ '${{ github.ref_name }}' = 'release' ]; then
+            echo "merge_to=develop" | tee -a $GITHUB_OUTPUT
+            echo "split_to=main" | tee -a $GITHUB_OUTPUT
+          elif [ '${{ github.ref_name }}' = 'release-preview' ]; then
+            echo "merge_to=develop-preview" | tee -a $GITHUB_OUTPUT
+            echo "split_to=preview" | tee -a $GITHUB_OUTPUT
+          elif [ '${{ github.ref_name }}' = 'release-4.x' ]; then
+            echo "merge_to=develop-4.x" | tee -a $GITHUB_OUTPUT
+            echo "split_to=4.x" | tee -a $GITHUB_OUTPUT
+          fi
 
-  merge-to-develop:
+  merge-to:
-    if: needs.release.outputs.released == 'true'
+    if: needs.release.outputs.merge_to != ''
     needs: release
-    name: 🔀 Merge to develop
+    name: 🔀 Merge to ${{ needs.release.outputs.merge_to }}
     runs-on: ubuntu-latest
     permissions:
       contents: write
     steps:
-      - name: 🚚 Checkout (develop)
+      - name: 🚚 Checkout (${{ needs.release.outputs.merge_to }})
         uses: actions/checkout@v4
         with:
-          ref: develop
+          ref: ${{ needs.release.outputs.merge_to }}
           fetch-depth: 0
-      - name: 🔀 Merge '${{ needs.release.outputs.tag }}' into 'develop'
+      - name: 🔀 Merge '${{ needs.release.outputs.tag }}' into '${{ needs.release.outputs.merge_to }}'
         run: |
           git config --local user.email "github-actions[bot]@users.noreply.github.com"
           git config --local user.name "github-actions[bot]"
           
           git merge ${{ needs.release.outputs.tag }}
-          git push origin develop
+          git push origin ${{ needs.release.outputs.merge_to }}
 
-  split-to-main:
+  split-to:
-    if: needs.release.outputs.released == 'true'
+    if: needs.release.outputs.split_to != ''
     needs: release
-    name: 🔀 Split package
+    name: 🔀 Split package to ${{ needs.release.outputs.split_to }}
     runs-on: ubuntu-latest
     permissions:
       contents: write
@@ -79,9 +94,10 @@ jobs:
         with:
           ref: ${{ needs.release.outputs.tag }}
           fetch-depth: 0
-      - name: 🔀 Split subtree 'Packages/src' to 'main'
+      - name: 🔀 Split subtree 'Packages/src' to '${{ needs.release.outputs.split_to }}'
         run: |
-          git branch main origin/main
+          split_to=${{ needs.release.outputs.split_to }}
-          git subtree split --prefix=Packages/src --branch main
+          git branch $split_to origin/$split_to
-          git tag ${{ needs.release.outputs.version }} main
+          git subtree split --prefix=Packages/src --branch $split_to
-          git push origin ${{ needs.release.outputs.version }} main:main
+          git tag ${{ needs.release.outputs.version }} $split_to
+          git push origin ${{ needs.release.outputs.version }} $split_to:$split_to

.github/workflows/test.yml

@@ -7,6 +7,7 @@ name: 🧪 Test
 env:
   # MINIMUM_VERSION: The minimum version of Unity.
   MINIMUM_VERSION: 2019.4
+  # EXCLUDE_FILTER: The excluded versions of Unity.
   EXCLUDE_FILTER: '(2020.2.0)'
 
 on:
@@ -14,6 +15,8 @@ on:
   push:
     branches:
       - develop
+      - develop-preview
+      - develop-4.x
     tags:
       - "!*"
     paths-ignore:
@@ -35,7 +38,8 @@ jobs:
         run: |
           echo "==== Target Unity Versions ===="
           LATEST_VERSIONS=`npx unity-changeset list --versions --latest-patch --min ${MINIMUM_VERSION} --json --all`
-          ADDITIONAL_VERSIONS=`npx unity-changeset list --versions --grep '0f' --min ${MINIMUM_VERSION} --json`
+          # ADDITIONAL_VERSIONS=`npx unity-changeset list --versions --grep '0f' --min ${MINIMUM_VERSION} --json`
+          ADDITIONAL_VERSIONS=[]
 
           VERSIONS=`echo "[${LATEST_VERSIONS}, ${ADDITIONAL_VERSIONS}]" \
             | jq -c '[ flatten | sort | unique | .[] | select( test("${{ env.EXCLUDE_FILTER }}") | not ) ]'`
@@ -54,6 +58,7 @@ jobs:
     needs: setup
     strategy:
       fail-fast: false
+      max-parallel: 4
       matrix:
         unityVersion: ${{ fromJson(needs.setup.outputs.unityVersions) }}
     steps:

Assets/Demo/Cartoon FX & War FX Demo/WarFX Demo New.unity.meta

@@ -1,4 +0,0 @@
-fileFormatVersion: 2
-guid: a81f9cd434f104e1fad7ffa20eb7a3d4
-DefaultImporter:
-  userData: 

Packages/src/.github/ISSUE_TEMPLATE/bug_report.md

@@ -26,9 +26,9 @@ A clear and concise description of what you expected to happen.
 If applicable, add screenshots to help explain your problem.
 
 **Environment (please complete the following information):**
- - Version [e.g. 1.0.0]
+ - Version [e.g. 4.0.0]
  - Platform: [e.g. Editor(Windows/Mac), Standalone(Windows/Mac), iOS, Android, WebGL]
- - Unity version: [e.g. 2018.2.8f1]
+ - Unity version: [e.g. 2022.3.0f1]
  - Build options: [e.g. IL2CPP, .Net 4.x, LWRP]
 
 **Additional context**

Packages/src/.releaserc.json

@@ -1,8 +1,9 @@
 {
   "branches": [
     "release",
+    "release-4.x",
     {
-      "name": "preview",
+      "name": "release-preview",
       "prerelease": true
     }
   ],

Packages/src/CHANGELOG.md

@@ -1,3 +1,35 @@
+## [4.6.6](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.5...v4.6.6) (2024-05-23)
+
+
+### Bug Fixes
+
+* fix release workflow ([30b0076](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/30b00762f6da166c043587798b1552f27b4cc604))
+
+## [4.6.5](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.4...v4.6.5) (2024-05-23)
+
+
+### Bug Fixes
+
+* update workflows (for preview and v4) ([3eab097](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/3eab0979b9b85919b804442ab05735b7120eade5))
+
+## [4.6.4](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.3...v4.6.4) (2024-05-22)
+
+
+### Bug Fixes
+
+* assertion failed on expression: 'ps->array_size()' ([1b5c359](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/1b5c359058289895caf5f245fe09abb643bc38eb)), closes [#278](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/278)
+* lost Material.mainTexture when using AnimatableProperties ([ea04352](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/ea043524c0b00f67cba26a1f9ea537ee4a56d6ff)), closes [#311](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/311)
+* remove unnecessary code ([c37c014](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/c37c01486499773e3d7e8296c95bb4c3fae94abb))
+
+## [4.6.3](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.2...v4.6.3) (2024-04-04)
+
+
+### Bug Fixes
+
+* if only Trail Material is used, it will not be displayed ([2eff411](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/2eff411bd97eb4e6947d29a02b85b414bfdaee3a)), closes [#294](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/294)
+* if the UIParticle parents do not have Canvas, an exception is thrown in OnEnable ([e82c833](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/e82c833d04b819f103984931ba29a3616ef50908)), closes [#300](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/300)
+* particle size too small due to auto scaling ([2ec3748](https://github.com/mob-sakai/ParticleEffectForUGUI/commit/2ec374833614d64406e7c3207ca5fe234a749dcb)), closes [#295](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/295)
+
 ## [4.6.2](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.6.1...v4.6.2) (2024-02-01)
 
 

Packages/src/Runtime/ModifiedMaterial.cs

@@ -29,7 +29,7 @@ namespace Coffee.UIParticleExtensions
                 {
                     name = $"{baseMat.name}_{id}",
                     hideFlags = HideFlags.DontSave | HideFlags.NotEditable,
-                    mainTexture = texture ? texture : null
+                    mainTexture = texture ? texture : baseMat.mainTexture
                 }
             };
             s_Entries.Add(e);

Packages/src/Runtime/UIParticle.cs

@@ -100,9 +100,6 @@ namespace Coffee.UIExtensions
                  "UIParticle: UIParticle.scale will be adjusted.")]
         private AutoScalingMode m_AutoScalingMode = AutoScalingMode.Transform;
 
-        [SerializeField]
-        private bool m_ResetScaleOnEnable;
-
         private readonly List<UIParticleRenderer> _renderers = new List<UIParticleRenderer>();
         private int _groupId;
         private Camera _orthoCamera;
@@ -297,13 +294,6 @@ namespace Coffee.UIExtensions
             }
 
             base.OnEnable();
-
-            // Reset scale for upgrade.
-            if (m_ResetScaleOnEnable)
-            {
-                m_ResetScaleOnEnable = false;
-                transform.localScale = Vector3.one;
-            }
         }
 
         /// <summary>
@@ -345,17 +335,6 @@ namespace Coffee.UIExtensions
                 m_IgnoreCanvasScaler = false;
                 m_AutoScaling = false;
                 m_AutoScalingMode = AutoScalingMode.Transform;
-                m_ResetScaleOnEnable = true;
-
-#if UNITY_EDITOR
-                EditorApplication.delayCall += () =>
-                {
-                    if (!this || !gameObject || !transform || Application.isPlaying) return;
-                    transform.localScale = Vector3.one;
-                    m_ResetScaleOnEnable = false;
-                    EditorUtility.SetDirty(this);
-                };
-#endif
             }
 
             if (m_AbsoluteMode)

Packages/src/Runtime/UIParticleRenderer.cs

@@ -328,7 +328,16 @@ namespace Coffee.UIExtensions
 
             // Bake mesh.
             Profiler.BeginSample("[UIParticleRenderer] Bake Mesh");
-            if (_isTrail && _parent.canSimulate && 0 < s_CombineInstances[0].mesh.vertexCount)
+            s_CombineInstances[0].mesh.Clear(false);
+
+            // Assertion failed on expression: 'ps->array_size()' #278
+            var extends = s_CombineInstances[0].mesh.bounds.extents.x;
+            if (!float.IsNaN(extends) && !float.IsInfinity(extends) && 0 < extends)
+            {
+                s_CombineInstances[0].mesh.RecalculateBounds();
+            }
+
+            if (_isTrail && _parent.canSimulate && 0 < _particleSystem.particleCount)
             {
 #if PS_BAKE_API_V2
                 _renderer.BakeTrailsMesh(s_CombineInstances[0].mesh, bakeCamera,
@@ -337,7 +346,7 @@ namespace Coffee.UIExtensions
                 _renderer.BakeTrailsMesh(s_CombineInstances[0].mesh, bakeCamera, true);
 #endif
             }
-            else if (_renderer.CanBakeMesh())
+            else if (!_isTrail && _renderer.CanBakeMesh())
             {
                 _particleSystem.ValidateShape();
 #if PS_BAKE_API_V2
@@ -347,15 +356,10 @@ namespace Coffee.UIExtensions
                 _renderer.BakeMesh(s_CombineInstances[0].mesh, bakeCamera, true);
 #endif
             }
-            else
-            {
-                s_CombineInstances[0].mesh.Clear(false);
-            }
 
             // Too many vertices to render.
             if (65535 <= s_CombineInstances[0].mesh.vertexCount)
             {
-                s_CombineInstances[0].mesh.Clear(false);
                 Debug.LogErrorFormat(this,
                     "Too many vertices to render. index={0}, isTrail={1}, vertexCount={2}(>=65535)",
                     _index,
@@ -517,7 +521,8 @@ namespace Coffee.UIExtensions
             var scale = _parent.scale3DForCalc.GetScaled(_parent.parentScale);
 
             if (_parent.autoScalingMode == UIParticle.AutoScalingMode.UIParticle
-                && _particleSystem.main.scalingMode == ParticleSystemScalingMode.Local)
+                && _particleSystem.main.scalingMode == ParticleSystemScalingMode.Local
+                && _parent.canvas)
             {
                 scale = scale.GetScaled(_parent.canvas.transform.localScale);
             }

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": "4.6.2",
+  "version": "4.6.6",
   "unity": "2018.2",
   "license": "MIT",
   "repository": {