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

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

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

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/Icons.meta

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

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/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++)