release v2.2.1

pull/52/head
mob-sakai 2019-02-26 11:30:17 +09:00
commit 9e2176d888
9 changed files with 48 additions and 15 deletions

View File

@ -1,5 +1,14 @@
# Changelog # Changelog
## [v2.2.1](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v2.2.1) (2019-02-26)
[Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v2.2.0...v2.2.1)
**Fixed bugs:**
- v2.2.0 has 2 warnings [\#44](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/44)
- Disable ParticleSystemRenderer on reset [\#45](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/45)
## [v2.2.0](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v2.2.0) (2019-02-23) ## [v2.2.0](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v2.2.0) (2019-02-23)
[Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v2.1.1...v2.2.0) [Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v2.1.1...v2.2.0)

View File

@ -76,7 +76,7 @@ Find the manifest.json file in the Packages folder of your project and edit it t
```js ```js
{ {
"dependencies": { "dependencies": {
"com.coffee.ui-particle": "https://github.com/mob-sakai/ParticleEffectForUGUI.git#2.2.0", "com.coffee.ui-particle": "https://github.com/mob-sakai/ParticleEffectForUGUI.git#2.2.1",
... ...
}, },
} }

View File

@ -228,7 +228,7 @@ namespace Coffee.UIExtensions
{ {
if (!mat.HasProperty (propName)) if (!mat.HasProperty (propName))
{ {
EditorGUILayout.HelpBox (string.Format("Shader {0} doesn't have '{1}' property. This graphic is not maskable.", shader.name, propName), MessageType.Warning); EditorGUILayout.HelpBox (string.Format ("Shader {0} doesn't have '{1}' property. This graphic is not maskable.", shader.name, propName), MessageType.Warning);
break; break;
} }
} }
@ -310,7 +310,7 @@ namespace Coffee.UIExtensions
transformMatrix *= emitterMatrix; transformMatrix *= emitterMatrix;
Handles.matrix = transformMatrix; Handles.matrix = transformMatrix;
if(uip.canvas.renderMode == RenderMode.ScreenSpaceOverlay || ps.main.scalingMode == ParticleSystemScalingMode.Hierarchy) if (uip.canvas.renderMode == RenderMode.ScreenSpaceOverlay || ps.main.scalingMode == ParticleSystemScalingMode.Hierarchy)
{ {
Handles.matrix = Handles.matrix * Matrix4x4.Scale (Vector3.one * uip.scale); Handles.matrix = Handles.matrix * Matrix4x4.Scale (Vector3.one * uip.scale);
} }

View File

@ -37,7 +37,7 @@ namespace Coffee.UIExtensions
[SerializeField] bool m_IgnoreParent = false; [SerializeField] bool m_IgnoreParent = false;
[Tooltip ("Animatable material properties. AnimationでParticleSystemのマテリアルプロパティを変更する場合、有効にしてください。")] [Tooltip ("Animatable material properties. AnimationでParticleSystemのマテリアルプロパティを変更する場合、有効にしてください。")]
[SerializeField] AnimatableProperty[] m_AnimatableProperties = new AnimatableProperty[0]; [SerializeField] AnimatableProperty [] m_AnimatableProperties = new AnimatableProperty [0];
static MaterialPropertyBlock s_Mpb; static MaterialPropertyBlock s_Mpb;
@ -54,9 +54,9 @@ namespace Coffee.UIExtensions
}; };
[SerializeField] [SerializeField]
string m_Name; string m_Name = "";
[SerializeField] [SerializeField]
ShaderPropertyType m_Type; ShaderPropertyType m_Type = ShaderPropertyType.Vector;
public int id { get; private set; } public int id { get; private set; }
public ShaderPropertyType type { get { return m_Type; } } public ShaderPropertyType type { get { return m_Type; } }
@ -255,6 +255,21 @@ namespace Coffee.UIExtensions
base.OnDisable (); base.OnDisable ();
} }
#if UNITY_EDITOR
/// <summary>
/// Reset to default values.
/// </summary>
protected override void Reset ()
{
// Disable ParticleSystemRenderer on reset.
if (cachedParticleSystem)
{
cachedParticleSystem.GetComponent<ParticleSystemRenderer> ().enabled = false;
}
base.Reset ();
}
#endif
/// <summary> /// <summary>
/// Call to update the geometry of the Graphic onto the CanvasRenderer. /// Call to update the geometry of the Graphic onto the CanvasRenderer.
/// </summary> /// </summary>

