DevSooha · muffinhead03 · Mar 3, 2026 · Feb 27, 2026 · Feb 27, 2026 · Feb 28, 2026
diff --git a/.plastic/plastic.selector b/.plastic/plastic.selector
diff --git a/.plastic/plastic.workspace b/.plastic/plastic.workspace
diff --git a/Assets/Animations/Player/PlayerAnimator.controller b/Assets/Animations/Player/PlayerAnimator.controller
@@ -214,9 +214,17 @@ BlendTree:
     m_CycleOffset: 0
     m_DirectBlendParameter: InputX
     m_Mirror: 0
+  - serializedVersion: 2
+    m_Motion: {fileID: 7400000, guid: c95eb20d2ae643a38458471af279fbc3, type: 2}
+    m_Threshold: -3
+    m_Position: {x: 0, y: -1}
+    m_TimeScale: 1
+    m_CycleOffset: 0
+    m_DirectBlendParameter: InputX
+    m_Mirror: 0
   m_BlendParameter: InputX
   m_BlendParameterY: InputY
-  m_MinThreshold: -1
+  m_MinThreshold: -3
   m_MaxThreshold: 3
   m_UseAutomaticThresholds: 0
   m_NormalizedBlendValues: 0

diff --git a/Assets/Animations/PlayerAnimator.controller b/Assets/Animations/PlayerAnimator.controller
@@ -214,9 +214,17 @@ BlendTree:
     m_CycleOffset: 0
     m_DirectBlendParameter: InputX
     m_Mirror: 0
+  - serializedVersion: 2
+    m_Motion: {fileID: 7400000, guid: c95eb20d2ae643a38458471af279fbc3, type: 2}
+    m_Threshold: -3
+    m_Position: {x: 0, y: -1}
+    m_TimeScale: 1
+    m_CycleOffset: 0
+    m_DirectBlendParameter: InputX
+    m_Mirror: 0
   m_BlendParameter: InputX
   m_BlendParameterY: InputY
-  m_MinThreshold: -1
+  m_MinThreshold: -3
   m_MaxThreshold: 3
   m_UseAutomaticThresholds: 0
   m_NormalizedBlendValues: 0

