Merge branch 'dev-main' into dev-hazim

1 month ago · 26db5c3cf1
parent 560c62ad2d 33363da571
commit 26db5c3cf1
233 changed files with 1124859 additions and 1081 deletions
--- a/Assets/Fonts/Bungee-Regular
+++ b/Assets/Fonts/Bungee-Regular
@ -2,20 +2,24 @@
 %TAG !u! tag:unity3d.com,2011:
 --- !u!21 &2100000
 Material:
-  serializedVersion: 6
+  serializedVersion: 8
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
  m_Name: Bungee-Regular SDF05
  m_Shader: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
-  m_ShaderKeywords: 
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
  m_LightmapFlags: 4
  m_EnableInstancingVariants: 0
  m_DoubleSidedGI: 0
  m_CustomRenderQueue: -1
  stringTagMap: {}
  disabledShaderPasses: []
+  m_LockedProperties: 
  m_SavedProperties:
    serializedVersion: 3
    m_TexEnvs:
@ -39,6 +43,7 @@ Material:
        m_Texture: {fileID: 0}
        m_Scale: {x: 1, y: 1}
        m_Offset: {x: 0, y: 0}
+    m_Ints: []
    m_Floats:
    - _Ambient: 0.5
    - _Bevel: 0.5
@ -65,7 +70,7 @@ Material:
    - _OutlineSoftness: 0
    - _OutlineUVSpeedX: 0
    - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0.5
+    - _OutlineWidth: 0.494
    - _PerspectiveFilter: 0.875
    - _Reflectivity: 10
    - _ScaleRatioA: 0.8333333
@ -97,7 +102,7 @@ Material:
    - _FaceColor: {r: 1, g: 1, b: 1, a: 1}
    - _GlowColor: {r: 0, g: 1, b: 0, a: 0.5}
    - _MaskCoord: {r: 0, g: 0, b: 32767, a: 32767}
-    - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
+    - _OutlineColor: {r: 0.19430864, g: 1, b: 0, a: 1}
    - _ReflectFaceColor: {r: 0, g: 0, b: 0, a: 1}
    - _ReflectOutlineColor: {r: 0, g: 0, b: 0, a: 1}
    - _SpecularColor: {r: 1, g: 1, b: 1, a: 1}
