diff --git a/Editor/UIParticleEditor.cs b/Editor/UIParticleEditor.cs index b7a709f..c66ed4f 100644 --- a/Editor/UIParticleEditor.cs +++ b/Editor/UIParticleEditor.cs @@ -317,7 +317,6 @@ namespace Coffee.UIExtensions } #endif Profiler.EndSample(); - EditorApplication.delayCall += () => Profiler.enabled = false; } private static bool IsBuiltInObject(Object obj) diff --git a/Samples~/Demo/Scripts/UIParticle_Demo.cs b/Samples~/Demo/Scripts/UIParticle_Demo.cs index 8fae819..266eda3 100644 --- a/Samples~/Demo/Scripts/UIParticle_Demo.cs +++ b/Samples~/Demo/Scripts/UIParticle_Demo.cs @@ -51,7 +51,11 @@ namespace Coffee.UIExtensions.Demo public void EnableAnimations(bool flag) { +#if UNITY_2023_1_OR_NEWER + foreach (var animator in FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None)) +#else foreach (var animator in FindObjectsOfType()) +#endif { animator.enabled = flag; } @@ -79,7 +83,11 @@ namespace Coffee.UIExtensions.Demo public void UIParticle_Scale(float scale) { +#if UNITY_2023_1_OR_NEWER + foreach (var uip in FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None)) +#else foreach (var uip in FindObjectsOfType()) +#endif { uip.scale = scale; } @@ -87,7 +95,11 @@ namespace Coffee.UIExtensions.Demo public void ParticleSystem_WorldSpaseSimulation(bool flag) { +#if UNITY_2023_1_OR_NEWER + foreach (var p in FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None)) +#else foreach (var p in FindObjectsOfType()) +#endif { var main = p.main; main.simulationSpace = flag @@ -123,7 +135,11 @@ namespace Coffee.UIExtensions.Demo public void ParticleSystem_SetScale(float scale) { +#if UNITY_2023_1_OR_NEWER + foreach (var ps in FindObjectsByType(FindObjectsInactive.Include, FindObjectsSortMode.None)) +#else foreach (var ps in FindObjectsOfType()) +#endif { ps.transform.localScale = new Vector3(scale, scale, scale); } diff --git a/Samples~/Demo/Sprites/UIParticle_Demo_Light_Frame.png.meta b/Samples~/Demo/Sprites/UIParticle_Demo_Light_Frame.png.meta index 390bd9e..9399fea 100644 --- a/Samples~/Demo/Sprites/UIParticle_Demo_Light_Frame.png.meta +++ b/Samples~/Demo/Sprites/UIParticle_Demo_Light_Frame.png.meta @@ -42,12 +42,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Samples~/Demo/Sprites/UIParticle_Demo_Move.png.meta b/Samples~/Demo/Sprites/UIParticle_Demo_Move.png.meta index 711a071..ab8a6d1 100644 --- a/Samples~/Demo/Sprites/UIParticle_Demo_Move.png.meta +++ b/Samples~/Demo/Sprites/UIParticle_Demo_Move.png.meta @@ -27,7 +27,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: 1 + textureFormat: 4 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -42,12 +42,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Samples~/Demo/Sprites/UIParticle_Demo_Star.png.meta b/Samples~/Demo/Sprites/UIParticle_Demo_Star.png.meta index 69dc008..941d5ff 100644 --- a/Samples~/Demo/Sprites/UIParticle_Demo_Star.png.meta +++ b/Samples~/Demo/Sprites/UIParticle_Demo_Star.png.meta @@ -42,12 +42,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 0 alphaIsTransparency: 1 spriteTessellationDetail: -1 diff --git a/Samples~/Demo/Sprites/UIParticle_Demo_Unity-chan.png.meta b/Samples~/Demo/Sprites/UIParticle_Demo_Unity-chan.png.meta index f03cf3f..1f93efe 100644 --- a/Samples~/Demo/Sprites/UIParticle_Demo_Unity-chan.png.meta +++ b/Samples~/Demo/Sprites/UIParticle_Demo_Unity-chan.png.meta @@ -27,7 +27,7 @@ TextureImporter: generateCubemap: 6 cubemapConvolution: 0 seamlessCubemap: 0 - textureFormat: -1 + textureFormat: 4 maxTextureSize: 2048 textureSettings: serializedVersion: 2 @@ -42,12 +42,12 @@ TextureImporter: compressionQuality: 50 spriteMode: 1 spriteExtrude: 1 - spriteMeshType: 1 + spriteMeshType: 0 alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 spriteBorder: {x: 0, y: 0, z: 0, w: 0} - spriteGenerateFallbackPhysicsShape: 1 + spriteGenerateFallbackPhysicsShape: 0 alphaUsage: 1 alphaIsTransparency: 1 spriteTessellationDetail: -1