diff --git a/Assets/MEDieval/VFX_Test/ADDICTIVE.shader b/Assets/MEDieval/VFX_Test/ADDICTIVE.shader
@@ -1,102 +1,122 @@
-Shader "Custom/FX/Additive_Dissolve_Distort_Builtin_Fixed"
-{
-    Properties
-    {
-        _MainTex ("Main Texture", 2D) = "white" {}
-        _Tint ("Tint Color", Color) = (1,1,1,1)
-        _NoiseTex ("Noise Texture (for dissolve & distortion)", 2D) = "white" {}
-        _DissolveThreshold ("Dissolve Threshold (0..1)", Range(0,1)) = 0.0
-        _DissolveEdgeWidth ("Edge Width", Range(0.0,0.5)) = 0.08
-        _EdgeColor ("Edge Color", Color) = (1,0.6,0,1)
-        _DistortStrength ("Distortion Strength", Range(0,1)) = 0.08
-        _DistortSpeed ("Distortion Speed", Range(0,5)) = 0.8
-        _NoiseScale ("Noise Scale", Float) = 4.0
-        _AlphaCut ("Alpha Cutoff (optional)", Range(0,1)) = 0.0
-        _GrabMix ("Grab Mix", Range(0,1)) = 0.5
-    }
-
-    SubShader
-    {
-        Tags { "Queue"="Transparent" "RenderType"="Transparent" "IgnoreProjector"="True" }
-        LOD 100
-        Cull Off
-        ZWrite Off
-        Blend One One
-        Lighting Off
-
-        Pass
-        {
-            CGPROGRAM
-            #pragma vertex vert
-            #pragma fragment frag
-            #include "UnityCG.cginc"
-
-            sampler2D _MainTex;
-            sampler2D _NoiseTex;
-
-            float4 _MainTex_ST;
-            float4 _Tint;
-
-            float _DissolveThreshold;
-            float _DissolveEdgeWidth;
-            float4 _EdgeColor;
-            float _DistortStrength;
-            float _DistortSpeed;
-            float _NoiseScale;
-            float _AlphaCut;
-            float _GrabMix;
-
-            struct appdata
-            {
-                float4 vertex : POSITION;
-                float2 uv : TEXCOORD0;
-                float4 color : COLOR;
-            };
-
-            struct v2f
-            {
-                float4 pos : SV_POSITION;
-                float2 uv : TEXCOORD0;
-                float2 uvNoise : TEXCOORD1;
-                fixed4 color : COLOR;
-            };
-
-            v2f vert (appdata v)
-            {
-                v2f o;
-                o.pos = UnityObjectToClipPos(v.vertex);
-                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
-                o.uvNoise = v.uv * _NoiseScale;
-                o.color = v.color * _Tint;
-                return o;
-            }
-
-            fixed4 frag (v2f i) : SV_Target
-            {
-                fixed4 baseCol = tex2D(_MainTex, i.uv) * i.color;
-
-                // noise (animate)
-                float2 noiseUV = i.uvNoise + float2(_DistortSpeed * _Time.y, 0);
-                float noise = tex2D(_NoiseTex, noiseUV).r;
-
-                float edge = smoothstep(_DissolveThreshold - _DissolveEdgeWidth,
-                                        _DissolveThreshold + _DissolveEdgeWidth, noise);
-
-                float keep = step(_DissolveThreshold, noise);
-                float alpha = edge * baseCol.a;
-
-                fixed4 edgeCol = _EdgeColor * (1.0 - edge);
-
-                fixed4 outCol;
-                outCol.rgb = baseCol.rgb * alpha
-                           + edgeCol.rgb * (1.0 - keep);
-                outCol.a = alpha;
-
-                clip(outCol.a - _AlphaCut);
-                return outCol;
-            }
-            ENDCG
-        }
-    }
-    FallBack Off
-}
+Shader "Custom/FX/Additive_Dissolve_Distort_Builtin_Fixed"
+{
+    Properties
+    {
+        _MainTex ("Main Texture", 2D) = "white" {}
+        _Tint ("Tint Color", Color) = (1,1,1,1)
+        _NoiseTex ("Noise Texture (for dissolve & distortion)", 2D) = "white" {}
+        _DissolveThreshold ("Dissolve Threshold (0..1)", Range(0,1)) = 0.0
+        _DissolveEdgeWidth ("Edge Width", Range(0.0,0.5)) = 0.08
+        _EdgeColor ("Edge Color", Color) = (1,0.6,0,1)
+        _DistortStrength ("Distortion Strength", Range(0,1)) = 0.08
+        _DistortSpeed ("Distortion Speed", Range(0,5)) = 0.8
+        _NoiseScale ("Noise Scale", Float) = 4.0
+        _AlphaCut ("Alpha Cutoff (optional)", Range(0,1)) = 0.0
+        _GrabMix ("Grab Mix", Range(0,1)) = 0.5
+    }
+
+    SubShader
+    {
+        Tags { "Queue"="Transparent" "RenderType"="Transparent" "IgnoreProjector"="True" }
+        LOD 100
+        Cull Off
+        ZWrite Off
+        Blend One One
+        Lighting Off
+
+        // ✅ 이름 변경: _GrabTexture → _FXGrabTex
+        GrabPass { "_FXGrabTex" }
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #include "UnityCG.cginc"
+
+            sampler2D _MainTex;
+            sampler2D _NoiseTex;
+            sampler2D _FXGrabTex;
+
+            float4 _MainTex_ST;
+            float4 _Tint;
+
+            float _DissolveThreshold;
+            float _DissolveEdgeWidth;
+            float4 _EdgeColor;
+            float _DistortStrength;
+            float _DistortSpeed;
+            float _NoiseScale;
+            float _AlphaCut;
+            float _GrabMix;
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+                float4 color : COLOR;
+            };
+
+            struct v2f
+            {
+                float4 pos : SV_POSITION;
+                float2 uv : TEXCOORD0;
+                float2 uvNoise : TEXCOORD1;
+                float4 grabPos : TEXCOORD2;   // ✅ grab screen pos
+                fixed4 color : COLOR;
+            };
+
+            v2f vert (appdata v)
+            {
+                v2f o;
+                o.pos = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                o.uvNoise = v.uv * _NoiseScale;
+                o.grabPos = ComputeGrabScreenPos(o.pos); // ✅ built-in grabpos helper
+                o.color = v.color * _Tint;
+                return o;
+            }
+
+            fixed4 frag (v2f i) : SV_Target
+            {
+                fixed4 baseCol = tex2D(_MainTex, i.uv) * i.color;
+
+                // noise (animate)
+                float2 noiseUV = i.uvNoise + float2(_DistortSpeed * _Time.y, 0);
+                float noise = tex2D(_NoiseTex, noiseUV).r;
+
+                float edge = smoothstep(_DissolveThreshold - _DissolveEdgeWidth,
+                                        _DissolveThreshold + _DissolveEdgeWidth, noise);
+
+                float keep = step(_DissolveThreshold, noise);
+                float alpha = edge * baseCol.a;
+
+                // distortion offset (screen-space)
+                float2 distortOffset = 0;
+                if (_DistortStrength > 0.0001)
+                {
+                    float2 n = (tex2D(_NoiseTex, i.uvNoise + _Time.y * _DistortSpeed).rg - 0.5) * 2.0;
+                    distortOffset = n * (_DistortStrength * 0.001); // tiny UV offset
+                }
+
+                // ✅ proj sample grab (stable)
+                float4 grabPos = i.grabPos;
+                grabPos.xy += distortOffset * grabPos.w;
+                fixed4 bg = tex2Dproj(_FXGrabTex, UNITY_PROJ_COORD(grabPos));
+
+                fixed4 edgeCol = _EdgeColor * (1.0 - edge);
+
+                fixed4 outCol;
+                outCol.rgb = baseCol.rgb * alpha
+                           + edgeCol.rgb * (1.0 - keep)
+                           + bg.rgb * (_GrabMix * _DistortStrength);
+                outCol.a = alpha;
+
+                clip(outCol.a - _AlphaCut);
+                return outCol;
+            }
+            ENDCG
+        }
+    }
+    FallBack Off
+}
diff --git a/Assets/MEDieval/VFX_Test/ADDICTIVE.shader.meta b/Assets/MEDieval/VFX_Test/ADDICTIVE.shader.meta
diff --git a/Assets/MEDieval/VFX_Test/ALPHABLEND.shader b/Assets/MEDieval/VFX_Test/ALPHABLEND.shader
@@ -0,0 +1,110 @@
+Shader "Custom/EnergyBall_Dissolve_Distortion"
+{
+    Properties
+    {
+        _MainTex("Main Texture", 2D) = "white" {}
+        _Color("Tint Color (HDR)", Color) = (1,1,1,1)
+
+        _MaskTex("Mask Texture", 2D) = "white" {}
+
+        _DissolveTex("Dissolve Noise", 2D) = "gray" {}
+        _DissolveAmount("Dissolve Amount", Range(0,1)) = 0.0
+        _DissolveEdge("Dissolve Edge Thickness", Range(0,1)) = 0.1
+        _DissolveEdgeColor("Dissolve Edge Color (HDR)", Color) = (1,0.5,0,1)
+
+        _DistortTex("Distortion Map (RG)", 2D) = "gray" {}
+        _DistortStrength("Distortion Strength", Range(0,1)) = 0.1
+        _DistortSpeed("Distortion Flow Speed", Vector) = (0.2, 0.3, 0, 0)
+    }
+
+    SubShader
+    {
+        Tags{
+            "Queue"="Transparent"
+            "RenderType"="Transparent"
+            "IgnoreProjector"="True"
+        }
+
+        Blend SrcAlpha OneMinusSrcAlpha
+        ZWrite Off
+        Cull Off
+
+        Pass
+        {
+            CGPROGRAM
+            #pragma vertex vert
+            #pragma fragment frag
+            #include "UnityCG.cginc"
+
+            sampler2D _MainTex;
+            sampler2D _DissolveTex;
+            sampler2D _DistortTex;
+            sampler2D _MaskTex;
+
+            float4 _MainTex_ST;
+            float4 _MaskTex_ST;
+
+            float4 _Color;
+            float4 _DissolveEdgeColor;
+
+            float _DissolveAmount;
+            float _DissolveEdge;
+            float _DistortStrength;
+            float4 _DistortSpeed;
+
+            struct appdata
+            {
+                float4 vertex : POSITION;
+                float2 uv : TEXCOORD0;
+                float4 color : COLOR;
+            };
+
+            struct v2f
+            {
+                float4 pos : SV_POSITION;
+                float2 uv : TEXCOORD0;
+                float4 color : COLOR;
+            };
+
+            v2f vert(appdata v)
+            {
+                v2f o;
+                o.pos = UnityObjectToClipPos(v.vertex);
+                o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+                o.color = v.color;
+                return o;
+            }
+
+            float4 frag(v2f i) : SV_Target
+            {
+                // Mask
+                float mask = tex2D(_MaskTex, TRANSFORM_TEX(i.uv, _MaskTex)).r;
+
+                // Distortion Chaotic Flow (RG only)
+                float2 flowUV = i.uv + frac(_Time.y * _DistortSpeed.xy);
+                float2 distort = tex2D(_DistortTex, flowUV).rg * 2.0 - 1.0;
+                float2 distortedUV = i.uv + distort * _DistortStrength * mask;
+
+                // Main Texture
+                float4 col = tex2D(_MainTex, distortedUV);
+                col *= i.color * _Color;
+
+                // Dissolve Calculation
+                float noise = tex2D(_DissolveTex, i.uv).r;
+                float edge = smoothstep(_DissolveAmount, _DissolveAmount + _DissolveEdge, noise);
+
+                // Clip dissolved area
+                if (noise < _DissolveAmount) discard;
+
+                // Edge Glow
+                col.rgb = lerp(_DissolveEdgeColor.rgb, col.rgb, edge);
+
+                // Apply Mask Transparency
+                col.a *= mask;
+
+                return col;
+            }
+            ENDCG
+        }
+    }
+}
diff --git a/Assets/MEDieval/VFX_Test/ALPHABLEND.shader.meta b/Assets/MEDieval/VFX_Test/ALPHABLEND.shader.meta