fix: Support for skipping "reload domain"

close #406

Packages/src/Editor/UIParticleEditor.cs

@@ -82,18 +82,6 @@ namespace Coffee.UIExtensions
             "_ColorMask"
         };
 
-        /// <summary>
-        /// ドメインリロード無効化対応：静的キャッシュをクリア
-        /// </summary>
-        [InitializeOnLoadMethod]
-        private static void OnDomainReload()
-        {
-            s_Shaders.Clear();
-#if UNITY_2018 || UNITY_2019
-            s_Streams.Clear();
-#endif
-        }
-
         //################################
         // Public/Protected Members.
         //################################

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

@@ -98,7 +98,7 @@ namespace Coffee.UIParticleInternal
             Profiler.BeginSample("(COF)[CanvasExt] GetViewProjectionMatrix");
             var rootCanvas = canvas.rootCanvas;
             var cam = rootCanvas.worldCamera;
-            if (rootCanvas && rootCanvas.renderMode != RenderMode.ScreenSpaceOverlay && cam)
+            if (rootCanvas != null && rootCanvas.renderMode != RenderMode.ScreenSpaceOverlay && cam != null)
             {
                 if (eye == Camera.MonoOrStereoscopicEye.Mono)
                 {

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

@@ -99,7 +99,7 @@ namespace Coffee.UIParticleInternal
         {
             T component = null;
             var transform = self.transform;
-            while (transform)
+            while (transform != null)
             {
                 if (transform.TryGetComponent<T>(out var c))
                 {
@@ -120,7 +120,7 @@ namespace Coffee.UIParticleInternal
             where T : Component
         {
             var tr = includeSelf ? self.transform : self.transform.parent;
-            while (tr)
+            while (tr != null)
             {
                 if (tr.TryGetComponent<T>(out var c) && valid(c)) return c;
                 if (tr == stopAfter) return null;
@@ -197,7 +197,7 @@ namespace Coffee.UIParticleInternal
             if (!includeInactive) return self.GetComponentInParent<T>();
 
             var current = self.transform;
-            while (current)
+            while (current != null)
             {
                 if (current.TryGetComponent<T>(out var c)) return c;
                 current = current.parent;

Packages/src/Runtime/Internal/ProjectSettings/PreloadedProjectSettings.cs

@@ -23,17 +23,14 @@ namespace Coffee.UIParticleInternal
 
         protected static bool s_BuildingPlayer;
 
-        private class Postprocessor : AssetPostprocessor
+        private class EditorEvents : AssetPostprocessor, IPreprocessBuildWithReport, IPostprocessBuildWithReport
         {
+            int IOrderedCallback.callbackOrder => 0;
+
             private static void OnPostprocessAllAssets(string[] _, string[] __, string[] ___, string[] ____)
             {
                 Initialize();
             }
-        }
-
-        private class ExcludeFromBuild : IPreprocessBuildWithReport, IPostprocessBuildWithReport
-        {
-            int IOrderedCallback.callbackOrder => 0;
 
             void IPreprocessBuildWithReport.OnPreprocessBuild(BuildReport report)
             {
@@ -44,11 +41,11 @@ namespace Coffee.UIParticleInternal
                 foreach (var t in TypeCache.GetTypesDerivedFrom(typeof(PreloadedProjectSettings<>)))
                 {
                     var settings = GetDefaultSettings(t);
-                    if (!settings || settings.m_PreLoadSettingsInBuild) continue;
+                    if (settings == null || settings.m_PreLoadSettingsInBuild) continue;
 
                     PlayerSettings.SetPreloadedAssets(
                         PlayerSettings.GetPreloadedAssets()
-                            .Where(x => x && x.GetType() != t)
+                            .Where(x => x != null && x.GetType() != t)
                             .ToArray());
 
                     Debug.Log($"[PreloadedProjectSettings] Build started: removed '{settings.name}' " +
@@ -62,6 +59,21 @@ namespace Coffee.UIParticleInternal
                 s_BuildingPlayer = false;
                 Initialize();
             }
+
+#if UNITY_2019_3_OR_NEWER
+            [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+            private static void OnDomainReload()
+            {
+                foreach (var t in TypeCache.GetTypesDerivedFrom(typeof(PreloadedProjectSettings<>)))
+                {
+                    var defaultSettings = GetDefaultSettings(t);
+                    if (defaultSettings != null)
+                    {
+                        defaultSettings.OnDomainReload();
+                    }
+                }
+            }
+#endif
         }
 
         private static void Initialize()
@@ -154,6 +166,10 @@ namespace Coffee.UIParticleInternal
         protected virtual void OnInitialize()
         {
         }
+
+        protected virtual void OnDomainReload()
+        {
+        }
     }
 
     internal abstract class PreloadedProjectSettingsEditor : Editor
@@ -195,13 +211,6 @@ namespace Coffee.UIParticleInternal
         private static T s_Instance;
 
 #if UNITY_EDITOR
-#if UNITY_2019_3_OR_NEWER
-        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-        private static void OnDomainReload()
-        {
-            s_Instance = null;
-        }
-#endif
         private string _jsonText;
 
         public static bool hasInstance => s_Instance != null;
@@ -229,7 +238,7 @@ namespace Coffee.UIParticleInternal
 
         private void OnPlayModeStateChanged(PlayModeStateChange state)
         {
-            if (!this) return;
+            if (this == null) return;
 
             switch (state)
             {
@@ -246,8 +255,13 @@ namespace Coffee.UIParticleInternal
                     break;
             }
         }
+
+        protected override void OnDomainReload()
+        {
+            s_Instance = null;
+        }
 #else
-    public static T instance => s_Instance != null ? s_Instance : s_Instance = CreateInstance<T>();
+        public static T instance => s_Instance != null ? s_Instance : s_Instance = CreateInstance<T>();
 #endif
 
         /// <summary>
@@ -263,9 +277,10 @@ namespace Coffee.UIParticleInternal
                 return;
             }
 
+            EditorApplication.playModeStateChanged -= OnPlayModeStateChanged;
             EditorApplication.playModeStateChanged += OnPlayModeStateChanged;
 #else
-            if (s_Instance && s_Instance != this)
+            if (s_Instance != null && s_Instance != this)
             {
                 Destroy(s_Instance);
             }
@@ -300,7 +315,7 @@ namespace Coffee.UIParticleInternal
             {
                 if (_target == null)
                 {
-                    if (_editor)
+                    if (_editor != null)
                     {
                         DestroyImmediate(_editor);
                         _editor = null;

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

@@ -66,11 +66,6 @@ namespace Coffee.UIParticleInternal
                 node = node.Next;
             }
         }
-
-        public void Clear()
-        {
-            _delegates.Clear();
-        }
     }
 
     /// <summary>

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

@@ -8,19 +8,19 @@ namespace Coffee.UIParticleInternal
     {
         private static readonly Dictionary<Type, IFrameCache> s_Caches = new Dictionary<Type, IFrameCache>();
 
-        static FrameCache()
-        {
-            s_Caches.Clear();
-            UIExtraCallbacks.onLateAfterCanvasRebuild += ClearAllCache;
-        }
-
 #if UNITY_EDITOR && UNITY_2019_3_OR_NEWER
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
+#elif UNITY_EDITOR
+        [InitializeOnLoadMethod]
+#else
+        [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.BeforeSceneLoad)]
+#endif
         private static void Clear()
         {
             s_Caches.Clear();
+            UIExtraCallbacks.onLateAfterCanvasRebuild -= ClearAllCache;
+            UIExtraCallbacks.onLateAfterCanvasRebuild += ClearAllCache;
         }
-#endif
 
         /// <summary>
         /// Tries to retrieve a value from the frame cache with a specified key.

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

@@ -93,10 +93,6 @@ namespace Coffee.UIParticleInternal
         {
             Canvas.willRenderCanvases -= OnAfterCanvasRebuild;
             s_IsInitializedAfterCanvasRebuild = false;
-            s_AfterCanvasRebuildAction.Clear();
-            s_LateAfterCanvasRebuildAction.Clear();
-            s_BeforeCanvasRebuildAction.Clear();
-            s_OnScreenSizeChangedAction.Clear();
             s_LastScreenSize = default;
         }
 

Packages/src/Runtime/ParticleSystemPreviewer.cs

@@ -48,9 +48,8 @@ namespace Coffee.UIExtensions
 
 #if UNITY_2019_3_OR_NEWER
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
-#else
-        [InitializeOnLoadMethod]
 #endif
+        [InitializeOnLoadMethod]
         public static void Initialize()
         {
             instance.OnSelectionChanged();
@@ -113,6 +112,8 @@ namespace Coffee.UIExtensions
         private static void RegisterParticleSystem(ParticleSystem ps)
         {
             if (!ps) return;
+            if (EditorApplication.isPlaying) return;
+
             ps.hideFlags = k_TemporaryHideFlags;
 
             var emission = ps.emission;
@@ -180,7 +181,7 @@ namespace Coffee.UIExtensions
                 {
                     m_PreviewObjects.RemoveAt(i);
                 }
-                else if (!selectedGameObjects.Contains(go))
+                else if (EditorApplication.isPlaying && !selectedGameObjects.Contains(go))
                 {
                     Unregister(go);
                 }