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

# Conflicts: # Packages/src/CHANGELOG.md # Packages/src/package.json
chore(release): 4.11.2 [skip ci]
2025-03-15 17:02:36 +09:00 · 2025-03-15 07:59:37 +00:00 · 2025-03-15 16:58:52 +09:00 · 2025-03-14 19:44:02 +09:00 · 2025-03-14 19:29:41 +09:00 · 2025-03-14 19:29:22 +09:00
15 changed files with 24 additions and 2489 deletions
--- a/Assets/ProjectSettings/NanoMonitor.asset
+++ b/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:
--- a/Assets/ProjectSettings/NanoMonitor.prefab
+++ b/Assets/ProjectSettings/NanoMonitor.prefab
--- a/Assets/ProjectSettings/NanoMonitor.prefab.meta
+++ b/Assets/ProjectSettings/NanoMonitor.prefab.meta
@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: b73940fc30a2f4eb9a73783e9c1f8da6
-PrefabImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Assets/ProjectSettings/UIParticleProjectSettings.asset
+++ b/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
--- a/Assets/ProjectSettings/UIParticleProjectSettings.asset.meta
+++ b/Assets/ProjectSettings/UIParticleProjectSettings.asset.meta
@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4b9df7b8a4193489299b8f477348ae0c
+guid: a5b9278dfbd194d04b1c6ae7031928c1
 NativeFormatImporter:
  externalObjects: {}
  mainObjectFileID: 11400000
--- a/Packages/packages-lock.json
+++ b/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",
--- a/Packages/src/CHANGELOG.md
+++ b/Packages/src/CHANGELOG.md
@ -1,3 +1,16 @@
+# [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)


--- a/Packages/src/Editor/UIParticleIcon.png
+++ b/Packages/src/Editor/UIParticleIcon.png
--- a/Packages/src/Editor/UIParticleIcon.png.meta
+++ b/Packages/src/Editor/UIParticleIcon.png.meta
--- a/Packages/src/Icons.meta
+++ b/Packages/src/Icons.meta
@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 7a55e246f37df405bac88eac692e3a86
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Packages/src/Runtime/Coffee.UIParticle.R.dll
+++ b/Packages/src/Runtime/Coffee.UIParticle.R.dll
--- a/Packages/src/Runtime/UIParticleProjectSettings.cs
+++ b/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")]
--- a/Packages/src/Runtime/UIParticleProjectSettings.cs.meta
+++ b/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: 
--- a/Packages/src/Runtime/Utilities/ParticleSystemExtensions.cs
+++ b/Packages/src/Runtime/Utilities/ParticleSystemExtensions.cs
@ -187,6 +187,8 @@ namespace Coffee.UIParticleInternal

        public static bool IsSubEmitterOf(this ParticleSystem self, ParticleSystem parent)
        {
+            if (!self || !parent) return false;
+
            var subEmitters = parent.subEmitters;
            var count = subEmitters.subEmittersCount;
            for (var i = 0; i < count; i++)
--- a/Packages/src/package.json
+++ b/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.14",
+  "version": "5.0.0-preview.15",
  "unity": "2019.3",
  "license": "MIT",
  "repository": {
Author	SHA1	Message	Date
mob-sakai	96106370e5	Merge remote-tracking branch 'origin/develop' into develop-preview # Conflicts: # Packages/src/CHANGELOG.md # Packages/src/package.json	2025-03-15 17:02:36 +09:00
semantic-release-bot	bb2d588e0c	chore(release): 4.11.2 [skip ci] ## [4.11.2](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v4.11.1...v4.11.2) (2025-03-15) ### Bug Fixes * IL2CPP build fails on older versions of Unity ([`0da6525`](`0da652520c`)) * NRE on enable ([`0cff50e`](`0cff50ef69`)), closes [#359](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/359)	2025-03-15 07:59:37 +00:00
mob-sakai	078005a1a7	chore: fix NanoMonitor link url	2025-03-15 16:58:52 +09:00
mob-sakai	0cff50ef69	fix: NRE on enable close #359	2025-03-14 19:44:02 +09:00
mob-sakai	0da652520c	fix: IL2CPP build fails on older versions of Unity	2025-03-14 19:29:41 +09:00
mob-sakai	4199492e3a	chore: update internal	2025-03-14 19:29:22 +09:00
mob-sakai	1f88bb255e	chore: fix settings icon	2025-03-14 19:24:22 +09:00
semantic-release-bot	73d208e9b8	chore(release): 5.0.0-preview.15 [skip ci] # [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`](`6dfbdae38d`)) * editor crashed on exit play mode (editor, windows) ([`47ee45c`](`47ee45cbbe`)), closes [#351](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/351) ### Features * add 'TimeScaleMultiplier' option ([`925af0b`](`925af0b604`))	2025-02-21 09:45:26 +00:00