View File

@ -2,7 +2,7 @@
"name": "com.coffee.ui-particle", "name": "com.coffee.ui-particle",
"displayName": "UI Particle", "displayName": "UI Particle",
"description": "This plugin provide a component to render particle effect for uGUI.\nThe particle rendering is maskable and sortable, without Camera, RenderTexture or Canvas.", "description": "This plugin provide a component to render particle effect for uGUI.\nThe particle rendering is maskable and sortable, without Camera, RenderTexture or Canvas.",
"version": "2.2.0", "version": "2.2.1",
"unity": "2018.2", "unity": "2018.2",
"license": "MIT", "license": "MIT",
"repository": { "repository": {

View File

@ -7,9 +7,9 @@ namespace Coffee.UIExtensions.Demo
{ {
public class UIParticle_Demo : MonoBehaviour public class UIParticle_Demo : MonoBehaviour
{ {
[SerializeField] ParticleSystem [] m_ParticleSystems; [SerializeField] ParticleSystem [] m_ParticleSystems = new ParticleSystem [0];
[SerializeField] List<Transform> m_ScalingByTransforms; [SerializeField] List<Transform> m_ScalingByTransforms = new List<Transform> ();
[SerializeField] List<UIParticle> m_ScalingByUIParticles; [SerializeField] List<UIParticle> m_ScalingByUIParticles = new List<UIParticle> ();
public void SetTimeScale (float scale) public void SetTimeScale (float scale)
{ {
@ -56,15 +56,15 @@ namespace Coffee.UIExtensions.Demo
m_ScalingByUIParticles.ForEach (x => x.scale = scale); m_ScalingByUIParticles.ForEach (x => x.scale = scale);
} }
public void SetUIParticleScale(float scale) public void SetUIParticleScale (float scale)
{ {
foreach(var uip in FindObjectsOfType<UIParticle>()) foreach (var uip in FindObjectsOfType<UIParticle> ())
{ {
uip.scale = scale; uip.scale = scale;
} }
} }
public void LoadScene(string name) public void LoadScene (string name)
{ {
SceneManager.LoadScene (name); SceneManager.LoadScene (name);
} }

View File

@ -1,5 +1,14 @@
# Changelog # Changelog
## [v2.2.1](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v2.2.1) (2019-02-26)
[Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v2.2.0...v2.2.1)
**Fixed bugs:**
- v2.2.0 has 2 warnings [\#44](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/44)
- Disable ParticleSystemRenderer on reset [\#45](https://github.com/mob-sakai/ParticleEffectForUGUI/issues/45)
## [v2.2.0](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v2.2.0) (2019-02-23) ## [v2.2.0](https://github.com/mob-sakai/ParticleEffectForUGUI/tree/v2.2.0) (2019-02-23)
[Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v2.1.1...v2.2.0) [Full Changelog](https://github.com/mob-sakai/ParticleEffectForUGUI/compare/v2.1.1...v2.2.0)

View File

@ -76,7 +76,7 @@ Find the manifest.json file in the Packages folder of your project and edit it t
```js ```js
{ {
"dependencies": { "dependencies": {
"com.coffee.ui-particle": "https://github.com/mob-sakai/ParticleEffectForUGUI.git#2.2.0", "com.coffee.ui-particle": "https://github.com/mob-sakai/ParticleEffectForUGUI.git#2.2.1",
... ...
}, },
} }

View File

@ -2,7 +2,7 @@
"name": "com.coffee.ui-particle", "name": "com.coffee.ui-particle",
"displayName": "UI Particle", "displayName": "UI Particle",
"description": "This plugin provide a component to render particle effect for uGUI.\nThe particle rendering is maskable and sortable, without Camera, RenderTexture or Canvas.", "description": "This plugin provide a component to render particle effect for uGUI.\nThe particle rendering is maskable and sortable, without Camera, RenderTexture or Canvas.",
"version": "2.2.0", "version": "2.2.1",
"unity": "2018.2", "unity": "2018.2",
"license": "MIT", "license": "MIT",
"repository": { "repository": {