--- a/Studio.meta
+++ b/Studio.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6c1be30bdbf336142af03bc33677ff54
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Studio/Fantastic
+++ b/Studio/Fantastic
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 80faa11e05787ee4a9b2b986f9b2d780
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VFX/Materials.meta
+++ b/VFX/Materials.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fb0f497b144c3b742a3aaa832da31414
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VFX/Materials/WindS.mat
+++ b/VFX/Materials/WindS.mat
@ -0,0 +1,55 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: WindS
+  m_Shader: {fileID: 4800000, guid: 60ebdfbe66389c449a414da5266da8e6, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords:
+  - _SIDEOPACITY_ON
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 0d1fb353c40bd6345af42a3b4f0bdb1a, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Noise:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _CullMode: 0
+    - _Depthpower: 1
+    - _Distortionpower: 1
+    - _Finalopacity: 1
+    - _LenghtSet1ifyouuseinPS: 1
+    - _Opacitypower: 70
+    - _PathSet0ifyouuseinPS: 0
+    - _Sideopacity: 1
+    - _Sideopacitypower: 40
+    - _Startopacity: 40
+    - _Strensh: 1
+    - _Usedepth: 0
+    - _Usedistortion: 0
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionRGB: {r: 1, g: 0.4, b: 0.4, a: 1}
+    - _NoisespeedXY: {r: 0, g: 0, b: 0, a: 0}
+    - _TintColor: {r: 1, g: 1, b: 1, a: 1}
+  m_BuildTextureStacks: []
--- a/VFX/Materials/WindS.mat.meta
+++ b/VFX/Materials/WindS.mat.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 6c37460844c4064469fea440fc90dc96
+timeCreated: 1546110813
+licenseType: Store
+NativeFormatImporter:
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Studio/Fantastic
+++ b/Studio/Fantastic
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a25586a4ab9e32f4aa9dbf0537d440bd
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VFX/Models/Path1.fbx
+++ b/VFX/Models/Path1.fbx
--- a/VFX/Models/Path1.fbx.meta
+++ b/VFX/Models/Path1.fbx.meta
@ -0,0 +1,82 @@
+fileFormatVersion: 2
+guid: 354963eb593f4024fbbc674a0dbfa8e6
+timeCreated: 1546110763
+licenseType: Store
+ModelImporter:
+  serializedVersion: 19
+  fileIDToRecycleName:
+    100000: //RootNode
+    400000: //RootNode
+    2300000: //RootNode
+    3300000: //RootNode
+    4300000: Path1
+  materials:
+    importMaterials: 0
+    materialName: 0
+    materialSearch: 1
+  animations:
+    legacyGenerateAnimations: 4
+    bakeSimulation: 0
+    resampleCurves: 1
+    optimizeGameObjects: 0
+    motionNodeName: 
+    rigImportErrors: 
+    rigImportWarnings: 
+    animationImportErrors: 
+    animationImportWarnings: 
+    animationRetargetingWarnings: 
+    animationDoRetargetingWarnings: 0
+    animationCompression: 1
+    animationRotationError: 0.5
+    animationPositionError: 0.5
+    animationScaleError: 0.5
+    animationWrapMode: 0
+    extraExposedTransformPaths: []
+    clipAnimations: []
+    isReadable: 1
+  meshes:
+    lODScreenPercentages: []
+    globalScale: 1
+    meshCompression: 0
+    addColliders: 0
+    importBlendShapes: 1
+    swapUVChannels: 0
+    generateSecondaryUV: 0
+    useFileUnits: 1
+    optimizeMeshForGPU: 1
+    keepQuads: 0
+    weldVertices: 1
+    secondaryUVAngleDistortion: 8
+    secondaryUVAreaDistortion: 15.000001
+    secondaryUVHardAngle: 88
+    secondaryUVPackMargin: 4
+    useFileScale: 1
+  tangentSpace:
+    normalSmoothAngle: 60
+    normalImportMode: 0
+    tangentImportMode: 3
+  importAnimation: 0
+  copyAvatar: 0
+  humanDescription:
+    serializedVersion: 2
+    human: []
+    skeleton: []
+    armTwist: 0.5
+    foreArmTwist: 0.5
+    upperLegTwist: 0.5
+    legTwist: 0.5
+    armStretch: 0.05
+    legStretch: 0.05
+    feetSpacing: 0
+    rootMotionBoneName: 
+    rootMotionBoneRotation: {x: 0, y: 0, z: 0, w: 1}
+    hasTranslationDoF: 0
+    hasExtraRoot: 0
+    skeletonHasParents: 1
+  lastHumanDescriptionAvatarSource: {instanceID: 0}
+  animationType: 0
+  humanoidOversampling: 1
+  additionalBone: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VFX/Prefabs.meta
+++ b/VFX/Prefabs.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 6aadc98e036546047a029bdd55760a84
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VFX/Prefabs/Wind.prefab
+++ b/VFX/Prefabs/Wind.prefab
--- a/VFX/Prefabs/Wind.prefab.meta
+++ b/VFX/Prefabs/Wind.prefab.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 2c925d5a2a53b164facec46c461cbf08
+timeCreated: 1546110737
+licenseType: Store
+NativeFormatImporter:
+  mainObjectFileID: -1
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VFX/Shaders.meta
+++ b/VFX/Shaders.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d54e0654c349d9d47a52d1da98ec6745
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VFX/Shaders/SlashOld.shader
+++ b/VFX/Shaders/SlashOld.shader
@ -0,0 +1,264 @@
+Shader "Hovl/Particles/SlashOld"
+{
+	Properties
+	{
+		_MainTex("MainTex", 2D) = "white" {}
+		_Color("Color", Color) = (1,1,1,1)
+		_EmissionRGB("Emission/R/G/B", Vector) = (1,1,0.5,0.5)
+		_Startopacity("Start opacity", Float) = 40
+		[Toggle]_Sideopacity("Side opacity", Float) = 0
+		_Sideopacitypower("Side opacity power", Float) = 40
+		_Finalopacity("Final opacity", Range( 0 , 1)) = 1
+		_LenghtSet1ifyouuseinPS("Lenght(Set 1 if you use in PS)", Range( 0 , 1)) = 1
+		_PathSet0ifyouuseinPS("Path(Set 0 if you use in PS)", Range( 0 , 1)) = 0
+		[MaterialToggle] _Usedepth ("Use depth?", Float ) = 0
+        _Depthpower ("Depth power", Float ) = 1
+		[Enum(Cull Off,0, Cull Front,1, Cull Back,2)] _CullMode("Culling", Float) = 0
+	}
+
+	Category 
+	{
+		SubShader
+		{
+			Tags { "Queue"="Transparent" "IgnoreProjector"="True" "RenderType"="Transparent" "PreviewType"="Plane" }
+			Blend SrcAlpha OneMinusSrcAlpha
+			ColorMask RGB
+			Cull[_CullMode]
+			Lighting Off 
+			ZWrite Off
+			ZTest LEqual
+			
+			Pass {
+				CGPROGRAM
+				#pragma vertex vert
+				#pragma fragment frag
+				#pragma target 2.0
+				#pragma multi_compile_particles
+				#pragma multi_compile_fog			
+				#include "UnityCG.cginc"
+
+				struct appdata_t 
+				{
+					float4 vertex : POSITION;
+					fixed4 color : COLOR;
+					float4 texcoord : TEXCOORD0;
+					UNITY_VERTEX_INPUT_INSTANCE_ID	
+				};
+
+				struct v2f 
+				{
+					float4 vertex : SV_POSITION;
+					fixed4 color : COLOR;
+					float4 texcoord : TEXCOORD0;
+					UNITY_FOG_COORDS(1)
+					#ifdef SOFTPARTICLES_ON
+					float4 projPos : TEXCOORD2;
+					#endif
+					UNITY_VERTEX_INPUT_INSTANCE_ID
+					UNITY_VERTEX_OUTPUT_STEREO
+				};
+				
+				#if UNITY_VERSION >= 560
+				UNITY_DECLARE_DEPTH_TEXTURE( _CameraDepthTexture );
+				#else
+				uniform sampler2D_float _CameraDepthTexture;
+				#endif
+
+				//Don't delete this comment
+				// uniform sampler2D_float _CameraDepthTexture;
+
+				uniform sampler2D _MainTex;
+				uniform float4 _MainTex_ST;
+				uniform float _PathSet0ifyouuseinPS;
+				uniform float _LenghtSet1ifyouuseinPS;
+				uniform float4 _EmissionRGB;
+				uniform float4 _Color;
+				uniform float _Startopacity;
+				uniform float _Sideopacity;
+				uniform float _Sideopacitypower;
+				uniform float _Finalopacity;
+				uniform fixed _Usedepth;
+				uniform float _Depthpower;
+
+				v2f vert ( appdata_t v  )
+				{
+					v2f o;
+					UNITY_SETUP_INSTANCE_ID(v);
+					UNITY_INITIALIZE_VERTEX_OUTPUT_STEREO(o);
+					UNITY_TRANSFER_INSTANCE_ID(v, o);	
+
+					v.vertex.xyz +=  float3( 0, 0, 0 ) ;
+					o.vertex = UnityObjectToClipPos(v.vertex);
+					#ifdef SOFTPARTICLES_ON
+						o.projPos = ComputeScreenPos (o.vertex);
+						COMPUTE_EYEDEPTH(o.projPos.z);
+					#endif
+					o.color = v.color;
+					o.texcoord = v.texcoord;
+					UNITY_TRANSFER_FOG(o,o.vertex);
+					return o;
+				}
+
+				fixed4 frag ( v2f i  ) : SV_Target
+				{
+					float lp = 1;
+					#ifdef SOFTPARTICLES_ON
+						float sceneZ = LinearEyeDepth (SAMPLE_DEPTH_TEXTURE_PROJ(_CameraDepthTexture, UNITY_PROJ_COORD(i.projPos)));
+						float partZ = i.projPos.z;
+						float fade = saturate ((sceneZ-partZ) / _Depthpower);
+						lp *= lerp(1, fade, _Usedepth);
+						i.color.a *= lp;
+					#endif
+
+					float4 uv05 = i.texcoord;
+					uv05.xy = i.texcoord.xy * float2( 1,1 ) + float2( 0,0 );
+					float temp_output_7_0 = (2.5 + (( _PathSet0ifyouuseinPS + uv05.z ) - 0.0) * (1.0 - 2.5) / (1.0 - 0.0));
+					float clampResult76 = clamp( uv05.w , 0.0 , 1.0 );
+					float temp_output_10_0 = (1.0 + (( _LenghtSet1ifyouuseinPS * clampResult76 ) - 0.0) * (0.0 - 1.0) / (1.0 - 0.0));
+					float clampResult16 = clamp( ( ( ( temp_output_7_0 * temp_output_7_0 * temp_output_7_0 * temp_output_7_0 * temp_output_7_0 ) * uv05.x ) - temp_output_10_0 ) , 0.0 , 1.0 );
+					float V66 = uv05.y;
+					float2 appendResult18 = (float2(( clampResult16 * ( 1.0 / (1.0 + (temp_output_10_0 - 0.0) * (0.001 - 1.0) / (1.0 - 0.0)) ) ) , V66));
+					float2 clampResult19 = clamp( appendResult18 , float2( 0,0 ) , float2( 1,1 ) );
+					float4 tex2DNode21 = tex2D( _MainTex, clampResult19 );
+					float temp_output_54_0 = (clampResult19).x;
+					float clampResult59 = clamp( ( (1.0 + (temp_output_54_0 - 0.0) * (0.0 - 1.0) / (1.0 - 0.0)) * _Startopacity ) , 0.0 , 1.0 );
+					float clampResult60 = clamp( ( _Startopacity * temp_output_54_0 ) , 0.0 , 1.0 );
+					float clampResult62 = clamp( ( (1.0 + (V66 - 0.0) * (0.0 - 1.0) / (1.0 - 0.0)) * _Sideopacitypower ) , 0.0 , 1.0 );
+					float clampResult28 = clamp( ( tex2DNode21.a * i.color.a * _Color.a * ( clampResult59 * clampResult60 * lerp(1.0,clampResult62,_Sideopacity) ) * _Finalopacity ) , 0.0 , 1.0 );
+					float4 appendResult86 = (float4(( ( ( tex2DNode21.r * _EmissionRGB.y ) + ( tex2DNode21.g * _EmissionRGB.z ) + ( tex2DNode21.b * _EmissionRGB.w ) ) * (i.color).rgb * (_Color).rgb * _EmissionRGB.x ) , clampResult28));					
+					fixed4 col = appendResult86;
+					UNITY_APPLY_FOG(i.fogCoord, col);
+					return col;
+				}
+				ENDCG 
+			}
+		}	
+	}
+}
+/*ASEBEGIN
+Version=16900
+296;124;1213;909;1714.463;328.5306;2.045301;True;False
+Node;AmplifyShaderEditor.CommentaryNode;53;-4490.048,-27.91685;Float;False;2282.792;622.2435;Slash UV;19;2;3;4;7;8;5;12;9;10;13;14;16;17;18;19;66;75;76;85;;1,1,1,1;0;0
+Node;AmplifyShaderEditor.TextureCoordinatesNode;5;-4476.143,294.932;Float;False;0;-1;4;3;2;SAMPLER2D;;False;0;FLOAT2;1,1;False;1;FLOAT2;0,0;False;5;FLOAT4;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
+Node;AmplifyShaderEditor.RangedFloatNode;2;-4429.932,40.22149;Float;False;Property;_PathSet0ifyouuseinPS;Path(Set 0 if you use in PS);8;0;Create;True;0;0;False;0;0;0;0;1;0;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleAddOpNode;4;-3981.993,43.66797;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.TFHCRemapNode;7;-3854.058,34.69856;Float;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;3;FLOAT;2.5;False;4;FLOAT;1;False;1;FLOAT;0
+Node;AmplifyShaderEditor.ClampOpNode;76;-4017.877,250.086;Float;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;1;FLOAT;0
+Node;AmplifyShaderEditor.RangedFloatNode;3;-4440.049,160.7987;Float;False;Property;_LenghtSet1ifyouuseinPS;Lenght(Set 1 if you use in PS);7;0;Create;True;0;0;False;0;1;0;0;1;0;1;FLOAT;0
+Node;AmplifyShaderEditor.WireNode;85;-3577.827,308.1031;Float;False;1;0;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;9;-3659.728,201.2546;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;8;-3648.495,29.86452;Float;False;5;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;4;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;12;-3486.968,28.89672;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.TFHCRemapNode;10;-3491.504,199.5061;Float;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;3;FLOAT;1;False;4;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleSubtractOpNode;13;-3258.908,28.0522;Float;False;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.TFHCRemapNode;14;-3256.3,187.6072;Float;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;3;FLOAT;1;False;4;FLOAT;0.001;False;1;FLOAT;0
+Node;AmplifyShaderEditor.ClampOpNode;16;-3012.983,23.27694;Float;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleDivideOpNode;75;-3007.203,166.0433;Float;False;2;0;FLOAT;1;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.RegisterLocalVarNode;66;-3735.759,395.456;Float;False;V;-1;True;1;0;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;17;-2818.393,22.08316;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.CommentaryNode;83;-2398.328,730.9493;Float;False;1396.689;645.0528;Side opacity;14;67;65;54;64;56;55;63;57;58;62;61;60;59;25;;1,1,1,1;0;0
+Node;AmplifyShaderEditor.DynamicAppendNode;18;-2595.536,197.6426;Float;False;FLOAT2;4;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT2;0
+Node;AmplifyShaderEditor.ClampOpNode;19;-2402.201,197.1262;Float;False;3;0;FLOAT2;0,0;False;1;FLOAT2;0,0;False;2;FLOAT2;1,1;False;1;FLOAT2;0
+Node;AmplifyShaderEditor.GetLocalVarNode;67;-2348.328,1079.222;Float;False;66;V;1;0;OBJECT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.ComponentMaskNode;54;-2149.501,982.7732;Float;False;True;False;True;True;1;0;FLOAT2;0,0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.TFHCRemapNode;65;-2168.895,1085.672;Float;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;3;FLOAT;1;False;4;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.RangedFloatNode;64;-2207.309,1261.002;Float;False;Property;_Sideopacitypower;Side opacity power;5;0;Create;True;0;0;False;0;40;40;0;0;0;1;FLOAT;0
+Node;AmplifyShaderEditor.RangedFloatNode;56;-1897.029,942.9186;Float;False;Property;_Startopacity;Start opacity;3;0;Create;True;0;0;False;0;40;40;0;0;0;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;63;-1927.908,1114.902;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.TFHCRemapNode;55;-1901.338,780.9493;Float;False;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;3;FLOAT;1;False;4;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;58;-1678.167,967.9112;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;57;-1668.055,800.1371;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.ClampOpNode;62;-1733.804,1077.494;Float;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;1;FLOAT;0
+Node;AmplifyShaderEditor.VertexColorNode;22;-1145.052,142.3896;Float;False;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
+Node;AmplifyShaderEditor.ToggleSwitchNode;61;-1582.211,1068.601;Float;False;Property;_Sideopacity;Side opacity;4;0;Create;True;0;0;False;0;0;2;0;FLOAT;1;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SamplerNode;21;-1055.309,-73.36416;Float;True;Property;_MainTex;MainTex;0;0;Create;True;0;0;False;0;None;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;6;0;SAMPLER2D;;False;1;FLOAT2;0,0;False;2;FLOAT;0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1;False;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
+Node;AmplifyShaderEditor.ColorNode;23;-1224.055,331.3597;Float;False;Property;_Color;Color;1;0;Create;True;0;0;False;0;1,1,1,1;1,1,1,1;True;0;5;COLOR;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
+Node;AmplifyShaderEditor.Vector4Node;24;-1027.797,526.1595;Float;False;Property;_EmissionRGB;Emission/R/G/B;2;0;Create;True;0;0;False;0;1,1,0.5,0.5;0,0,0,0;0;5;FLOAT4;0;FLOAT;1;FLOAT;2;FLOAT;3;FLOAT;4
+Node;AmplifyShaderEditor.ClampOpNode;59;-1519.85,799.2576;Float;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;1;FLOAT;0
+Node;AmplifyShaderEditor.ClampOpNode;60;-1523.831,946.5353;Float;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;25;-1170.639,820.9329;Float;False;3;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.WireNode;37;-847.563,492.4088;Float;False;1;0;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.RangedFloatNode;26;-906.1818,853.6483;Float;False;Property;_Finalopacity;Final opacity;6;0;Create;True;0;0;False;0;1;0;0;1;0;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;29;-645.4576,-54.47713;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;30;-647.9492,35.22533;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;31;-650.4408,129.9109;Float;False;2;2;0;FLOAT;0;False;1;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.WireNode;36;-852.9051,312.1135;Float;False;1;0;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;27;-592.9656,567.994;Float;False;5;5;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;4;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.ComponentMaskNode;35;-949.0871,181.2063;Float;False;True;True;True;False;1;0;COLOR;0,0,0,0;False;1;FLOAT3;0
+Node;AmplifyShaderEditor.ComponentMaskNode;38;-997.1663,372.1856;Float;False;True;True;True;False;1;0;COLOR;0,0,0,0;False;1;FLOAT3;0
+Node;AmplifyShaderEditor.SimpleAddOpNode;33;-470.7111,16.05663;Float;False;3;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;0;False;1;FLOAT;0
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;34;-196.5317,159.0522;Float;False;4;4;0;FLOAT;0;False;1;FLOAT3;0,0,0;False;2;FLOAT3;0,0,0;False;3;FLOAT;0;False;1;FLOAT3;0
+Node;AmplifyShaderEditor.ClampOpNode;28;-405.2354,569.4601;Float;False;3;0;FLOAT;0;False;1;FLOAT;0;False;2;FLOAT;1;False;1;FLOAT;0
+Node;AmplifyShaderEditor.DynamicAppendNode;86;20.87549,331.3223;Float;False;FLOAT4;4;0;FLOAT3;0,0,0;False;1;FLOAT;0;False;2;FLOAT;0;False;3;FLOAT;0;False;1;FLOAT4;0
+Node;AmplifyShaderEditor.TemplateMultiPassMasterNode;87;288.8726,328.3717;Float;False;True;2;Float;;0;7;Hovl/Particles/SlashOld;0b6a9f8b4f707c74ca64c0be8e590de0;True;SubShader 0 Pass 0;0;0;SubShader 0 Pass 0;2;True;2;5;False;-1;10;False;-1;0;1;False;-1;0;False;-1;False;False;True;2;False;-1;True;True;True;True;False;0;False;-1;False;True;2;False;-1;True;3;False;-1;False;True;4;Queue=Transparent=Queue=0;IgnoreProjector=True;RenderType=Transparent=RenderType;PreviewType=Plane;False;0;False;False;False;False;False;False;False;False;False;False;True;0;0;;0;0;Standard;0;0;1;True;False;2;0;FLOAT4;0,0,0,0;False;1;FLOAT3;0,0,0;False;0
+WireConnection;4;0;2;0
+WireConnection;4;1;5;3
+WireConnection;7;0;4;0
+WireConnection;76;0;5;4
+WireConnection;85;0;5;1
+WireConnection;9;0;3;0
+WireConnection;9;1;76;0
+WireConnection;8;0;7;0
+WireConnection;8;1;7;0
+WireConnection;8;2;7;0
+WireConnection;8;3;7;0
+WireConnection;8;4;7;0
+WireConnection;12;0;8;0
+WireConnection;12;1;85;0
+WireConnection;10;0;9;0
+WireConnection;13;0;12;0
+WireConnection;13;1;10;0
+WireConnection;14;0;10;0
+WireConnection;16;0;13;0
+WireConnection;75;1;14;0
+WireConnection;66;0;5;2
+WireConnection;17;0;16;0
+WireConnection;17;1;75;0
+WireConnection;18;0;17;0
+WireConnection;18;1;66;0
+WireConnection;19;0;18;0
+WireConnection;54;0;19;0
+WireConnection;65;0;67;0
+WireConnection;63;0;65;0
+WireConnection;63;1;64;0
+WireConnection;55;0;54;0
+WireConnection;58;0;56;0
+WireConnection;58;1;54;0
+WireConnection;57;0;55;0
+WireConnection;57;1;56;0
+WireConnection;62;0;63;0
+WireConnection;61;1;62;0
+WireConnection;21;1;19;0
+WireConnection;59;0;57;0
+WireConnection;60;0;58;0
+WireConnection;25;0;59;0
+WireConnection;25;1;60;0
+WireConnection;25;2;61;0
+WireConnection;37;0;23;4
+WireConnection;29;0;21;1
+WireConnection;29;1;24;2
+WireConnection;30;0;21;2
+WireConnection;30;1;24;3
+WireConnection;31;0;21;3
+WireConnection;31;1;24;4
+WireConnection;36;0;22;4
+WireConnection;27;0;21;4
+WireConnection;27;1;36;0
+WireConnection;27;2;37;0
+WireConnection;27;3;25;0
+WireConnection;27;4;26;0
+WireConnection;35;0;22;0
+WireConnection;38;0;23;0
+WireConnection;33;0;29;0
+WireConnection;33;1;30;0
+WireConnection;33;2;31;0
+WireConnection;34;0;33;0
+WireConnection;34;1;35;0
+WireConnection;34;2;38;0
+WireConnection;34;3;24;1
+WireConnection;28;0;27;0
+WireConnection;86;0;34;0
+WireConnection;86;3;28;0
+WireConnection;87;0;86;0
+ASEEND*/
+//CHKSM=FA4D31BA2FF15DE956650A7BF9441DF0209E874D
--- a/VFX/Shaders/SlashOld.shader.meta
+++ b/VFX/Shaders/SlashOld.shader.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 60ebdfbe66389c449a414da5266da8e6
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VFX/Textures.meta
+++ b/VFX/Textures.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 39e9bc7c9e605c54db7922c4f5652235
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/VFX/Textures/Trail21.png
+++ b/VFX/Textures/Trail21.png
--- a/VFX/Textures/Trail21.png.meta
+++ b/VFX/Textures/Trail21.png.meta
@ -0,0 +1,106 @@
+fileFormatVersion: 2
+guid: 0d1fb353c40bd6345af42a3b4f0bdb1a
+TextureImporter:
+  fileIDToRecycleName: {}
+  externalObjects: {}
+  serializedVersion: 5
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 1
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+  isReadable: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: -1
+    aniso: -1
+    mipBias: -1
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 1
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 0
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 2
+  alphaIsTransparency: 0
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  platformSettings:
+  - serializedVersion: 2
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Standalone
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  - serializedVersion: 2
+    buildTarget: Android
+    maxTextureSize: 512
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+  spritePackingTag: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Cartoon
+++ b/Assets/Cartoon
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c865e48369a325f4784ecd8444d1ec51
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Cartoon
+++ b/Assets/Cartoon
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f348a2fb2f8a7fe4e82fb08818415884
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Prefabs/Misc.meta
+++ b/Prefabs/Misc.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f991151302bbc8440bc158a1be7d008d
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Prefabs/Misc/CFX_LightWall.prefab
+++ b/Prefabs/Misc/CFX_LightWall.prefab
--- a/Prefabs/Misc/CFX_LightWall.prefab.meta
+++ b/Prefabs/Misc/CFX_LightWall.prefab.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e427a3233ad87024e9480ecb6a128456
+labels:
+- cartoonfx
+- ground
+- light
+- particles
+- toon
--- a/(legacy)/Demo.meta
+++ b/(legacy)/Demo.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e6fdcf828c6e2b0449c56aec449fa3c5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/(legacy)/Demo/CFX1
+++ b/(legacy)/Demo/CFX1
--- a/(legacy)/Demo/CFX1
+++ b/(legacy)/Demo/CFX1
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: b2165fbc1d575ee4098e242f632ed259
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/DemoSettings.lighting
+++ b/DemoSettings.lighting
@ -0,0 +1,66 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!850595691 &4890085278179872738
+LightingSettings:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CFX1 DemoSettings
+  serializedVersion: 6
+  m_GIWorkflowMode: 1
+  m_EnableBakedLightmaps: 1
+  m_EnableRealtimeLightmaps: 0
+  m_RealtimeEnvironmentLighting: 1
+  m_BounceScale: 1
+  m_AlbedoBoost: 1
+  m_IndirectOutputScale: 1
+  m_UsingShadowmask: 0
+  m_BakeBackend: 0
+  m_LightmapMaxSize: 1024
+  m_BakeResolution: 50
+  m_Padding: 2
+  m_LightmapCompression: 0
+  m_AO: 0
+  m_AOMaxDistance: 1
+  m_CompAOExponent: 0
+  m_CompAOExponentDirect: 0
+  m_ExtractAO: 0
+  m_MixedBakeMode: 1
+  m_LightmapsBakeMode: 1
+  m_FilterMode: 1
+  m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0}
+  m_ExportTrainingData: 0
+  m_TrainingDataDestination: TrainingData
+  m_RealtimeResolution: 1
+  m_ForceWhiteAlbedo: 0
+  m_ForceUpdates: 0
+  m_FinalGather: 0
+  m_FinalGatherRayCount: 1024
+  m_FinalGatherFiltering: 1
+  m_PVRCulling: 1
+  m_PVRSampling: 1
+  m_PVRDirectSampleCount: 32
+  m_PVRSampleCount: 512
+  m_PVREnvironmentSampleCount: 512
+  m_PVREnvironmentReferencePointCount: 2048
+  m_LightProbeSampleCountMultiplier: 4
+  m_PVRBounces: 2
+  m_PVRMinBounces: 2
+  m_PVREnvironmentImportanceSampling: 0
+  m_PVRFilteringMode: 2
+  m_PVRDenoiserTypeDirect: 0
+  m_PVRDenoiserTypeIndirect: 0
+  m_PVRDenoiserTypeAO: 0
+  m_PVRFilterTypeDirect: 0
+  m_PVRFilterTypeIndirect: 0
+  m_PVRFilterTypeAO: 0
+  m_PVRFilteringGaussRadiusDirect: 1
+  m_PVRFilteringGaussRadiusIndirect: 5
+  m_PVRFilteringGaussRadiusAO: 2
+  m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+  m_PVRFilteringAtrousPositionSigmaIndirect: 2
+  m_PVRFilteringAtrousPositionSigmaAO: 1
+  m_PVRTiledBaking: 0
+  m_NumRaysToShootPerTexel: -1
+  m_RespectSceneVisibilityWhenBakingGI: 0
--- a/DemoSettings.lighting.meta
+++ b/DemoSettings.lighting.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: bada21239a0529b439536bfd0e91c874
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 4890085278179872738
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Cartoon
+++ b/Assets/Cartoon
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7a7171bf41aeb6949b08451fbcd42dd7
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Editor/Editor.meta
+++ b/Editor/Editor.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ef74fe7f8dfc6894481d107231650819
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Editor/Editor/CFXEasyEditor.cs
+++ b/Editor/Editor/CFXEasyEditor.cs
--- a/Editor/Editor/CFXEasyEditor.cs.meta
+++ b/Editor/Editor/CFXEasyEditor.cs.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: d56b3c7055d81cb44803b5d7db4b65e0
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
--- a/Assets/Scripts/CFXR_Effect.CameraShake.cs
+++ b/Assets/Scripts/CFXR_Effect.CameraShake.cs
@ -1,12 +1,12 @@
 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Rendering;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif

 namespace CartoonFX
 {
+	[RequireComponent(typeof(ParticleSystem))]
 	public partial class CFXR_Effect : MonoBehaviour
 	{
 		[System.Serializable]
@ -49,17 +49,6 @@ namespace CartoonFX
 			static bool s_CallbackRegistered;
 			static List<CameraShake> s_CameraShakes = new List<CameraShake>();

-#if UNITY_2019_1_OR_NEWER
-			static void OnPreRenderCamera_Static_URP(ScriptableRenderContext context, Camera cam)
-			{
-				OnPreRenderCamera_Static(cam);
-			}
-			static void OnPostRenderCamera_Static_URP(ScriptableRenderContext context, Camera cam)
-			{
-				OnPostRenderCamera_Static(cam);
-			}
-#endif
-
 			static void OnPreRenderCamera_Static(Camera cam)
 			{
 				int count = s_CameraShakes.Count;
@ -86,27 +75,8 @@ namespace CartoonFX

 				if (!s_CallbackRegistered)
 				{
-#if UNITY_2019_1_OR_NEWER
-	#if UNITY_2019_3_OR_NEWER
-					if (GraphicsSettings.currentRenderPipeline == null)
-	#else
-					if (GraphicsSettings.renderPipelineAsset == null)
-	#endif
-					{
-						// Built-in Render Pipeline
-						Camera.onPreRender += OnPreRenderCamera_Static;
-						Camera.onPostRender += OnPostRenderCamera_Static;
-					}
-					else
-					{
-						// URP
-						RenderPipelineManager.beginCameraRendering += OnPreRenderCamera_Static_URP;
-						RenderPipelineManager.endCameraRendering += OnPostRenderCamera_Static_URP;
-					}
-#else
-						Camera.onPreRender += OnPreRenderCamera_Static;
-						Camera.onPostRender += OnPostRenderCamera_Static;
-#endif
+					Camera.onPreRender += OnPreRenderCamera_Static;
+					Camera.onPostRender += OnPostRenderCamera_Static;

 					s_CallbackRegistered = true;
 				}
@ -118,27 +88,8 @@ namespace CartoonFX

 				if (s_CallbackRegistered && s_CameraShakes.Count == 0)
 				{
-#if UNITY_2019_1_OR_NEWER
-	#if UNITY_2019_3_OR_NEWER
-					if (GraphicsSettings.currentRenderPipeline == null)
-	#else
-					if (GraphicsSettings.renderPipelineAsset == null)
-	#endif
-					{
-						// Built-in Render Pipeline
-						Camera.onPreRender -= OnPreRenderCamera_Static;
-						Camera.onPostRender -= OnPostRenderCamera_Static;
-					}
-					else
-					{
-						// URP
-						RenderPipelineManager.beginCameraRendering -= OnPreRenderCamera_Static_URP;
-						RenderPipelineManager.endCameraRendering -= OnPostRenderCamera_Static_URP;
-					}
-#else
-						Camera.onPreRender -= OnPreRenderCamera_Static;
-						Camera.onPostRender -= OnPostRenderCamera_Static;
-#endif
+					Camera.onPreRender -= OnPreRenderCamera_Static;
+					Camera.onPostRender -= OnPostRenderCamera_Static;

 					s_CallbackRegistered = false;
 				}
@ -160,8 +111,6 @@ namespace CartoonFX
 				{
 					camerasPreRenderPosition[cam] = cam.transform.localPosition;

-					if (Time.timeScale <= 0) return;
-
 					switch (shakeSpace)
 					{
 						case ShakeSpace.Screen: cam.transform.localPosition += cam.transform.rotation * shakeVector; break;
@ -275,7 +224,8 @@ namespace CartoonFX

 					var randomVec = new Vector3(Random.value, Random.value, Random.value);
 					var shakeVec = Vector3.Scale(randomVec, shakeStrength) * (Random.value > 0.5f ? -1 : 1);
-					shakeVector = shakeVec * shakeCurve.Evaluate(delta) * GLOBAL_CAMERA_SHAKE_MULTIPLIER;
+					shakeVector = Vector3.Lerp(Vector3.zero, shakeVec, shakeCurve.Evaluate(delta));
+					//shakeVector = shakeVec * shakeCurve.Evaluate(delta); // TODO this is the same?
 				}
 				else if (isShaking)
 				{
--- a/Assets/Scripts/CFXR_Effect.cs
+++ b/Assets/Scripts/CFXR_Effect.cs
@ -3,17 +3,11 @@
 // (c) 2012-2020 Jean Moreno
 //--------------------------------------------------------------------------------------------------------------------------------

-
-//--------------------------------------------------------------------------------------------------------------------------------
-
 // Use the defines below to globally disable features:
-
 //#define DISABLE_CAMERA_SHAKE
 //#define DISABLE_LIGHTS
 //#define DISABLE_CLEAR_BEHAVIOR

-//--------------------------------------------------------------------------------------------------------------------------------
-
 using UnityEngine;
 #if UNITY_EDITOR
 using UnityEditor;
@ -22,12 +16,8 @@ using UnityEditor;
 namespace CartoonFX
 {
 	[RequireComponent(typeof(ParticleSystem))]
-	[DisallowMultipleComponent]
 	public partial class CFXR_Effect : MonoBehaviour
 	{
-		// Change this value to easily tune the camera shake strength for all effects
-		const float GLOBAL_CAMERA_SHAKE_MULTIPLIER = 1.0f;
-
 #if UNITY_EDITOR
 		[InitializeOnLoadMethod]
 		static void InitGlobalOptions()
@ -454,8 +444,6 @@ namespace CartoonFX

 		float time;
 		ParticleSystem rootParticleSystem;
-		[System.NonSerialized] MaterialPropertyBlock materialPropertyBlock;
-		[System.NonSerialized] Renderer particleRenderer;

 		// ================================================================================================================================

@ -494,13 +482,7 @@ namespace CartoonFX
 	#endif
 	#if !DISABLE_CLEAR_BEHAVIOR
 			startFrameOffset = GlobalStartFrameOffset++;
-#endif
-			// Detect if world position needs to be passed to the shader
-			particleRenderer = this.GetComponent<ParticleSystemRenderer>();
-			if (particleRenderer.sharedMaterial != null && particleRenderer.sharedMaterial.IsKeywordEnabled("_CFXR_LIGHTING_WPOS_OFFSET"))
-			{ 
-				materialPropertyBlock = new MaterialPropertyBlock();
-			}
+	#endif
 		}
 #endif

@ -565,12 +547,6 @@ namespace CartoonFX
 				}
 			}
 #endif
-			if (materialPropertyBlock != null)
-			{
-				particleRenderer.GetPropertyBlock(materialPropertyBlock);
-				materialPropertyBlock.SetVector("_GameObjectWorldPosition", this.transform.position);
-				particleRenderer.SetPropertyBlock(materialPropertyBlock);
-			}
 		}
 #endif

@ -692,19 +668,6 @@ namespace CartoonFX
 				return;
 			}

-			var renderer = this.GetComponent<ParticleSystemRenderer>();
-			if (renderer.sharedMaterial != null && renderer.sharedMaterial.IsKeywordEnabled("_CFXR_LIGHTING_WPOS_OFFSET"))
-			{
-				if (materialPropertyBlock == null)
-				{
-					materialPropertyBlock = new MaterialPropertyBlock();
-				}
-
-				renderer.GetPropertyBlock(materialPropertyBlock);
-				materialPropertyBlock.SetVector("_GameObjectWorldPosition", this.transform.position);
-				renderer.SetPropertyBlock(materialPropertyBlock);
-			}
-
 			// Need to track unwrapped time when playing back from Editor
 			// because the parentParticle.time will be reset at each loop
 			float delta = parentParticle.time - particleTime;
--- a/Assets/Scripts/CFXR_ParticleText.cs
+++ b/Assets/Scripts/CFXR_ParticleText.cs
@ -1,419 +1,249 @@
 //--------------------------------------------------------------------------------------------------------------------------------
 // Cartoon FX
-// (c) 2012-2022 Jean Moreno
+// (c) 2012-2020 Jean Moreno
 //--------------------------------------------------------------------------------------------------------------------------------

 using System.Collections.Generic;
 using UnityEngine;
-using Object = UnityEngine.Object;
 #if UNITY_EDITOR
 using UnityEditor;
 #endif

 namespace CartoonFX
 {
-    [RequireComponent(typeof(ParticleSystem))]
-    public class CFXR_ParticleText : MonoBehaviour
-    {
-        [Header("Dynamic")]
-        [Tooltip("Allow changing the text at runtime with the 'UpdateText' method. If disabled, this script will be excluded from the build.")]
-        public bool isDynamic;
-
-        [Header("Text")]
-        [SerializeField] string text;
-        [SerializeField] float size = 1f;
-        [SerializeField] float letterSpacing = 0.44f;
-
-        [Header("Colors")]
-        [SerializeField] Color backgroundColor = new Color(0, 0, 0, 1);
-        [SerializeField] Color color1 = new Color(1, 1, 1, 1);
-        [SerializeField] Color color2 = new Color(0, 0, 1, 1);
-
-        [Header("Delay")]
-        [SerializeField] float delay = 0.05f;
-        [SerializeField] bool cumulativeDelay = false;
-        [Range(0f, 2f)] [SerializeField] float compensateLifetime = 0;
-
-        [Header("Misc")]
-        [SerializeField] float lifetimeMultiplier = 1f;
-        [Range(-90f, 90f)] [SerializeField] float rotation = -5f;
-        [SerializeField] float sortingFudgeOffset = 0.1f;
-#pragma warning disable 0649
-        [SerializeField] CFXR_ParticleTextFontAsset font;
-#pragma warning restore 0649
-
-#if UNITY_EDITOR
-        [HideInInspector] [SerializeField] bool autoUpdateEditor = true;
-
-        void OnValidate()
-        {
-            if (text == null || font == null)
-            {
-                return;
-            }
-
-            // parse text to only allow valid characters
-            List<char> allowed = new List<char>(font.CharSequence.ToCharArray());
-            allowed.Add(' ');
-
-            char[] chars;
-            switch (font.letterCase)
-            {
-                case CFXR_ParticleTextFontAsset.LetterCase.Lower: chars = text.ToLowerInvariant().ToCharArray(); break;
-                case CFXR_ParticleTextFontAsset.LetterCase.Upper: chars = text.ToUpperInvariant().ToCharArray(); break;
-                default:
-                case CFXR_ParticleTextFontAsset.LetterCase.Both: chars = text.ToCharArray(); break;
-            }
-
-            string newText = "";
-            foreach (var c in chars)
-            {
-                if (allowed.Contains(c))
-                {
-                    newText += c;
-                }
-            }
-
-            text = newText;
-
-            // prevent negative or 0 size
-            size = Mathf.Max(0.001f, size);
-
-            // delay so that we are allowed to destroy GameObjects
-            if (autoUpdateEditor && !EditorApplication.isPlayingOrWillChangePlaymode)
-            {
-                EditorApplication.delayCall += () => { UpdateText(null); };
-            }
-        }
-#endif
-
-        void Awake()
-        {
-            if (!isDynamic)
-            {
-                Destroy(this);
-                return;
-            }
-
-            InitializeFirstParticle();
-        }
-
-        float baseLifetime;
-        float baseScaleX;
-        float baseScaleY;
-        float baseScaleZ;
-        Vector3 basePivot;
-
-        void InitializeFirstParticle()
-        {
-            if (isDynamic && this.transform.childCount == 0)
-            {
-                throw new System.Exception("[CFXR_ParticleText] A disabled GameObject with a ParticleSystem component is required as the first child when 'isDyanmic' is enabled, so that its settings can be used as a base for the generated characters.");
-            }
-
-            var ps = isDynamic ? this.transform.GetChild(0).GetComponent<ParticleSystem>() : this.GetComponent<ParticleSystem>();
-            var main = ps.main;
-            baseLifetime = main.startLifetime.constant;
-            baseScaleX = main.startSizeXMultiplier;
-            baseScaleY = main.startSizeYMultiplier;
-            baseScaleZ = main.startSizeZMultiplier;
-            basePivot = ps.GetComponent<ParticleSystemRenderer>().pivot;
-            if (isDynamic)
-            {
-                basePivot.x = 0; // make sure to not offset the text horizontally
-                ps.gameObject.SetActive(false); // ensure first child is inactive
-                ps.gameObject.name = "MODEL";
-            }
-        }
-
-        public void UpdateText(
-            string newText = null,
-            float? newSize = null,
-            Color? newColor1 = null, Color? newColor2 = null, Color? newBackgroundColor = null,
-            float? newLifetimeMultiplier = null
-        )
-        {
-#if UNITY_EDITOR
-            // Only allow updating text for GameObjects that aren't prefabs, since we are possibly destroying/adding GameObjects
-            if (this == null)
-            {
-                return;
-            }
-
-            var prefabInstanceStatus = PrefabUtility.GetPrefabInstanceStatus(this);
-            var prefabAssetType = PrefabUtility.GetPrefabAssetType(this);
-            if (!(prefabInstanceStatus == PrefabInstanceStatus.NotAPrefab && prefabAssetType == PrefabAssetType.NotAPrefab))
-            {
-                return;
-            }
-
-            if (!Application.isPlaying)
-            {
-                InitializeFirstParticle();
-            }
-#endif
-
-            if (Application.isPlaying && !isDynamic)
-            {
-                throw new System.Exception("[CFXR_ParticleText] You cannot update the text at runtime if it's not marked as dynamic.");
-            }
-
-            if (newText != null)
-            {
-                switch (font.letterCase)
-                {
-                    case CFXR_ParticleTextFontAsset.LetterCase.Lower:
-                        newText = newText.ToLowerInvariant();
-                        break;
-                    case CFXR_ParticleTextFontAsset.LetterCase.Upper:
-                        newText = newText.ToUpperInvariant();
-                        break;
-                }
-
-                // Verify that new text doesn't contain invalid characters
-                foreach (char c in newText)
-                {
-                    if (char.IsWhiteSpace(c)) continue;
-                    if (font.CharSequence.IndexOf(c) < 0)
-                    {
-                        throw new System.Exception("[CFXR_ParticleText] Invalid character supplied for the dynamic text: '" + c + "'\nThe allowed characters from the selected font are: " + font.CharSequence);
-                    }
-                }
-
-                this.text = newText;
-            }
-
-            if (newSize != null) this.size = newSize.Value;
-            if (newColor1 != null) this.color1 = newColor1.Value;
-            if (newColor2 != null) this.color2 = newColor2.Value;
-            if (newBackgroundColor != null) this.backgroundColor = newBackgroundColor.Value;
-            if (newLifetimeMultiplier != null) this.lifetimeMultiplier = newLifetimeMultiplier.Value;
-
-            if (text == null || font == null || !font.IsValid())
-            {
-                return;
-            }
-
-            if (this.transform.childCount == 0)
-            {
-                throw new System.Exception("[CFXR_ParticleText] A disabled GameObject with a ParticleSystem component is required as the first child when 'isDyanmic' is enabled, so that its settings can be used as a base for the generated characters.");
-            }
-
-            // process text and calculate total width offset
-            float totalWidth = 0f;
-            int charCount = 0;
-            for (int i = 0; i < text.Length; i++)
-            {
-                if (char.IsWhiteSpace(text[i]))
-                {
-                    if (i > 0)
-                    {
-                        totalWidth += letterSpacing * size;
-                    }
-                }
-                else
-                {
-                    charCount++;
-
-                    if (i > 0)
-                    {
-                        int index = font.CharSequence.IndexOf(text[i]);
-                        var sprite = font.CharSprites[index];
-                        float charWidth = sprite.rect.width + font.CharKerningOffsets[index].post + font.CharKerningOffsets[index].pre;
-                        totalWidth += (charWidth * 0.01f + letterSpacing) * size;
-                    }
-                }
-            }
-
-#if UNITY_EDITOR
-            // delete all children in editor, to make sure we refresh the particle systems based on the first one
-            if (!Application.isPlaying)
-            {
-                int length = this.transform.childCount;
-                int overflow = 0;
-                while (this.transform.childCount > 1)
-                {
-                    Object.DestroyImmediate(this.transform.GetChild(this.transform.childCount - 1).gameObject);
-                    overflow++;
-                    if (overflow > 1000)
-                    {
-                        // just in case...
-                        Debug.LogError("Overflow!");
-                        break;
-                    }
-                }
-            }
-#endif
-
-            if (charCount > 0)
-            {
-                // calculate needed instances
-                int childCount = this.transform.childCount - (isDynamic ? 1 : 0); // first one is the particle source and always deactivated
-                if (childCount < charCount)
-                {
-                    // instantiate new letter GameObjects if needed
-                    GameObject model = isDynamic ? this.transform.GetChild(0).gameObject : null;
-                    for (int i = childCount; i < charCount; i++)
-                    {
-                        var newLetter = isDynamic ? Instantiate(model, this.transform) : new GameObject();
-                        if (!isDynamic)
-                        {
-                            newLetter.transform.SetParent(this.transform);
-                            newLetter.AddComponent<ParticleSystem>();
-                        }
-
-                        newLetter.transform.localPosition = Vector3.zero;
-                        newLetter.transform.localRotation = Quaternion.identity;
-                    }
-                }
-
-                // update each letter
-                float offset = totalWidth / 2f;
-                totalWidth = 0f;
-                int currentChild = isDynamic ? 0 : -1;
-
-                // when not dynamic, we use CopySerialized to propagate the settings to the instances
-                var sourceParticle = isDynamic ? null : this.GetComponent<ParticleSystem>();
-                var sourceParticleRenderer = this.GetComponent<ParticleSystemRenderer>();
-
-                for (int i = 0; i < text.Length; i++)
-                {
-                    var letter = text[i];
-                    if (char.IsWhiteSpace(letter))
-                    {
-                        totalWidth += letterSpacing * size;
-                    }
-                    else
-                    {
-                        currentChild++;
-                        int index = font.CharSequence.IndexOf(text[i]);
-                        var sprite = font.CharSprites[index];
-
-                        // calculate char particle size ratio
-                        var ratio = size * sprite.rect.width / 50f;
-
-                        // calculate char position
-                        totalWidth += font.CharKerningOffsets[index].pre * 0.01f * size;
-                        var position = (totalWidth - offset) / ratio;
-                        float charWidth = sprite.rect.width + font.CharKerningOffsets[index].post;
-                        totalWidth += (charWidth * 0.01f + letterSpacing) * size;
-
-                        // update particle system for this letter
-                        var letterObj = this.transform.GetChild(currentChild).gameObject;
-                        letterObj.name = letter.ToString();
-                        var ps = letterObj.GetComponent<ParticleSystem>();
-#if UNITY_EDITOR
-                        if (!isDynamic)
-                        {
-                            EditorUtility.CopySerialized(sourceParticle, ps);
-                            ps.gameObject.SetActive(true);
-                        }
-#endif
-
-                        var mainModule = ps.main;
-                        mainModule.startSizeXMultiplier = baseScaleX * ratio;
-                        mainModule.startSizeYMultiplier = baseScaleY * ratio;
-                        mainModule.startSizeZMultiplier = baseScaleZ * ratio;
-
-                        ps.textureSheetAnimation.SetSprite(0, sprite);
-
-                        mainModule.startRotation = Mathf.Deg2Rad * rotation;
-                        mainModule.startColor = backgroundColor;
-
-                        var customData = ps.customData;
-                        customData.enabled = true;
-                        customData.SetColor(ParticleSystemCustomData.Custom1, color1);
-                        customData.SetColor(ParticleSystemCustomData.Custom2, color2);
-
-                        if (cumulativeDelay)
-                        {
-                            mainModule.startDelay = delay * i;
-                            mainModule.startLifetime = Mathf.LerpUnclamped(baseLifetime, baseLifetime + (delay * (text.Length - i)), compensateLifetime / lifetimeMultiplier);
-                        }
-                        else
-                        {
-                            mainModule.startDelay = delay;
-                        }
-
-                        mainModule.startLifetime = mainModule.startLifetime.constant * lifetimeMultiplier;
-
-                        // particle system renderer parameters
-                        var particleRenderer = ps.GetComponent<ParticleSystemRenderer>();
-#if UNITY_EDITOR
-                        if (!isDynamic)
-                        {
-                            EditorUtility.CopySerialized(sourceParticleRenderer, particleRenderer);
-                        }
-#endif
-
-                        particleRenderer.enabled = true;
-                        particleRenderer.pivot = new Vector3(basePivot.x + position, basePivot.y, basePivot.z);
-                        particleRenderer.sortingFudge += i * sortingFudgeOffset;
-                    }
-                }
-            }
-
-            // set active state for needed letters only
-            for (int i = 1, l = this.transform.childCount; i < l; i++)
-            {
-                this.transform.GetChild(i).gameObject.SetActive(i <= charCount);
-            }
-
+	[RequireComponent(typeof(ParticleSystem))]
+	public class CFXR_ParticleText : MonoBehaviour
+	{
 #if UNITY_EDITOR
-            // automatically play the effect in Editor
-            if (!Application.isPlaying)
-            {
-                this.GetComponent<ParticleSystem>().Clear(true);
-                this.GetComponent<ParticleSystem>().Play(true);
-            }
+		[Header("Text")]
+		public string text;
+		public float size = 1f;
+		public float letterSpacing = 0.44f;
+
+		[Header("Colors")]
+		public Color backgroundColor = new Color(0, 0, 0, 1);
+		public Color color1 = new Color(1, 1, 1, 1);
+		public Color color2 = new Color(0, 0, 1, 1);
+
+		[Header("Delay")]
+		public float delay = 0.05f;
+		public bool cumulativeDelay = false;
+		[Range(0f, 2f)] public float compensateLifetime = 0;
+
+		[Header("Misc")]
+		public float lifetimeMultiplier = 1f;
+		[Range(-90f, 90f)] public float rotation = -5f;
+		public float sortingFudgeOffset = 0.1f;
+		public CFXR_ParticleTextFontAsset font;
+		public KeyCode refreshTextKey = KeyCode.R;
+
+		void OnValidate()
+		{
+			this.hideFlags = HideFlags.DontSaveInBuild;
+
+			if (text == null || font == null)
+			{
+				return;
+			}
+
+			// parse text to only allow valid characters
+			List<char> allowed = new List<char>(font.CharSequence.ToCharArray());
+			allowed.Add(' ');
+			var chars = text.ToUpperInvariant().ToCharArray();
+			string newText = "";
+			foreach (var c in chars)
+			{
+				if (allowed.Contains(c))
+				{
+					newText += c;
+				}
+			}
+			text = newText;
+
+			// prevent negative or 0 size
+			size = Mathf.Max(0.001f, size);
+		}
+
+		public void GenerateText()
+		{
+			if (text == null || font == null || !font.IsValid())
+				return;
+
+			// delete all children
+			int length = this.transform.childCount;
+			int overflow = 0;
+			while (this.transform.childCount > 0)
+			{
+				Object.DestroyImmediate(this.transform.GetChild(0).gameObject);
+				overflow++;
+				if (overflow > 1000)
+				{
+					// just in case...
+					Debug.LogError("Overflow!");
+					break;
+				}
+			}
+
+			// create one particle per character
+			if (!string.IsNullOrEmpty(text))
+			{
+				// calculate total width offset
+				float totalWidth = 0f;
+				for (int i = 1; i < text.Length; i++)
+				{
+					if (char.IsWhiteSpace(text[i]))
+					{
+						totalWidth += letterSpacing * size;
+					}
+					else
+					{
+						int index = font.CharSequence.IndexOf(text[i]);
+						var sprite = font.CharSprites[index];
+						float charWidth = sprite.rect.width + font.CharKerningOffsets[index].post + font.CharKerningOffsets[index].pre;
+						totalWidth += (charWidth * 0.01f + letterSpacing) * size;
+					}
+				}
+
+				float offset = totalWidth/2f;
+				totalWidth = 0f;
+				for (int i = 0; i < text.Length; i++)
+				{
+					var letter = text[i];
+					if (char.IsWhiteSpace(letter))
+					{
+						totalWidth += letterSpacing * size;
+					}
+					else
+					{
+						int index = font.CharSequence.IndexOf(text[i]);
+						var sprite = font.CharSprites[index];
+
+						// calculate char particle size ratio
+						var ratio = size * sprite.rect.width/50f;
+
+						// calculate char position
+						totalWidth += font.CharKerningOffsets[index].pre * 0.01f * size;
+						var position = (totalWidth-offset)/ratio;
+						float charWidth = sprite.rect.width + font.CharKerningOffsets[index].post;
+						totalWidth += (charWidth * 0.01f + letterSpacing) * size;
+
+						// create gameobject with particle system
+						var letterObj = new GameObject(letter.ToString(), typeof(ParticleSystem));
+						letterObj.transform.SetParent(this.transform);
+						letterObj.transform.localPosition = Vector3.zero;
+						letterObj.transform.localRotation = Quaternion.identity;
+
+						var ps = letterObj.GetComponent<ParticleSystem>();
+						var sourceParticle = this.GetComponent<ParticleSystem>();
+						EditorUtility.CopySerialized(sourceParticle, ps);
+						letterObj.name = letter.ToString();
+
+						// set particle system parameters
+						var main = ps.main;
+						main.startSizeXMultiplier *= ratio;
+						main.startSizeYMultiplier *= ratio;
+						main.startSizeZMultiplier *= ratio;
+
+						ps.textureSheetAnimation.SetSprite(0, sprite);
+
+						main.startRotation = Mathf.Deg2Rad * rotation;
+						main.startColor = backgroundColor;
+
+						var cd = ps.customData;
+						cd.enabled = true;
+						cd.SetColor(ParticleSystemCustomData.Custom1, color1);
+						cd.SetColor(ParticleSystemCustomData.Custom2, color2);
+
+						if (cumulativeDelay)
+						{
+							main.startDelay = delay * i;
+							main.startLifetime = Mathf.LerpUnclamped(main.startLifetime.constant, main.startLifetime.constant + (delay * (text.Length-i)), compensateLifetime);
+						}
+						else
+						{
+							main.startDelay = delay;
+						}
+						main.startLifetime = main.startLifetime.constant * lifetimeMultiplier;
+
+						// particle system renderer parameters
+						var psr = ps.GetComponent<ParticleSystemRenderer>();
+						var sourceParticleRenderer = this.GetComponent<ParticleSystemRenderer>();
+						EditorUtility.CopySerialized(sourceParticleRenderer, psr);
+						psr.enabled = true;
+						psr.pivot = new Vector3(psr.pivot.x + position, psr.pivot.y, psr.pivot.z);
+						psr.sortingFudge += i * sortingFudgeOffset;
+					}
+				}
+			}
+
+			// restart particle system
+			updateFrame = 0;
+			if (!editorUpdateSubscribed)
+			{
+				editorUpdateSubscribed = true;
+				EditorApplication.update += RestartParticleSystem;
+			}
+		}
+
+		int updateFrame = 0;
+		bool editorUpdateSubscribed = false;
+		void RestartParticleSystem()
+		{
+			var particleSystem = this.GetComponent<ParticleSystem>();
+
+			if (updateFrame == 0)
+			{
+				particleSystem.Play(true);
+			}
+			else if (updateFrame == 5)
+			{
+				particleSystem.time = 0f;
+				EditorApplication.update -= RestartParticleSystem;
+				editorUpdateSubscribed = false;
+			}
+
+			updateFrame++;
+		}
 #endif
-        }
-    }
+	}

 #if UNITY_EDITOR
-    [CustomEditor(typeof(CFXR_ParticleText))]
-    public class ParticleTextEditor : Editor
-    {
-        CFXR_ParticleText CastTarget
-        {
-            get { return (CFXR_ParticleText) this.target; }
-        }
-
-        GUIContent GUIContent_AutoUpdateToggle = new GUIContent("Auto-update", "Automatically regenerate the text when a property is changed.");
-        GUIContent GUIContent_UpdateTextButton = new GUIContent(" Update Text ", "Regenerate the text and create new letter GameObjects if needed.");
-
-        public override void OnInspectorGUI()
-        {
-            var prefab = PrefabUtility.GetPrefabInstanceStatus(target);
-            if (prefab != PrefabInstanceStatus.NotAPrefab)
-            {
-                EditorGUILayout.HelpBox("Cartoon FX Particle Text doesn't work on Prefab Instances, as it needs to destroy/create children GameObjects.\nYou can right-click on the object, and select \"Unpack Prefab\" to make it an independent Game Object.",
-                    MessageType.Warning);
-                return;
-            }
-
-            base.OnInspectorGUI();
-
-            serializedObject.Update();
-            SerializedProperty autoUpdateBool = serializedObject.FindProperty("autoUpdateEditor");
-
-            GUILayout.Space(8);
-            GUILayout.BeginHorizontal();
-            {
-                GUILayout.FlexibleSpace();
-                autoUpdateBool.boolValue = GUILayout.Toggle(autoUpdateBool.boolValue, GUIContent_AutoUpdateToggle, GUILayout.Height(30));
-                if (GUILayout.Button(GUIContent_UpdateTextButton, GUILayout.Height(30)))
-                {
-                    CastTarget.UpdateText(null);
-                }
-            }
-            GUILayout.EndHorizontal();
-
-            if (GUI.changed)
-            {
-                serializedObject.ApplyModifiedProperties();
-            }
-        }
-    }
+	[CustomEditor(typeof(CFXR_ParticleText))]
+	public class ParticleTextEditor : Editor
+	{
+		public override void OnInspectorGUI()
+		{
+			var prefab = PrefabUtility.GetPrefabInstanceStatus(target);
+			if (prefab != PrefabInstanceStatus.NotAPrefab)
+			{
+				EditorGUILayout.HelpBox("Cartoon FX Particle Text doesn't work on Prefab Instances, as it needs to destroy/create children GameObjects.\nYou can right-click on the object, and select \"Unpack Prefab Completely\" to make it an independent Game Object.",
+					MessageType.Warning);
+				return;
+			}
+
+			base.OnInspectorGUI();
+
+			GUILayout.Space(8);
+			GUILayout.BeginHorizontal();
+			GUILayout.FlexibleSpace();
+			bool refresh = GUILayout.Button(" Refresh Text ", GUILayout.Height(30)) || GUI.changed;
+			GUILayout.EndHorizontal();
+
+			if (((CFXR_ParticleText)target).refreshTextKey != KeyCode.None && Event.current.type == EventType.KeyDown)
+			{
+				if (Event.current.keyCode == ((CFXR_ParticleText)target).refreshTextKey)
+				{
+					Event.current.Use();
+					refresh = true;
+				}
+			}
+
+			if (refresh)
+			{
+				Undo.RecordObject(this.target, "Generate Particle Text");
+				(this.target as CFXR_ParticleText).GenerateText();
+			}
+		}
+	}
 #endif
 }
--- a/Assets/Scripts/CFXR_ParticleTextFontAsset.cs
+++ b/Assets/Scripts/CFXR_ParticleTextFontAsset.cs
@ -14,15 +14,8 @@ namespace CartoonFX
 {
 	public class CFXR_ParticleTextFontAsset : ScriptableObject
 	{
-		public enum LetterCase
-		{
-			Both,
-			Upper,
-			Lower
-		}
-
+#if UNITY_EDITOR
 		public string CharSequence = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789!?-.#@$ ";
-		public LetterCase letterCase = LetterCase.Upper;
 		public Sprite[] CharSprites;
 		public Kerning[] CharKerningOffsets;

@ -36,7 +29,7 @@ namespace CartoonFX

 		void OnValidate()
 		{
-			this.hideFlags = HideFlags.None;
+			this.hideFlags = HideFlags.DontSaveInBuild;

 			if (CharKerningOffsets == null || CharKerningOffsets.Length != CharSequence.Length)
 			{
@ -60,8 +53,7 @@ namespace CartoonFX
 			return valid;
 		}

-#if UNITY_EDITOR
-		// [MenuItem("Tools/Create font asset")]
+		[MenuItem("Tools/Create font asset")]
 		static void CreateFontAsset()
 		{
 			var instance = CreateInstance<CFXR_ParticleTextFontAsset>();
--- a/Assets/CFXR_Demo.cs
+++ b/Assets/CFXR_Demo.cs
@ -5,7 +5,6 @@

 using System.Collections.Generic;
 using UnityEngine;
-using UnityEngine.Rendering;
 using UnityEngine.UI;

 namespace CartoonFX
@ -117,13 +116,11 @@ namespace CartoonFX
 		public Text labelEffect;
 		public Text labelIndex;
 		[Space]
-		public GameObject groundURP;
-		public GameObject groundBIRP;
-		GameObject ground;
+		public GameObject ground;
+		public Collider groundCollider;
 		public Transform demoCamera;
 		public MonoBehaviour bloom;
 		public float rotationSpeed = 10f;
-		public float zoomFactor = 1f;

 		bool slowMotion = false;
 		bool rotateCamera = false;
@ -131,8 +128,8 @@ namespace CartoonFX

 		//----------------------------------------------------------------------------------------------------------------------------

-		[System.NonSerialized] public GameObject currentEffect;
 		GameObject[] effectsList;
+		GameObject currentEffect;
 		int index = 0;

 		Vector3 camInitialPosition;
@ -146,21 +143,12 @@ namespace CartoonFX
 			var list = new List<GameObject>();
 			for (int i = 0; i < this.transform.childCount; i++)
 			{
-				var effect = this.transform.GetChild(i).gameObject;
-				list.Add(effect);
-
-				var cfxrEffect= effect.GetComponent<CFXR_Effect>();
-				if (cfxrEffect != null) cfxrEffect.clearBehavior = CFXR_Effect.ClearBehavior.Disable;
+				list.Add(this.transform.GetChild(i).gameObject);
 			}
 			effectsList = list.ToArray();

 			PlayAtIndex();
 			UpdateLabels();
-
-			bool isURP = GraphicsSettings.currentRenderPipeline != null;
-			ground = isURP ? groundURP : groundBIRP;
-			groundURP.SetActive(isURP);
-			groundBIRP.SetActive(!isURP);
 		}

 		void Update()
@ -238,11 +226,11 @@ namespace CartoonFX
 			float scroll = Input.GetAxis("Mouse ScrollWheel");
 			if (scroll != 0f)
 			{
-				Camera.main.transform.Translate(Vector3.forward * (scroll < 0f ? -1f : 1f) * zoomFactor, Space.Self);
+				Camera.main.transform.Translate(Vector3.forward * (scroll < 0f ? -1f : 1f), Space.Self);
 			}
 		}

-		public void PlayAtIndex()
+		void PlayAtIndex()
 		{
 			if (currentEffect != null)
 			{
--- a/Assets/Cartoon
+++ b/Assets/Cartoon
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2076145b3bfdcca4193bfd3effd1400f
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Cartoon
+++ b/Assets/Cartoon
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 086093bf5c1cde94a82a35d3a10ed3cb
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/(Mobile)/Ice.meta
+++ b/(Mobile)/Ice.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3e4d2179e984b8a40ae871f7f984ce54
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/(Mobile)/Ice/CFXM3_IceBall_B.prefab
+++ b/(Mobile)/Ice/CFXM3_IceBall_B.prefab
--- a/(Mobile)/Ice/CFXM3_IceBall_B.prefab.meta
+++ b/(Mobile)/Ice/CFXM3_IceBall_B.prefab.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 0c6b44bc1c4ff034b907d51d04682992
+timeCreated: 1504799664
+licenseType: Store
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/(Mobile)/Ice/CFXM3_Ice_Shield.prefab
+++ b/(Mobile)/Ice/CFXM3_Ice_Shield.prefab
--- a/(Mobile)/Ice/CFXM3_Ice_Shield.prefab.meta
+++ b/(Mobile)/Ice/CFXM3_Ice_Shield.prefab.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: d9ff999f14db2c44ea3d654f7f7304ab
+timeCreated: 1504799663
+licenseType: Store
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Cartoon
+++ b/Assets/Cartoon
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7b6bf11867d5895459390f7a4fb45b5e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Prefabs/Electric.meta
+++ b/Prefabs/Electric.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a6ef903b479ca2645b849fa01c6a7d63
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Prefabs/Electric/CFX3_Hit_Electric_B_Air.prefab
+++ b/Prefabs/Electric/CFX3_Hit_Electric_B_Air.prefab
--- a/Prefabs/Electric/CFX3_Hit_Electric_B_Air.prefab.meta
+++ b/Prefabs/Electric/CFX3_Hit_Electric_B_Air.prefab.meta
@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: ddc205c0c8c9eca43be1bdcb38ef42e7
+timeCreated: 1504707645
+licenseType: Store
+NativeFormatImporter:
+  mainObjectFileID: 100100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Prefabs/Fire.meta
+++ b/Prefabs/Fire.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e3618e313855e4f40a25641960b2326e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Prefabs/Fire/CFX3_Fireball_A.prefab
+++ b/Prefabs/Fire/CFX3_Fireball_A.prefab
--- a/Prefabs/Fire/CFX3_Fireball_A.prefab.meta
+++ b/Prefabs/Fire/CFX3_Fireball_A.prefab.meta
@ -0,0 +1,10 @@
+fileFormatVersion: 2
+guid: 8d630e3da9ae7674d95c236d1daf8b79
+labels:
+- CartoonFX
+- Toon
+- Particles
+- Ball
+- Fire
+NativeFormatImporter:
+  userData: 
--- a/Assets/Cartoon
+++ b/Assets/Cartoon
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 472d68cea808e2e4ba2a8d7b9ea3b6ff
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/FX/Demo/Assets.meta
+++ b/FX/Demo/Assets.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 26bca93eeb22b2946a9e4a559e4cb465
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/FX/Demo/Assets/CFX2_Demo.cs
+++ b/FX/Demo/Assets/CFX2_Demo.cs
@ -0,0 +1,148 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+// Script handling the Demo scene of CartoonFX particles.
+public class CFX2_Demo : MonoBehaviour
+{
+	public bool orderedSpawns = true;
+	public float step = 1.0f;
+	public float range = 5.0f;
+	private float order = -5.0f;
+	
+	public Material groundMat, waterMat;
+	public GameObject[] ParticleExamples;
+	
+	private int exampleIndex;
+	private string randomSpawnsDelay = "0.5";
+	private bool randomSpawns;
+	
+	private bool slowMo;
+	
+	void OnMouseDown()
+	{
+		RaycastHit hit = new RaycastHit();
+		if(this.GetComponent<Collider>().Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out hit, 9999f))
+		{
+			GameObject particle = spawnParticle();
+			particle.transform.position = hit.point + particle.transform.position;
+		}
+	}
+	
+	private GameObject spawnParticle()
+	{
+		GameObject particles = (GameObject)Instantiate(ParticleExamples[exampleIndex]);
+		particles.transform.position = new Vector3(0,particles.transform.position.y,0);
+		#if UNITY_3_5
+			particles.SetActiveRecursively(true);
+		#else
+			particles.SetActive(true);
+			for(int i = 0; i < particles.transform.childCount; i++)
+				particles.transform.GetChild(i).gameObject.SetActive(true);
+		#endif
+		
+		return particles;
+	}
+	
+	void OnGUI()
+	{
+		GUILayout.BeginArea(new Rect(5,20,Screen.width-10,60));
+		
+		GUILayout.BeginHorizontal();
+		GUILayout.Label("Effect");
+		if(GUILayout.Button("<"))
+		{
+			prevParticle();
+		}
+		GUILayout.Label(ParticleExamples[exampleIndex].name, GUILayout.Width(210));
+		if(GUILayout.Button(">"))
+		{
+			nextParticle();
+		}
+		
+		GUILayout.Label("Click on the ground to spawn selected particles", GUILayout.Width(150));
+		
+		if(GUILayout.Button(CFX_Demo_RotateCamera.rotating ? "Pause Camera" : "Rotate Camera"))
+		{
+			CFX_Demo_RotateCamera.rotating = !CFX_Demo_RotateCamera.rotating;
+		}
+		
+		if(GUILayout.Button(randomSpawns ? "Stop Random Spawns" : "Start Random Spawns", GUILayout.Width(140)))
+		{
+			randomSpawns = !randomSpawns;
+			if(randomSpawns)	StartCoroutine("RandomSpawnsCoroutine");
+			else 				StopCoroutine("RandomSpawnsCoroutine");
+		}
+		
+		randomSpawnsDelay = GUILayout.TextField(randomSpawnsDelay, 10, GUILayout.Width(42));
+		randomSpawnsDelay = Regex.Replace(randomSpawnsDelay, @"[^0-9.]", "");
+		
+		if(GUILayout.Button(this.GetComponent<Renderer>().enabled ? "Hide Ground" : "Show Ground", GUILayout.Width(90)))
+		{
+			this.GetComponent<Renderer>().enabled = !this.GetComponent<Renderer>().enabled;
+		}
+		
+		if(GUILayout.Button(slowMo ? "Normal Speed" : "Slow Motion", GUILayout.Width(100)))
+		{
+			slowMo = !slowMo;
+			if(slowMo)	Time.timeScale = 0.33f;
+			else  		Time.timeScale = 1.0f;
+		}
+		
+		GUILayout.EndHorizontal();
+		GUILayout.EndArea();
+	}
+	
+	IEnumerator RandomSpawnsCoroutine()
+	{
+		
+	LOOP:
+		GameObject particles = spawnParticle();
+		
+		if(orderedSpawns)
+		{
+			particles.transform.position = this.transform.position + new Vector3(order,particles.transform.position.y,0);
+			order -= step;
+			if(order < -range) order = range;
+		}
+		else 				particles.transform.position = this.transform.position + new Vector3(Random.Range(-range,range),0,Random.Range(-range,range)) + new Vector3(0,particles.transform.position.y,0);
+		
+		yield return new WaitForSeconds(float.Parse(randomSpawnsDelay));
+		
+		goto LOOP;
+	}
+	
+	void Update()
+	{
+		if(Input.GetKeyDown(KeyCode.LeftArrow))
+		{
+			prevParticle();
+		}
+		else if(Input.GetKeyDown(KeyCode.RightArrow))
+		{
+			nextParticle();
+		}
+	}
+	
+	private void prevParticle()
+	{
+		exampleIndex--;
+		if(exampleIndex < 0) exampleIndex = ParticleExamples.Length - 1;
+		
+		if(ParticleExamples[exampleIndex].name.Contains("Splash") || ParticleExamples[exampleIndex].name.Contains("Skim"))
+			this.GetComponent<Renderer>().material = waterMat;
+		else
+			this.GetComponent<Renderer>().material = groundMat;
+	}
+	private void nextParticle()
+	{
+		exampleIndex++;
+		if(exampleIndex >= ParticleExamples.Length) exampleIndex = 0;
+		
+		if(ParticleExamples[exampleIndex].name.Contains("Splash") || ParticleExamples[exampleIndex].name.Contains("Skim"))
+			this.GetComponent<Renderer>().material = waterMat;
+		else
+			this.GetComponent<Renderer>().material = groundMat;
+	}
+}
--- a/FX/Demo/Assets/CFX2_Demo.cs.meta
+++ b/FX/Demo/Assets/CFX2_Demo.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: b89446a500d6ec54788d5bd056a68979
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/FX/Demo/Assets/CFX_AutoStopLoopedEffect.cs
+++ b/FX/Demo/Assets/CFX_AutoStopLoopedEffect.cs
@ -0,0 +1,38 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+// Cartoon FX  - (c) 2015 Jean Moreno
+//
+// Script handling looped effect in the Demo Scene, so that they eventually stop
+
+[RequireComponent(typeof(ParticleSystem))]
+public class CFX_AutoStopLoopedEffect : MonoBehaviour
+{
+	public float effectDuration = 2.5f;
+	private float d;
+	
+	void OnEnable()
+	{
+		d = effectDuration;
+	}
+	
+	void Update()
+	{
+		if(d > 0)
+		{
+			d -= Time.deltaTime;
+			if(d <= 0)
+			{
+				this.GetComponent<ParticleSystem>().Stop(true);
+				
+				CFX_Demo_Translate translation = this.gameObject.GetComponent<CFX_Demo_Translate>();
+				if(translation != null)
+				{
+					translation.enabled = false;
+				}
+			}
+		}
+	}
+}
--- a/FX/Demo/Assets/CFX_AutoStopLoopedEffect.cs.meta
+++ b/FX/Demo/Assets/CFX_AutoStopLoopedEffect.cs.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d9c4e89389fa607479b0744ec6611490
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
--- a/FX/Demo/Assets/CFX_Demo.cs
+++ b/FX/Demo/Assets/CFX_Demo.cs
@ -0,0 +1,191 @@
+using UnityEngine;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+// Cartoon FX  - (c) 2015 Jean Moreno
+
+// Script handling the Demo scene of CartoonFX particles.
+
+public class CFX_Demo : MonoBehaviour
+{
+	public bool orderedSpawns = true;
+	public float step = 1.0f;
+	public float range = 5.0f;
+	private float order = -5.0f;
+	
+	public Material groundMat, waterMat;
+	public GameObject[] ParticleExamples;
+	
+	private Dictionary<string,float> ParticlesYOffsetD = new Dictionary<string, float>
+	{
+		{"CFX_ElectricGround", 0.15f},
+		{"CFX_ElectricityBall", 1.0f},
+		{"CFX_ElectricityBolt", 1.0f},
+		{"CFX_Explosion", 2.0f},
+		{"CFX_SmallExplosion", 1.5f},
+		{"CFX_SmokeExplosion", 2.5f},
+		{"CFX_Flame", 1.0f},
+		{"CFX_DoubleFlame", 1.0f},
+		{"CFX_Hit", 1.0f},
+		{"CFX_CircularLightWall", 0.05f},
+		{"CFX_LightWall", 0.05f},
+		{"CFX_Flash", 2.0f},
+		{"CFX_Poof", 1.5f},
+		{"CFX_Virus", 1.0f},
+		{"CFX_SmokePuffs", 2.0f},
+		{"CFX_Slash", 1.0f},
+		{"CFX_Splash", 0.05f},
+		{"CFX_Fountain", 0.05f},
+		{"CFX_Ripple", 0.05f},
+		{"CFX_Magic", 2.0f},
+		{"CFX_SoftStar", 1.0f},
+		{"CFX_SpikyAura_Sphere", 1.0f},
+		{"CFX_Firework", 2.4f},
+		{"CFX_GroundA", 0.05f},
+	};
+	
+	private int exampleIndex;
+	private string randomSpawnsDelay = "0.5";
+	private bool randomSpawns;
+	
+	private bool slowMo;
+	
+	void OnMouseDown()
+	{
+		RaycastHit hit = new RaycastHit();
+		if(this.GetComponent<Collider>().Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out hit, 9999f))
+		{
+			GameObject particle = spawnParticle();
+			particle.transform.position = hit.point + particle.transform.position;
+		}
+	}
+	
+	private GameObject spawnParticle()
+	{
+		GameObject particles = (GameObject)Instantiate(ParticleExamples[exampleIndex]);
+		
+		#if UNITY_3_5
+			particles.SetActiveRecursively(true);
+		#else
+			particles.SetActive(true);
+			for(int i = 0; i < particles.transform.childCount; i++)
+				particles.transform.GetChild(i).gameObject.SetActive(true);
+		#endif
+		
+		float Y = 0.0f;
+		foreach(KeyValuePair<string,float> kvp in ParticlesYOffsetD)
+		{
+			if(particles.name.StartsWith(kvp.Key))
+			{
+				Y = kvp.Value;
+				break;
+			}
+		}
+		particles.transform.position = new Vector3(0,Y,0);
+		
+		return particles;
+	}
+	
+	void OnGUI()
+	{
+		GUILayout.BeginArea(new Rect(5,20,Screen.width-10,30));
+		GUILayout.BeginHorizontal();
+		
+		GUILayout.Label("Effect", GUILayout.Width(50));
+		if(GUILayout.Button("<",GUILayout.Width(20)))
+		{
+			prevParticle();
+		}
+		GUILayout.Label(ParticleExamples[exampleIndex].name, GUILayout.Width(190));
+		if(GUILayout.Button(">",GUILayout.Width(20)))
+		{
+			nextParticle();
+		}
+		
+		GUILayout.Label("Click on the ground to spawn selected particles");
+		
+		if(GUILayout.Button(CFX_Demo_RotateCamera.rotating ? "Pause Camera" : "Rotate Camera", GUILayout.Width(140)))
+		{
+			CFX_Demo_RotateCamera.rotating = !CFX_Demo_RotateCamera.rotating;
+		}
+		
+		
+		if(GUILayout.Button(randomSpawns ? "Stop Random Spawns" : "Start Random Spawns", GUILayout.Width(140)))
+		{
+			randomSpawns = !randomSpawns;
+			if(randomSpawns)	StartCoroutine("RandomSpawnsCoroutine");
+			else 				StopCoroutine("RandomSpawnsCoroutine");
+		}
+		
+		randomSpawnsDelay = GUILayout.TextField(randomSpawnsDelay, 10, GUILayout.Width(42));
+		randomSpawnsDelay = Regex.Replace(randomSpawnsDelay, @"[^0-9.]", "");
+		
+		if(GUILayout.Button(this.GetComponent<Renderer>().enabled ? "Hide Ground" : "Show Ground", GUILayout.Width(90)))
+		{
+			this.GetComponent<Renderer>().enabled = !this.GetComponent<Renderer>().enabled;
+		}
+		
+		if(GUILayout.Button(slowMo ? "Normal Speed" : "Slow Motion", GUILayout.Width(100)))
+		{
+			slowMo = !slowMo;
+			if(slowMo)	Time.timeScale = 0.33f;
+			else  		Time.timeScale = 1.0f;
+		}
+		
+		GUILayout.EndHorizontal();
+		GUILayout.EndArea();
+	}
+	
+	IEnumerator RandomSpawnsCoroutine()
+	{
+		
+	LOOP:
+		GameObject particles = spawnParticle();
+		
+		if(orderedSpawns)
+		{
+			particles.transform.position = this.transform.position + new Vector3(order,particles.transform.position.y,0);
+			order -= step;
+			if(order < -range) order = range;
+		}
+		else 				particles.transform.position = this.transform.position + new Vector3(Random.Range(-range,range),0,Random.Range(-range,range)) + new Vector3(0,particles.transform.position.y,0);
+		
+		yield return new WaitForSeconds(float.Parse(randomSpawnsDelay));
+		
+		goto LOOP;
+	}
+	
+	void Update()
+	{
+		if(Input.GetKeyDown(KeyCode.LeftArrow))
+		{
+			prevParticle();
+		}
+		else if(Input.GetKeyDown(KeyCode.RightArrow))
+		{
+			nextParticle();
+		}
+	}
+	
+	private void prevParticle()
+	{
+		exampleIndex--;
+		if(exampleIndex < 0) exampleIndex = ParticleExamples.Length - 1;
+		
+		if(ParticleExamples[exampleIndex].name.Contains("Splash") || ParticleExamples[exampleIndex].name == "CFX_Ripple" || ParticleExamples[exampleIndex].name == "CFX_Fountain")
+			this.GetComponent<Renderer>().material = waterMat;
+		else
+			this.GetComponent<Renderer>().material = groundMat;
+	}
+	private void nextParticle()
+	{
+		exampleIndex++;
+		if(exampleIndex >= ParticleExamples.Length) exampleIndex = 0;
+		
+		if(ParticleExamples[exampleIndex].name.Contains("Splash") || ParticleExamples[exampleIndex].name == "CFX_Ripple" || ParticleExamples[exampleIndex].name == "CFX_Fountain")
+			this.GetComponent<Renderer>().material = waterMat;
+		else
+			this.GetComponent<Renderer>().material = groundMat;
+	}
+}
--- a/FX/Demo/Assets/CFX_Demo.cs.meta
+++ b/FX/Demo/Assets/CFX_Demo.cs.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8469526271e317d469f107c0a3240521
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
--- a/FX/Demo/Assets/CFX_Demo_New.cs
+++ b/FX/Demo/Assets/CFX_Demo_New.cs
@ -0,0 +1,239 @@
+using UnityEngine;
+using UnityEngine.UI;
+using System.Collections;
+using System.Collections.Generic;
+using System.Text.RegularExpressions;
+
+// Cartoon FX - (c) 2015 - Jean Moreno
+//
+// Script handling the Demo scene of the Cartoon FX Packs
+
+public class CFX_Demo_New : MonoBehaviour
+{
+	public Renderer groundRenderer;
+	public Collider groundCollider;
+	[Space]
+	[Space]
+	public Image slowMoBtn;
+	public Text slowMoLabel;
+	public Image camRotBtn;
+	public Text camRotLabel;
+	public Image groundBtn;
+	public Text groundLabel;
+	[Space]
+	public Text EffectLabel;
+	public Text EffectIndexLabel;
+
+	//-------------------------------------------------------------
+
+	private GameObject[] ParticleExamples;
+	private int exampleIndex;
+	private bool slowMo;
+	private Vector3 defaultCamPosition;
+	private Quaternion defaultCamRotation;
+	
+	private List<GameObject> onScreenParticles = new List<GameObject>();
+	
+	//-------------------------------------------------------------
+	
+	void Awake()
+	{
+		List<GameObject> particleExampleList = new List<GameObject>();
+		int nbChild = this.transform.childCount;
+		for(int i = 0; i < nbChild; i++)
+		{
+			GameObject child = this.transform.GetChild(i).gameObject;
+			particleExampleList.Add(child);
+		}
+		particleExampleList.Sort( delegate(GameObject o1, GameObject o2) { return o1.name.CompareTo(o2.name); } );
+		ParticleExamples = particleExampleList.ToArray();
+		
+		defaultCamPosition = Camera.main.transform.position;
+		defaultCamRotation = Camera.main.transform.rotation;
+		
+		StartCoroutine("CheckForDeletedParticles");
+		
+		UpdateUI();
+	}
+	
+	void Update()
+	{
+		if(Input.GetKeyDown(KeyCode.LeftArrow))
+		{
+			prevParticle();
+		}
+		else if(Input.GetKeyDown(KeyCode.RightArrow))
+		{
+			nextParticle();
+		}
+		else if(Input.GetKeyDown(KeyCode.Delete))
+		{
+			destroyParticles();
+		}
+		
+		if(Input.GetMouseButtonDown(0))
+		{
+			RaycastHit hit = new RaycastHit();
+			if(groundCollider.Raycast(Camera.main.ScreenPointToRay(Input.mousePosition), out hit, 9999f))
+			{
+				GameObject particle = spawnParticle();
+				particle.transform.position = hit.point + particle.transform.position;
+			}
+		}
+		
+		float scroll = Input.GetAxis("Mouse ScrollWheel");
+		if(scroll != 0f)
+		{
+			Camera.main.transform.Translate(Vector3.forward * (scroll < 0f ? -1f : 1f), Space.Self);
+		}
+		
+		if(Input.GetMouseButtonDown(2))
+		{
+			Camera.main.transform.position = defaultCamPosition;
+			Camera.main.transform.rotation = defaultCamRotation;
+		}
+	}
+
+	//-------------------------------------------------------------
+	// MESSAGES
+
+	public void OnToggleGround()
+	{
+		var c = Color.white;
+		groundRenderer.enabled = !groundRenderer.enabled;
+		c.a = groundRenderer.enabled ? 1f : 0.33f;
+		groundBtn.color = c;
+		groundLabel.color = c;
+	}
+
+	public void OnToggleCamera()
+	{
+		var c = Color.white;
+		CFX_Demo_RotateCamera.rotating = !CFX_Demo_RotateCamera.rotating;
+		c.a = CFX_Demo_RotateCamera.rotating ? 1f : 0.33f;
+		camRotBtn.color = c;
+		camRotLabel.color = c;
+	}
+	
+	public void OnToggleSlowMo()
+	{
+		var c = Color.white;
+
+		slowMo = !slowMo;
+		if(slowMo)
+		{
+			Time.timeScale = 0.33f;
+			c.a = 1f;
+		}
+		else
+		{
+			Time.timeScale = 1.0f;
+			c.a = 0.33f;
+		}
+
+		slowMoBtn.color = c;
+		slowMoLabel.color = c;
+	}
+
+	public void OnPreviousEffect()
+	{
+		prevParticle();
+	}
+
+	public void OnNextEffect()
+	{
+		nextParticle();
+	}
+	
+	//-------------------------------------------------------------
+	// UI
+	
+	private void UpdateUI()
+	{
+		EffectLabel.text = ParticleExamples[exampleIndex].name;
+		EffectIndexLabel.text = string.Format("{0}/{1}", (exampleIndex+1).ToString("00"), ParticleExamples.Length.ToString("00"));
+	}
+	
+	//-------------------------------------------------------------
+	// SYSTEM
+	
+	private GameObject spawnParticle()
+	{
+		GameObject particles = (GameObject)Instantiate(ParticleExamples[exampleIndex]);
+		particles.transform.position = new Vector3(0,particles.transform.position.y,0);
+		#if UNITY_3_5
+			particles.SetActiveRecursively(true);
+		#else
+			particles.SetActive(true);
+//			for(int i = 0; i < particles.transform.childCount; i++)
+//				particles.transform.GetChild(i).gameObject.SetActive(true);
+		#endif
+		
+		ParticleSystem ps = particles.GetComponent<ParticleSystem>();
+
+#if UNITY_5_5_OR_NEWER
+		if (ps != null)
+		{
+			var main = ps.main;
+			if (main.loop)
+			{
+				ps.gameObject.AddComponent<CFX_AutoStopLoopedEffect>();
+				ps.gameObject.AddComponent<CFX_AutoDestructShuriken>();
+			}
+		}
+#else
+		if(ps != null && ps.loop)
+		{
+			ps.gameObject.AddComponent<CFX_AutoStopLoopedEffect>();
+			ps.gameObject.AddComponent<CFX_AutoDestructShuriken>();
+		}
+#endif
+
+		onScreenParticles.Add(particles);
+		
+		return particles;
+	}
+	
+	IEnumerator CheckForDeletedParticles()
+	{
+		while(true)
+		{
+			yield return new WaitForSeconds(5.0f);
+			for(int i = onScreenParticles.Count - 1; i >= 0; i--)
+			{
+				if(onScreenParticles[i] == null)
+				{
+					onScreenParticles.RemoveAt(i);
+				}
+			}
+		}
+	}
+	
+	private void prevParticle()
+	{
+		exampleIndex--;
+		if(exampleIndex < 0) exampleIndex = ParticleExamples.Length - 1;
+		
+		UpdateUI();
+	}
+	private void nextParticle()
+	{
+		exampleIndex++;
+		if(exampleIndex >= ParticleExamples.Length) exampleIndex = 0;
+		
+		UpdateUI();
+	}
+	
+	private void destroyParticles()
+	{
+		for(int i = onScreenParticles.Count - 1; i >= 0; i--)
+		{
+			if(onScreenParticles[i] != null)
+			{
+				GameObject.Destroy(onScreenParticles[i]);
+			}
+			
+			onScreenParticles.RemoveAt(i);
+		}
+	}
+}
--- a/FX/Demo/Assets/CFX_Demo_New.cs.meta
+++ b/FX/Demo/Assets/CFX_Demo_New.cs.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8b17383a625e88348a99a6eeef772d40
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
--- a/FX/Demo/Assets/CFX_Demo_RandomDir.cs
+++ b/FX/Demo/Assets/CFX_Demo_RandomDir.cs
@ -0,0 +1,16 @@
+using UnityEngine;
+using System.Collections;
+
+// Cartoon FX  - (c) 2015 Jean Moreno
+
+public class CFX_Demo_RandomDir : MonoBehaviour
+{
+	public Vector3 min = new Vector3(0,0,0);
+	public Vector3 max = new Vector3(0,360,0);
+	
+	void Start ()
+	{
+		this.transform.eulerAngles = new Vector3(Random.Range(min.x,max.x),Random.Range(min.y,max.y),Random.Range(min.z,max.z));
+	}
+	
+}
--- a/FX/Demo/Assets/CFX_Demo_RandomDir.cs.meta
+++ b/FX/Demo/Assets/CFX_Demo_RandomDir.cs.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 27666076fd6e86245aa62dfd9e943d6c
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
--- a/FX/Demo/Assets/CFX_Demo_RandomDirectionTranslate.cs
+++ b/FX/Demo/Assets/CFX_Demo_RandomDirectionTranslate.cs
@ -0,0 +1,30 @@
+using UnityEngine;
+using System.Collections;
+
+// Cartoon FX  - (c) 2015 Jean Moreno
+
+public class CFX_Demo_RandomDirectionTranslate : MonoBehaviour
+{
+	public float speed = 30.0f;
+	public Vector3 baseDir = Vector3.zero;
+	public Vector3 axis = Vector3.forward;
+	public bool gravity;
+	private Vector3 dir;
+	
+	void Start ()
+	{
+		dir = new Vector3(Random.Range(0.0f,360.0f),Random.Range(0.0f,360.0f),Random.Range(0.0f,360.0f)).normalized;
+		dir.Scale(axis);
+		dir += baseDir;
+	}
+	
+	void Update ()
+	{
+		this.transform.Translate(dir * speed * Time.deltaTime);
+		
+		if(gravity)
+		{
+			this.transform.Translate(Physics.gravity * Time.deltaTime);
+		}
+	}
+}
--- a/FX/Demo/Assets/CFX_Demo_RandomDirectionTranslate.cs.meta
+++ b/FX/Demo/Assets/CFX_Demo_RandomDirectionTranslate.cs.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 83982eed39974834bada258fbddd1e72
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
--- a/FX/Demo/Assets/CFX_Demo_RotateCamera.cs
+++ b/FX/Demo/Assets/CFX_Demo_RotateCamera.cs
@ -0,0 +1,18 @@
+using UnityEngine;
+using System.Collections;
+
+// Cartoon FX  - (c) 2015 Jean Moreno
+
+public class CFX_Demo_RotateCamera : MonoBehaviour
+{
+	static public bool rotating = true;
+	
+	public float speed = 30.0f;
+	public Transform rotationCenter;
+	
+	void Update ()
+	{
+		if(rotating)
+			transform.RotateAround(rotationCenter.position, Vector3.up, speed*Time.deltaTime);
+	}
+}
--- a/FX/Demo/Assets/CFX_Demo_RotateCamera.cs.meta
+++ b/FX/Demo/Assets/CFX_Demo_RotateCamera.cs.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f71e90e62dfae594490eb4d9b611f930
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
--- a/FX/Demo/Assets/CFX_Demo_Translate.cs
+++ b/FX/Demo/Assets/CFX_Demo_Translate.cs
@ -0,0 +1,25 @@
+using UnityEngine;
+using System.Collections;
+
+// Cartoon FX  - (c) 2015, Jean Moreno
+
+public class CFX_Demo_Translate : MonoBehaviour
+{
+	public float speed = 30.0f;
+	public Vector3 rotation = Vector3.forward;
+	public Vector3 axis = Vector3.forward;
+	public bool gravity;
+	private Vector3 dir;
+	
+	void Start ()
+	{
+		dir = new Vector3(Random.Range(0.0f,360.0f),Random.Range(0.0f,360.0f),Random.Range(0.0f,360.0f));
+		dir.Scale(rotation);
+		this.transform.localEulerAngles = dir;
+	}
+	
+	void Update ()
+	{
+		this.transform.Translate(axis * speed * Time.deltaTime, Space.Self);
+	}
+}
--- a/FX/Demo/Assets/CFX_Demo_Translate.cs.meta
+++ b/FX/Demo/Assets/CFX_Demo_Translate.cs.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1e42ac40a6fba2e4d94a0070ef45cea1
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
--- a/FX/Editor.meta
+++ b/FX/Editor.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 87c964e7d27f4764393e36054e147f1b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/FX/Editor/CFX_InspectorHelpEditor.cs
+++ b/FX/Editor/CFX_InspectorHelpEditor.cs
@ -0,0 +1,65 @@
+#if UNITY_EDITOR
+
+// Cartoon FX  - (c) 2015 Jean Moreno
+
+// Help Component that can be added to any GameObject or Prefab
+//
+// Can be useful if you want to add comments to a particular
+// Prefab or GameObject about its usage
+
+using UnityEngine;
+using UnityEditor;
+using System.Collections;
+
+[CustomEditor(typeof(CFX_InspectorHelp))]
+public class CFX_InspectorHelpEditor : Editor
+{
+	private CFX_InspectorHelp inspHelp { get { return (this.target as CFX_InspectorHelp); } }
+	
+	public override void OnInspectorGUI ()
+	{
+		if(inspHelp.Locked)
+		{
+			ShowHelpGUI();
+		}
+		else
+		{
+			EditorStyles.textField.wordWrap = true;
+			inspHelp.Title = EditorGUILayout.TextField(inspHelp.Title);
+			inspHelp.HelpText = EditorGUILayout.TextArea(inspHelp.HelpText);
+			inspHelp.MsgType = (int)((MessageType)EditorGUILayout.EnumPopup("Message Type", (MessageType)inspHelp.MsgType));
+			
+			EditorGUILayout.HelpBox("Use the contextual menu (right click or cog icon) on this Component to enable editing back", MessageType.Warning);
+			if(GUILayout.Button("Lock Message", GUILayout.Height(30)))
+			{
+				inspHelp.Locked = true;
+			}
+			
+			if(GUI.changed)
+			{
+				EditorUtility.SetDirty(inspHelp);
+			}
+			
+			GUILayout.Space(12);
+			EditorGUILayout.LabelField("MESSAGE PREVIEW:", EditorStyles.largeLabel);
+			
+			ShowHelpGUI();
+		}
+	}
+	
+	private void ShowHelpGUI()
+	{
+		GUILayout.Space(12);
+		
+		if(!string.IsNullOrEmpty(inspHelp.Title))
+		{
+			EditorGUILayout.LabelField(inspHelp.Title, EditorStyles.boldLabel);
+		}
+		
+		EditorGUILayout.HelpBox(inspHelp.HelpText, (MessageType)inspHelp.MsgType);
+		
+		GUILayout.Space(12);
+	}
+}
+
+#endif
--- a/FX/Editor/CFX_InspectorHelpEditor.cs.meta
+++ b/FX/Editor/CFX_InspectorHelpEditor.cs.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5fefbc813de49524d89e5fcce98dc957
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
--- a/FX/Editor/CFX_SpawnSystemEditor.cs
+++ b/FX/Editor/CFX_SpawnSystemEditor.cs
@ -0,0 +1,193 @@
+using UnityEngine;
+using UnityEditor;
+using System.Collections;
+
+// Cartoon FX  - (c) 2012-2016 Jean Moreno
+
+// CFX Spawn System Editor interface
+
+[CustomEditor(typeof(CFX_SpawnSystem))]
+public class CFX_SpawnSystemEditor : Editor
+{
+	private SerializedProperty _hideObjectsInHierarchy;
+	private SerializedProperty p_hideObjectsInHierarchy
+	{
+		get
+		{
+			if(_hideObjectsInHierarchy == null)
+				_hideObjectsInHierarchy = this.serializedObject.FindProperty("hideObjectsInHierarchy");
+			return _hideObjectsInHierarchy;
+		}
+	}
+
+	private SerializedProperty _onlyGetInactiveObjects;
+	private SerializedProperty p_onlyGetInactiveObjects
+	{
+		get
+		{
+			if(_onlyGetInactiveObjects == null)
+				_onlyGetInactiveObjects = this.serializedObject.FindProperty("onlyGetInactiveObjects");
+			return _onlyGetInactiveObjects;
+		}
+	}
+
+	private SerializedProperty _instantiateIfNeeded;
+	private SerializedProperty p_instantiateIfNeeded
+	{
+		get
+		{
+			if(_instantiateIfNeeded == null)
+				_instantiateIfNeeded = this.serializedObject.FindProperty("instantiateIfNeeded");
+			return _instantiateIfNeeded;
+		}
+	}
+
+	private SerializedProperty _spawnAsChildren;
+	private SerializedProperty p_spawnAsChildren
+	{
+		get
+		{
+			if(_spawnAsChildren == null)
+				_spawnAsChildren = this.serializedObject.FindProperty("spawnAsChildren");
+			return _spawnAsChildren;
+		}
+	}
+
+	private GUIContent guiContent = new GUIContent();
+	private GUIContent getGuiContent(string label, string tooltip = null)
+	{
+		guiContent.text = label;
+		guiContent.tooltip = tooltip;
+		return guiContent;
+	}
+
+	// GUI ----------------------------------------------------------------------------------------------------------------------------------------------------
+
+	public override void OnInspectorGUI()
+	{
+		//Options
+		EditorGUI.BeginChangeCheck();
+
+#if UNITY_4_2
+		EditorGUIUtility.LookLikeControls(230f);
+#else
+		float labelWidth = EditorGUIUtility.labelWidth;
+		EditorGUIUtility.labelWidth = 230f;
+#endif
+
+		EditorGUILayout.PropertyField(p_hideObjectsInHierarchy, getGuiContent("Hide preloaded objects in Hierarchy", "Will prevent the preloaded instances to show in the Hierarchy"));
+		EditorGUILayout.PropertyField(p_spawnAsChildren, getGuiContent("Spawn as children of this GameObject", "Will place the preloaded instances under this GameObject, for better organization of the Hierarchy"));
+
+		EditorGUILayout.PropertyField(p_onlyGetInactiveObjects, getGuiContent("Only retrieve inactive GameObjects", "Will only return preloaded instances if they are inactive.\nThis means that you have to deactivate the GameObject before being able to reuse it\n(this is already handled on Cartoon FX effects with the CFX_AutoDestructShuriken script)"));
+		bool guiEnabled = GUI.enabled;
+		GUI.enabled = p_onlyGetInactiveObjects.boolValue;
+		EditorGUILayout.PropertyField(p_instantiateIfNeeded, getGuiContent("Instantiate new instances if needed", "If no active GameObject is found in the preloaded list, then instantiate new ones as needed"));
+		GUI.enabled = guiEnabled;
+
+#if !UNITY_4_2
+		EditorGUIUtility.labelWidth = labelWidth;
+#endif
+
+		if(EditorGUI.EndChangeCheck())
+		{
+			serializedObject.ApplyModifiedProperties();
+		}
+
+		//Drag/drop Prefabs
+		GUI.SetNextControlName("DragDropBox");
+		EditorGUILayout.HelpBox("Drag GameObjects you want to preload here!\n\nTIP:\nUse the Inspector Lock at the top right to be able to drag multiple objects at once!", MessageType.None);
+		Rect dropRect = GUILayoutUtility.GetLastRect();
+
+		for(int i = 0; i < (this.target as CFX_SpawnSystem).objectsToPreload.Length; i++)
+		{
+			GUILayout.BeginHorizontal();
+			
+			EditorGUI.BeginChangeCheck();
+			GameObject obj = (GameObject)EditorGUILayout.ObjectField((this.target as CFX_SpawnSystem).objectsToPreload[i], typeof(GameObject), true);
+			if(EditorGUI.EndChangeCheck())
+			{
+#if UNITY_4_2
+				Undo.RegisterUndo(target, "change Spawn System object to preload");
+#else
+				Undo.RecordObject(target, "change Spawn System object to preload");
+#endif
+				(this.target as CFX_SpawnSystem).objectsToPreload[i] = obj;
+			}
+			EditorGUILayout.LabelField(new GUIContent("times","Number of times to copy the effect\nin the pool, i.e. the max number of\ntimes the object will be used\nsimultaneously"), GUILayout.Width(40));
+			EditorGUI.BeginChangeCheck();
+			int nb = EditorGUILayout.IntField("", (this.target as CFX_SpawnSystem).objectsToPreloadTimes[i], GUILayout.Width(50));
+			if(nb < 1)
+				nb = 1;
+			if(EditorGUI.EndChangeCheck())
+			{
+#if UNITY_4_2
+				Undo.RegisterUndo(target, "change Spawn System preload count");
+#else
+				Undo.RecordObject(target, "change Spawn System preload count");
+#endif
+				(this.target as CFX_SpawnSystem).objectsToPreloadTimes[i] = nb;
+			}
+			
+			if(GUI.changed)
+			{
+				EditorUtility.SetDirty(target);
+			}
+			
+			if(GUILayout.Button("X", EditorStyles.miniButton, GUILayout.Width(24)))
+			{
+				Object preloadedObject = (this.target as CFX_SpawnSystem).objectsToPreload[i];
+				string objectName = (preloadedObject == null) ? "" : preloadedObject.name;
+#if UNITY_4_2
+				Undo.RegisterUndo(target, string.Format("remove {0} from Spawn System", objectName));
+#else
+				Undo.RecordObject(target, string.Format("remove {0} from Spawn System", objectName));
+#endif
+				ArrayUtility.RemoveAt<GameObject>(ref (this.target as CFX_SpawnSystem).objectsToPreload, i);
+				ArrayUtility.RemoveAt<int>(ref (this.target as CFX_SpawnSystem).objectsToPreloadTimes, i);
+				
+				EditorUtility.SetDirty(target);
+			}
+			
+			GUILayout.EndHorizontal();
+		}
+		
+		if((Event.current.type == EventType.DragPerform || Event.current.type == EventType.DragUpdated)
+			&& dropRect.Contains(Event.current.mousePosition))
+		{
+			DragAndDrop.visualMode = DragAndDropVisualMode.Copy;
+			
+			if(Event.current.type == EventType.DragPerform)
+			{
+				foreach(Object o in DragAndDrop.objectReferences)
+				{
+					if(o is GameObject)
+					{
+						bool already = false;
+						foreach(GameObject otherObj in (this.target as CFX_SpawnSystem).objectsToPreload)
+						{
+							if(o == otherObj)
+							{
+								already = true;
+								Debug.LogWarning("CFX_SpawnSystem: Object has already been added: " + o.name);
+								break;
+							}
+						}
+						
+						if(!already)
+						{
+#if UNITY_4_2
+							Undo.RegisterUndo(target, string.Format("add {0} to Spawn System", o.name));
+#else
+							Undo.RecordObject(target, string.Format("add {0} to Spawn System", o.name));
+#endif
+							ArrayUtility.Add<GameObject>(ref (this.target as CFX_SpawnSystem).objectsToPreload, (GameObject)o);
+							ArrayUtility.Add<int>(ref (this.target as CFX_SpawnSystem).objectsToPreloadTimes, 1);
+							
+							EditorUtility.SetDirty(target);
+						}
+					}
+				}
+			}
+		}
+	}
+}
--- a/FX/Editor/CFX_SpawnSystemEditor.cs.meta
+++ b/FX/Editor/CFX_SpawnSystemEditor.cs.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a20330d93336f2245901dbd9a34b88f8
+MonoImporter:
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
--- a/Assets/Cartoon
+++ b/Assets/Cartoon
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e1a4e99f62e1b4b40ac0a423acf7c903
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/(Mobile)/Light.meta
+++ b/(Mobile)/Light.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 87d63f8e8fee02f4bb750ed717e60ebf
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/(Mobile)/Light/CFXM3_AuraRays
+++ b/(Mobile)/Light/CFXM3_AuraRays
@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: CFXM3_AuraRays ADD
+  m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 13807a919991cfe44b57d7db2be003d8, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _InvFade: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
--- a/(Mobile)/Light/CFXM3_AuraRays
+++ b/(Mobile)/Light/CFXM3_AuraRays
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 77e3cbacb5b834b42a5ccfe9ad151923
+NativeFormatImporter:
+  userData: 
--- a/(Mobile)/Light/CFXM3_GlowDot
+++ b/(Mobile)/Light/CFXM3_GlowDot
@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: CFXM3_GlowDot ADD
+  m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: ae3fa1042e1f4b245970c609dd6952c4, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _InvFade: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _TintColor: {r: 1, g: 1, b: 1, a: 1}
+--- !u!1002 &2100001
+EditorExtensionImpl:
+  serializedVersion: 6
--- a/(Mobile)/Light/CFXM3_GlowDot
+++ b/(Mobile)/Light/CFXM3_GlowDot
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 64787e354b16ddf41ab85b12fe15dbff
+NativeFormatImporter:
+  userData: 
--- a/(Mobile)/Light/CFXM3_GlowStar
+++ b/(Mobile)/Light/CFXM3_GlowStar
@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: CFXM3_GlowStar ADD
+  m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 6cfb04d83be10e549887ebb5340a46f9, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _InvFade: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
--- a/(Mobile)/Light/CFXM3_GlowStar
+++ b/(Mobile)/Light/CFXM3_GlowStar
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 0053b65302e6f7649b1c013c4c41906b
+NativeFormatImporter:
+  userData: 
--- a/(Mobile)/Water.meta
+++ b/(Mobile)/Water.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a6f7d0d209faadf4a8689fea1929013e
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/(Mobile)/Water/CFXM3_IceBulk
+++ b/(Mobile)/Water/CFXM3_IceBulk
@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: CFXM3_IceBulk ADD
+  m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 8ec934b6b46a3424c961170abc530b6f, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _InvFade: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.23529412}
--- a/(Mobile)/Water/CFXM3_IceBulk
+++ b/(Mobile)/Water/CFXM3_IceBulk
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: b85bac8660bfec243b2385f00819aa04
+NativeFormatImporter:
+  userData: 
--- a/(Mobile)/Water/CFXM3_IceSmoke
+++ b/(Mobile)/Water/CFXM3_IceSmoke
@ -0,0 +1,28 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: CFXM3_IceSmoke ADD
+  m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 8d5678f01a805b84eafa29e231b62e70, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _InvFade: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.23529412}
--- a/(Mobile)/Water/CFXM3_IceSmoke
+++ b/(Mobile)/Water/CFXM3_IceSmoke
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: 0bae96837733cfe40ad617e2bc581c34
+NativeFormatImporter:
+  userData: 
--- a/(Mobile)/Water/CFXM3_IceSmoke
+++ b/(Mobile)/Water/CFXM3_IceSmoke
@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: CFXM3_IceSmoke Intense ADD
+  m_Shader: {fileID: 10720, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 8d5678f01a805b84eafa29e231b62e70, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _InvFade: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _TintColor: {r: 1, g: 1, b: 1, a: 0.5019608}
+--- !u!1002 &2100001
+EditorExtensionImpl:
+  serializedVersion: 6
--- a/(Mobile)/Water/CFXM3_IceSmoke
+++ b/(Mobile)/Water/CFXM3_IceSmoke
@ -0,0 +1,4 @@
+fileFormatVersion: 2
+guid: dbc0726520a1c2a4ea1190e959325a4b
+NativeFormatImporter:
+  userData: 
--- a/FX/Materials.meta
+++ b/FX/Materials.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8c0b7ddf850d2c7449a1ae688cdb0378
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/FX/Materials/Animated.meta
+++ b/FX/Materials/Animated.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 4eec49c450c64394b93925a83d0bf149
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/FX/Materials/Animated/CFX_Anim_Electricity_Add.mat
+++ b/FX/Materials/Animated/CFX_Anim_Electricity_Add.mat
@ -0,0 +1,30 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: CFX_Anim_Electricity_Add
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: 67b0a4cd4c72b86469e7ca179598fcaf, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _InvFade: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _TintColor: {r: 1, g: 1, b: 1, a: 0.5}
--- a/FX/Materials/Animated/CFX_Anim_Electricity_Add.mat.meta
+++ b/FX/Materials/Animated/CFX_Anim_Electricity_Add.mat.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fcb97c6faf083ca4f978210036f3832b
--- a/FX/Materials/Electric.meta
+++ b/FX/Materials/Electric.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 545d633ab98aa144bae8082018b89e3b
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/FX/Materials/Electric/CFX_ElectricBolt_Add.mat
+++ b/FX/Materials/Electric/CFX_ElectricBolt_Add.mat
@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: CFX_ElectricBolt_Add
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: 347a4af640f58824d8438fae9b34a012, type: 3}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats:
+      data:
+        first:
+          name: _InvFade
+        second: 1
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: 1, b: 1, a: 1}
+      data:
+        first:
+          name: _TintColor
+        second: {r: .5, g: .5, b: .5, a: .5}
--- a/FX/Materials/Electric/CFX_ElectricBolt_Add.mat.meta
+++ b/FX/Materials/Electric/CFX_ElectricBolt_Add.mat.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 9c36c09a0f6dd93458248f001ebce5ab
--- a/FX/Materials/Electric/CFX_Sparkles_Add.mat
+++ b/FX/Materials/Electric/CFX_Sparkles_Add.mat
@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: CFX_Sparkles_Add
+  m_Shader: {fileID: 200, guid: 0000000000000000f000000000000000, type: 0}
+  m_ShaderKeywords: []
+  m_SavedProperties:
+    serializedVersion: 2
+    m_TexEnvs:
+      data:
+        first:
+          name: _MainTex
+        second:
+          m_Texture: {fileID: 2800000, guid: a070c34b838259a4eb4338c1c5b753b3, type: 3}
+          m_Scale: {x: 1, y: 1}
+          m_Offset: {x: 0, y: 0}
+    m_Floats:
+      data:
+        first:
+          name: _InvFade
+        second: 1
+    m_Colors:
+      data:
+        first:
+          name: _Color
+        second: {r: 1, g: 1, b: 1, a: 1}
+      data:
+        first:
+          name: _TintColor
+        second: {r: .5, g: .5, b: .5, a: .5}
--- a/FX/Materials/Electric/CFX_Sparkles_Add.mat.meta
+++ b/FX/Materials/Electric/CFX_Sparkles_Add.mat.meta
@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: f70f45ac7c9fb644c9a039b7d3aab297
--- a/FX/Materials/Fire.meta
+++ b/FX/Materials/Fire.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5cb03706999b64a41b7ba7bd06d80b59
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/FX/Materials/Fire/CFX3_FireBulk
+++ b/FX/Materials/Fire/CFX3_FireBulk
@ -0,0 +1,31 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 6
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_Name: CFX3_FireBulk ADD
+  m_Shader: {fileID: 4800000, guid: bccaaca1f83315c4aad8d95e28fd9149, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _MainTex:
+        m_Texture: {fileID: 2800000, guid: e6d1dbabd3135d546b6c48db6a6879f3, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _InvFade: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.23529412}
+--- !u!1002 &2100001
+EditorExtensionImpl:
+  serializedVersion: 6
--- a/Show More
+++ b/Show More