6 files changed, 128 insertions, 135 deletions
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader
index 63e98344..f76b0a91 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader
@@ -1,58 +1,58 @@
-Shader "Unlit/unit_effect_colorDrift"
-{
-    Properties
-    {
-        _MainTex ("Texture", 2D) = "white" {}
-    }
-    SubShader
-    {
-        Tags { "RenderType"="Opaque" }
-        LOD 100
-
-        Pass
-        {
-            CGPROGRAM
-            #pragma vertex vert
-            #pragma fragment frag
-            // make fog work
-            #pragma multi_compile_fog
-
-            #include "UnityCG.cginc"
-
-            struct appdata
-            {
-                float4 vertex : POSITION;
-                float2 uv : TEXCOORD0;
-            };
-
-            struct v2f
-            {
-                float2 uv : TEXCOORD0;
-                UNITY_FOG_COORDS(1)
-                float4 vertex : SV_POSITION;
-            };
-
-            sampler2D _MainTex;
-            float4 _MainTex_ST;
-
-            v2f vert (appdata v)
-            {
-                v2f o;
-                o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-                UNITY_TRANSFER_FOG(o,o.vertex);
-                return o;
-            }
-
-            fixed4 frag (v2f i) : SV_Target
-            {
-                // sample the texture
-                fixed4 col = tex2D(_MainTex, i.uv);
-                // apply fog
-                UNITY_APPLY_FOG(i.fogCoord, col);
-                return col;
-            }
-            ENDCG
-        }
-    }
-}
+Shader "Unlit/unit_effect_colorDrift"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "white" {}
+    }
+    SubShader
+    {
+        Tags { "RenderType"="Opaque" }
+        LOD 100
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            // make fog work
+            #pragma multi_compile_fog
+
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                UNITY_FOG_COORDS(1)
+                float4 vertex : SV_POSITION;
+            };
+
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+
+            v2f vert (appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                UNITY_TRANSFER_FOG(o,o.vertex);
+                return o;
+            }
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                // sample the texture
+                fixed4 col = tex2D(_MainTex, i.uv);
+                // apply fog
+                UNITY_APPLY_FOG(i.fogCoord, col);
+                return col;
+            }
+            ENDCG
+        }
+    }
+}
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader.meta
index d42d528f..d42d528f 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader.meta
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_color_drift.shader.meta
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader
index c5cfcf26..3111369a 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader
@@ -4,8 +4,6 @@ Shader "Erika/Unit/ImageEffect/unit_img_motionBlur"
     Properties
     {
 		_MainTex("Texture", 2D) = "white" {}
-		_BlurTex("Texture", 2D) = "black" {}
-		_MaskColor ("Mask Color", Color) = (1,1,1,1)
 		_Angle("Angle", float) = 0
 		_Distance("Distance", float) = 0
     }
@@ -42,11 +40,6 @@ Shader "Erika/Unit/ImageEffect/unit_img_motionBlur"
             sampler2D _MainTex;
             float4 _MainTex_ST;
 
-			sampler2D _BlurTex;
-			float4 _BlurTex_ST;
-
-			fixed4 _MaskColor;
-
             float _Angle;
 
 			fixed _Distance;
@@ -62,18 +55,18 @@ Shader "Erika/Unit/ImageEffect/unit_img_motionBlur"
             fixed4 frag (v2f i) : SV_Target
             {
                 fixed2 uv = i.uv;
-                fixed2 offset = fixed2(0.05, 0.05);
-                const float sampleCount = 30;
-                fixed4 color = fixed4(0,0,0,0);
-                float radian = radians(_Angle);
-                float distance = _Distance;
-                for(int i = 0; i < sampleCount; i++)
-				{
-                    float dx = distance * cos(radian) / sampleCount * i;
-                    float dy = distance * sin(radian) / sampleCount * i;
-                    color += tex2D(_MainTex,float2(uv.x + dx,uv.y + dy)) * (1 / sampleCount);
-                }
-				//color.rgb *= 0.5f;
+                fixed2 offset = fixed2(0.05, 0.05);
+                const float sampleCount = 30;
+                fixed4 color = fixed4(0,0,0,0);
+                float radian = radians(_Angle);
+                float distance = _Distance;
+                for(int i = 0; i < sampleCount; i++)
+				{
+                    float dx = distance * cos(radian) / sampleCount * i;
+                    float dy = distance * sin(radian) / sampleCount * i;
+                    color += tex2D(_MainTex,float2(uv.x + dx,uv.y + dy)) * (1 / sampleCount);
+                }
+				//color.rgb *= 0.5f;
 				return color;
             }
             ENDCG
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader.meta
index 4afe3c18..4afe3c18 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motion_blur.shader.meta
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader
index fbc32eb5..b00673eb 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader
@@ -1,58 +1,58 @@
-Shader "Unlit/unit_effect_speedLine"
-{
-    Properties
-    {
-        _MainTex ("Texture", 2D) = "white" {}
-    }
-    SubShader
-    {
-        Tags { "RenderType"="Opaque" }
-        LOD 100
-
-        Pass
-        {
-            CGPROGRAM
-            #pragma vertex vert
-            #pragma fragment frag
-            // make fog work
-            #pragma multi_compile_fog
-
-            #include "UnityCG.cginc"
-
-            struct appdata
-            {
-                float4 vertex : POSITION;
-                float2 uv : TEXCOORD0;
-            };
-
-            struct v2f
-            {
-                float2 uv : TEXCOORD0;
-                UNITY_FOG_COORDS(1)
-                float4 vertex : SV_POSITION;
-            };
-
-            sampler2D _MainTex;
-            float4 _MainTex_ST;
-
-            v2f vert (appdata v)
-            {
-                v2f o;
-                o.vertex = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-                UNITY_TRANSFER_FOG(o,o.vertex);
-                return o;
-            }
-
-            fixed4 frag (v2f i) : SV_Target
-            {
-                // sample the texture
-                fixed4 col = tex2D(_MainTex, i.uv);
-                // apply fog
-                UNITY_APPLY_FOG(i.fogCoord, col);
-                return col;
-            }
-            ENDCG
-        }
-    }
-}
+Shader "Unlit/unit_effect_speedLine"
+{
+    Properties
+    {
+        _MainTex ("Texture", 2D) = "white" {}
+    }
+    SubShader
+    {
+        Tags { "RenderType"="Opaque" }
+        LOD 100
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            // make fog work
+            #pragma multi_compile_fog
+
+            #include "UnityCG.cginc"
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+            };
+
+            struct v2f
+            {
+                float2 uv : TEXCOORD0;
+                UNITY_FOG_COORDS(1)
+                float4 vertex : SV_POSITION;
+            };
+
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+
+            v2f vert (appdata v)
+            {
+                v2f o;
+                o.vertex = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                UNITY_TRANSFER_FOG(o,o.vertex);
+                return o;
+            }
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                // sample the texture
+                fixed4 col = tex2D(_MainTex, i.uv);
+                // apply fog
+                UNITY_APPLY_FOG(i.fogCoord, col);
+                return col;
+            }
+            ENDCG
+        }
+    }
+}
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader.meta
index 37726c12..37726c12 100644
--- a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader.meta
+++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speed_line.shader.meta