From c3fbf299a607692bf267efa30186df6840b7e003 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Sat, 29 Dec 2018 19:38:53 +0900 Subject: [PATCH 1/4] close #29; Use shared material during play mode --- Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs b/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs index 8d4b083..7b86caf 100644 --- a/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs +++ b/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs @@ -59,9 +59,7 @@ namespace Coffee.UIExtensions Profiler.BeginSample ("Check material"); var mat = m_IsTrail ? _renderer.trailMaterial - : Application.isPlaying - ? _renderer.material - : _renderer.sharedMaterial; + : _renderer.sharedMaterial; if (mat && mat.HasProperty (s_IdMainTex)) { tex = mat.mainTexture; From 0bc9261fc61b5803dbd61ee393240760a9724f83 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Sat, 29 Dec 2018 20:51:04 +0900 Subject: [PATCH 2/4] fix #31; Particle not showing on Android, while on editor it works --- Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs | 4 ++++ 1 file changed, 4 insertions(+) mode change 100644 => 100755 Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs diff --git a/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs b/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs old mode 100644 new mode 100755 index 7b86caf..e9b3321 --- a/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs +++ b/Assets/Coffee/UIExtensions/UIParticle/UIParticle.cs @@ -141,6 +141,10 @@ namespace Coffee.UIExtensions s_TempRelatables.Clear (); _renderer = cachedParticleSystem ? cachedParticleSystem.GetComponent () : null; + if (_renderer && Application.isPlaying) + { + _renderer.enabled = false; + } // Create objects. _mesh = new Mesh (); From 96953fb77d71a03f54062aaeda149c1318c5f6e5 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Sat, 29 Dec 2018 21:32:45 +0900 Subject: [PATCH 3/4] Update readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 30897ec..ecec5e1 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ Compares this "Baking mesh" approach with the conventional approach: * No heavy allocation every frame * All ParticleSystem.ScalingModes and all Canvas.RenderModes are supported. They look almost the same in all modes. ![](https://user-images.githubusercontent.com/12690315/49866926-6c22f500-fe4c-11e8-8393-d5a546e9e2d3.gif) -* Scaled gizmo +* Scaled gizmo ![](https://user-images.githubusercontent.com/12690315/50343861-f31e4e80-056b-11e9-8f60-8bd0a8ff7adb.gif) From b849a38b41aa177c4ca12b6de74eea21d423cac8 Mon Sep 17 00:00:00 2001 From: mob-sakai Date: Sat, 29 Dec 2018 21:38:04 +0900 Subject: [PATCH 4/4] update change log --- CHANGELOG.md | 13 ++++++++++++- package.json | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 29a9502..51a245a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## [v1.3.2](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v1.3.2) (2018-12-29) + +[Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v1.3.1...v1.3.2) + +**Implemented enhancements:** + +- Use shared material during play mode [\#29](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/29) + +**Fixed bugs:** + +- Particle not showing on Android, while on editor it works [\#31](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/31) + ## [v1.3.1](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v1.3.1) (2018-12-24) [Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v1.3.0...v1.3.1) @@ -18,7 +30,6 @@ With Gizmo you can control the scaled Shape. **Fixed bugs:** -- Assertion failed on expression: 'IsNormalized\(normal, 0.001f\)' [\#22](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/22) - In overlay, particle size is too small [\#23](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/23) - UIParticle.Scale does not affect the gizmo of shape module [\#21](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/21) diff --git a/package.json b/package.json index 582c0fd..e119aef 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ParticleEffectForUGUI", - "version": "1.3.1", + "version": "1.3.2", "repository": { "type": "git", "url": "git+https://github.com/mob-sakai/ParticleEffectForUGUI.git"