pengtaihao
/
ParticleEffectForUGUI
mirror of https://github.com/mob-sakai/ParticleEffectForUGUI
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Format

pull/52/head
mob-sakai 2019-02-26 11:11:48 +09:00
parent 76eea1665e
commit eb0176a78c
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Coffee/UIExtensions/UIParticle/Scripts/Editor/UIParticleEditor.cs
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);
} }

2
Assets/Coffee/UIExtensions/UIParticle/Scripts/UIParticle.cs
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;

6
Assets/UIParticle_Demo/UIParticle_Demo.cs
View File

@ -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);
} }