*jump

44 files changed, 1704 insertions, 165 deletions

diff --git a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Assets/Art/Materials/Character/Effects.meta
index b76e98a5..69e89e66 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
+++ b/Assets/Art/Materials/Character/Effects.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 20381b3eecfbfe34a9d9222868969d29
+guid: 3285357c21adf9b4e80e0afeb550fe61
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Body.mat b/Assets/Art/Materials/Character/Effects/Dissolve_Body.mat
new file mode 100644
index 00000000..bd56372e
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Body.mat
@@ -0,0 +1,101 @@
+%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: Dissolve_Body
+  m_Shader: {fileID: 4800000, guid: bcf940f2b1c46ba4ea736cc0d9807771, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _Albedo:
+        m_Texture: {fileID: 2800000, guid: 8ca9678b5b408794581da6c8fcb4eaba, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Metallic:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Normals:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Occlusion:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaCutout: 0.5
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _RimPower: 1.71
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - __dirty: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects.meta b/Assets/Art/Materials/Character/Effects/Dissolve_Body.mat.meta
index 17a426dd..175a1b5c 100644
--- a/Assets/Scripts/Avatar/Actions/ActionEffects.meta
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Body.mat.meta
@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: 0b5ccfefc2e6b104a8566f4da9a16c5f
-folderAsset: yes
-DefaultImporter:
+guid: f94255c3c8d53644ab79e63fdc9b77c5
+NativeFormatImporter:
   externalObjects: {}
+  mainObjectFileID: 2100000
   userData: 
   assetBundleName: 
   assetBundleVariant: 
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Cloth.mat b/Assets/Art/Materials/Character/Effects/Dissolve_Cloth.mat
new file mode 100644
index 00000000..88671fc9
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Cloth.mat
@@ -0,0 +1,101 @@
+%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: Dissolve_Cloth
+  m_Shader: {fileID: 4800000, guid: bcf940f2b1c46ba4ea736cc0d9807771, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _Albedo:
+        m_Texture: {fileID: 2800000, guid: 0ce428f96cd44584499b8c59ebf13b57, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Metallic:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Normals:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Occlusion:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaCutout: 0.5
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _RimPower: 1.71
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - __dirty: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Cloth.mat.meta b/Assets/Art/Materials/Character/Effects/Dissolve_Cloth.mat.meta
new file mode 100644
index 00000000..2e449554
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Cloth.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e07419b2da43f394b9d0320522a98b97
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Hair.mat b/Assets/Art/Materials/Character/Effects/Dissolve_Hair.mat
new file mode 100644
index 00000000..96579e36
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Hair.mat
@@ -0,0 +1,101 @@
+%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: Dissolve_Hair
+  m_Shader: {fileID: 4800000, guid: bcf940f2b1c46ba4ea736cc0d9807771, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _Albedo:
+        m_Texture: {fileID: 2800000, guid: 3ad2d5f89dc1d7d47a8c62e910e8528e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Metallic:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Normals:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Occlusion:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaCutout: 0.5
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _RimPower: 1.71
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - __dirty: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Hair.mat.meta b/Assets/Art/Materials/Character/Effects/Dissolve_Hair.mat.meta
new file mode 100644
index 00000000..30a60517
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Hair.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5384a215c78e13e4293236f2783b2c25
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Hair2.mat b/Assets/Art/Materials/Character/Effects/Dissolve_Hair2.mat
new file mode 100644
index 00000000..0d14ab05
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Hair2.mat
@@ -0,0 +1,101 @@
+%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: Dissolve_Hair2
+  m_Shader: {fileID: 4800000, guid: bcf940f2b1c46ba4ea736cc0d9807771, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _Albedo:
+        m_Texture: {fileID: 2800000, guid: 3ad2d5f89dc1d7d47a8c62e910e8528e, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Metallic:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Normals:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Occlusion:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaCutout: 0.5
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _RimPower: 1.71
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - __dirty: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Hair2.mat.meta b/Assets/Art/Materials/Character/Effects/Dissolve_Hair2.mat.meta
new file mode 100644
index 00000000..efb16f8c
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Hair2.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: cb6394a3aca55064386e6bf7f1da2a8c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Shoes.mat b/Assets/Art/Materials/Character/Effects/Dissolve_Shoes.mat
new file mode 100644
index 00000000..52c05a02
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Shoes.mat
@@ -0,0 +1,101 @@
+%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: Dissolve_Shoes
+  m_Shader: {fileID: 4800000, guid: bcf940f2b1c46ba4ea736cc0d9807771, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _Albedo:
+        m_Texture: {fileID: 2800000, guid: 4dd7376345aa8244ea49561e6d30f077, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Metallic:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Normals:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Occlusion:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaCutout: 0.5
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _RimPower: 1.71
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - __dirty: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Shoes.mat.meta b/Assets/Art/Materials/Character/Effects/Dissolve_Shoes.mat.meta
new file mode 100644
index 00000000..44ab8953
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Shoes.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: fe27a77335691184a9614ea455f66a1b
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Tops.mat b/Assets/Art/Materials/Character/Effects/Dissolve_Tops.mat
new file mode 100644
index 00000000..4d3f5549
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Tops.mat
@@ -0,0 +1,101 @@
+%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: Dissolve_Tops
+  m_Shader: {fileID: 4800000, guid: bcf940f2b1c46ba4ea736cc0d9807771, type: 3}
+  m_ShaderKeywords: 
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses: []
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _Albedo:
+        m_Texture: {fileID: 2800000, guid: 7149769bc4002fe41907704120a7ce9f, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Metallic:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Normals:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _Occlusion:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _texcoord:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Floats:
+    - _AlphaCutout: 0.5
+    - _BumpScale: 1
+    - _Cutoff: 0.5
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _GlossMapScale: 1
+    - _Glossiness: 0.5
+    - _GlossyReflections: 1
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.02
+    - _RimPower: 1.71
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _UVSec: 0
+    - _ZWrite: 1
+    - __dirty: 1
+    m_Colors:
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _RimColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Art/Materials/Character/Effects/Dissolve_Tops.mat.meta b/Assets/Art/Materials/Character/Effects/Dissolve_Tops.mat.meta
new file mode 100644
index 00000000..c687eb6b
--- /dev/null
+++ b/Assets/Art/Materials/Character/Effects/Dissolve_Tops.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3bc37f9aaa16e434aa2bcf5dc4e7f464
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/PostProcessing_setup.asset b/Assets/Art/PostProcessing_setup.asset
index c557985a..17df752a 100644
--- a/Assets/Art/PostProcessing_setup.asset
+++ b/Assets/Art/PostProcessing_setup.asset
@@ -35,7 +35,7 @@ MonoBehaviour:
     value: 1
   intensity:
     overrideState: 1
-    value: 20.2
+    value: 11.1
   threshold:
     overrideState: 1
     value: 1
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Shaders/Effects.meta
index 41200932..c3fd23b5 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
+++ b/Assets/Art/Shaders/Effects.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: abff7cb61c760094f8ab9437379e0f2c
+guid: 66fad21734e122d4fa94e54e95824a9f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Art/Shaders/Effects/RimLight 1.shader b/Assets/Art/Shaders/Effects/RimLight 1.shader
new file mode 100644
index 00000000..28a86107
--- /dev/null
+++ b/Assets/Art/Shaders/Effects/RimLight 1.shader
@@ -0,0 +1,190 @@
+// Made with Amplify Shader Editor
+// Available at the Unity Asset Store - http://u3d.as/y3X 
+Shader "ASESampleShaders/RimLight"
+{
+	Properties
+	{
+		_RimColor("RimColor", Color) = (0,0,0,0)
+		_RimPower("RimPower", Range( 0 , 10)) = 0
+		_Metallic("Metallic", 2D) = "white" {}
+		_Occlusion("Occlusion", 2D) = "white" {}
+		_Normals("Normals", 2D) = "bump" {}
+		_Albedo("Albedo", 2D) = "white" {}
+		[HideInInspector] _texcoord( "", 2D ) = "white" {}
+		[HideInInspector] __dirty( "", Int ) = 1
+		_AlphaCutout("Alpha Cutout", FLoat) = 0.5
+	}
+
+	SubShader
+	{
+		Tags{ "RenderType" = "Transparent"  "Queue" = "Transparent"  "IsEmissive" = "true"  }
+		Cull Back
+		ZTest LEqual
+		BlendOp Add
+		Blend SrcAlpha OneMinusSrcAlpha
+		CGINCLUDE
+		#include "UnityPBSLighting.cginc"
+		#include "Lighting.cginc"
+		#pragma target 3.0
+		#ifdef UNITY_PASS_SHADOWCASTER
+			#undef INTERNAL_DATA
+			#undef WorldReflectionVector
+			#undef WorldNormalVector
+			#define INTERNAL_DATA half3 internalSurfaceTtoW0; half3 internalSurfaceTtoW1; half3 internalSurfaceTtoW2;
+			#define WorldReflectionVector(data,normal) reflect (data.worldRefl, half3(dot(data.internalSurfaceTtoW0,normal), dot(data.internalSurfaceTtoW1,normal), dot(data.internalSurfaceTtoW2,normal)))
+			#define WorldNormalVector(data,normal) fixed3(dot(data.internalSurfaceTtoW0,normal), dot(data.internalSurfaceTtoW1,normal), dot(data.internalSurfaceTtoW2,normal))
+		#endif
+		struct Input
+		{
+			fixed2 uv_texcoord;
+			float3 viewDir;
+			INTERNAL_DATA
+		};
+
+		uniform sampler2D _Normals;
+		uniform float4 _Normals_ST;
+		uniform sampler2D _Albedo;
+		uniform float4 _Albedo_ST;
+		uniform fixed _RimPower;
+		uniform fixed4 _RimColor;
+		uniform sampler2D _Metallic;
+		uniform float4 _Metallic_ST;
+		uniform sampler2D _Occlusion;
+		uniform float4 _Occlusion_ST;
+
+		float _AlphaCutout;
+
+		void surf( Input i , inout SurfaceOutputStandard o )
+		{
+			float2 uv_Normals = i.uv_texcoord * _Normals_ST.xy + _Normals_ST.zw;
+			fixed3 tex2DNode3 = UnpackNormal( tex2D( _Normals, uv_Normals ) );
+			o.Normal = tex2DNode3;
+			float2 uv_Albedo = i.uv_texcoord * _Albedo_ST.xy + _Albedo_ST.zw;
+			fixed4 col  = tex2D( _Albedo, uv_Albedo );
+			if(col.a < _AlphaCutout)
+				discard;
+			o.Albedo = fixed3(1,1,1);
+			float3 normalizeResult23 = normalize( i.viewDir );
+			float dotResult21 = dot( tex2DNode3 , normalizeResult23 );
+			o.Emission = ( pow( ( 1.0 - saturate( dotResult21 ) ) , _RimPower ) * _RimColor ).rgb * 5;
+			float2 uv_Metallic = i.uv_texcoord * _Metallic_ST.xy + _Metallic_ST.zw;
+			o.Metallic = tex2D( _Metallic, uv_Metallic ).r;
+			float2 uv_Occlusion = i.uv_texcoord * _Occlusion_ST.xy + _Occlusion_ST.zw;
+			o.Occlusion = tex2D( _Occlusion, uv_Occlusion ).r;
+			o.Alpha = 0.5;
+		}
+
+		ENDCG
+		CGPROGRAM
+		#pragma surface surf Standard keepalpha fullforwardshadows 
+
+		ENDCG
+
+		//Pass
+		//{
+		//	Name "ShadowCaster"
+		//	Tags{ "LightMode" = "ShadowCaster" }
+		//	ZWrite On
+		//	CGPROGRAM
+		//	#pragma vertex vert
+		//	#pragma fragment frag
+		//	#pragma target 3.0
+		//	#pragma multi_compile_shadowcaster
+		//	#pragma multi_compile UNITY_PASS_SHADOWCASTER
+		//	#pragma skip_variants FOG_LINEAR FOG_EXP FOG_EXP2
+		//	#include "HLSLSupport.cginc"
+		//	#if ( SHADER_API_D3D11 || SHADER_API_GLCORE || SHADER_API_GLES3 || SHADER_API_METAL || SHADER_API_VULKAN )
+		//		#define CAN_SKIP_VPOS
+		//	#endif
+		//	#include "UnityCG.cginc"
+		//	#include "Lighting.cginc"
+		//	#include "UnityPBSLighting.cginc"
+		//	struct v2f
+		//	{
+		//		V2F_SHADOW_CASTER;
+		//		float4 tSpace0 : TEXCOORD1;
+		//		float4 tSpace1 : TEXCOORD2;
+		//		float4 tSpace2 : TEXCOORD3;
+		//		float4 texcoords01 : TEXCOORD4;
+		//		UNITY_VERTEX_INPUT_INSTANCE_ID
+		//	};
+		//	v2f vert( appdata_full v )
+		//	{
+		//		v2f o;
+		//		UNITY_SETUP_INSTANCE_ID( v );
+		//		UNITY_INITIALIZE_OUTPUT( v2f, o );
+		//		UNITY_TRANSFER_INSTANCE_ID( v, o );
+		//		float3 worldPos = mul( unity_ObjectToWorld, v.vertex ).xyz;
+		//		fixed3 worldNormal = UnityObjectToWorldNormal( v.normal );
+		//		fixed3 worldTangent = UnityObjectToWorldDir( v.tangent.xyz );
+		//		fixed tangentSign = v.tangent.w * unity_WorldTransformParams.w;
+		//		fixed3 worldBinormal = cross( worldNormal, worldTangent ) * tangentSign;
+		//		o.tSpace0 = float4( worldTangent.x, worldBinormal.x, worldNormal.x, worldPos.x );
+		//		o.tSpace1 = float4( worldTangent.y, worldBinormal.y, worldNormal.y, worldPos.y );
+		//		o.tSpace2 = float4( worldTangent.z, worldBinormal.z, worldNormal.z, worldPos.z );
+		//		o.texcoords01 = float4( v.texcoord.xy, v.texcoord1.xy );
+		//		TRANSFER_SHADOW_CASTER_NORMALOFFSET( o )
+		//		return o;
+		//	}
+		//	fixed4 frag( v2f IN
+		//	#if !defined( CAN_SKIP_VPOS )
+		//	, UNITY_VPOS_TYPE vpos : VPOS
+		//	#endif
+		//	) : SV_Target
+		//	{
+		//		UNITY_SETUP_INSTANCE_ID( IN );
+		//		Input surfIN;
+		//		UNITY_INITIALIZE_OUTPUT( Input, surfIN );
+		//		surfIN.uv_texcoord.xy = IN.texcoords01.xy;
+		//		float3 worldPos = float3( IN.tSpace0.w, IN.tSpace1.w, IN.tSpace2.w );
+		//		fixed3 worldViewDir = normalize( UnityWorldSpaceViewDir( worldPos ) );
+		//		surfIN.viewDir = IN.tSpace0.xyz * worldViewDir.x + IN.tSpace1.xyz * worldViewDir.y + IN.tSpace2.xyz * worldViewDir.z;
+		//		surfIN.internalSurfaceTtoW0 = IN.tSpace0.xyz;
+		//		surfIN.internalSurfaceTtoW1 = IN.tSpace1.xyz;
+		//		surfIN.internalSurfaceTtoW2 = IN.tSpace2.xyz;
+		//		SurfaceOutputStandard o;
+		//		UNITY_INITIALIZE_OUTPUT( SurfaceOutputStandard, o )
+		//		surf( surfIN, o );
+		//		#if defined( CAN_SKIP_VPOS )
+		//		float2 vpos = IN.pos;
+		//		#endif
+		//		SHADOW_CASTER_FRAGMENT( IN )
+		//	}
+		//	ENDCG
+		//}
+	}
+	Fallback "Diffuse"
+}
+/*ASEBEGIN
+Version=13803
+566;511;900;507;1495.187;170.1838;2.333382;True;False
+Node;AmplifyShaderEditor.ViewDirInputsCoordNode;22;-1552,416;Float;False;Tangent;0;4;FLOAT3;FLOAT;FLOAT;FLOAT
+Node;AmplifyShaderEditor.NormalizeNode;23;-1329.303,412.9002;Float;False;1;0;FLOAT3;0,0,0;False;1;FLOAT3
+Node;AmplifyShaderEditor.SamplerNode;3;-1552,144;Float;True;Property;_Normals;Normals;4;0;None;True;0;True;bump;Auto;True;Object;-1;Auto;Texture2D;6;0;SAMPLER2D;0,0;False;1;FLOAT2;1.0,0;False;2;FLOAT;1.0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1.0;False;5;FLOAT3;FLOAT;FLOAT;FLOAT;FLOAT
+Node;AmplifyShaderEditor.DotProductOpNode;21;-1137.603,334.4997;Float;False;2;0;FLOAT3;0.0,0,0;False;1;FLOAT3;0.0,0,0;False;1;FLOAT
+Node;AmplifyShaderEditor.SaturateNode;20;-962.4039,309.9996;Float;False;1;0;FLOAT;1.23;False;1;FLOAT
+Node;AmplifyShaderEditor.OneMinusNode;5;-793.4009,352.2989;Float;False;1;0;FLOAT;0;False;1;FLOAT
+Node;AmplifyShaderEditor.RangedFloatNode;28;-890.0026,467.6995;Float;False;Property;_RimPower;RimPower;1;0;0;0;10;0;1;FLOAT
+Node;AmplifyShaderEditor.PowerNode;26;-600.6031,375.6995;Float;False;2;0;FLOAT;0.0;False;1;FLOAT;0.0;False;1;FLOAT
+Node;AmplifyShaderEditor.ColorNode;25;-606.8026,555.4988;Float;False;Property;_RimColor;RimColor;0;0;0,0,0,0;0;5;COLOR;FLOAT;FLOAT;FLOAT;FLOAT
+Node;AmplifyShaderEditor.SimpleMultiplyOpNode;27;-358.2028,390.8992;Float;False;2;2;0;FLOAT;0;False;1;COLOR;0.0;False;1;COLOR
+Node;AmplifyShaderEditor.SamplerNode;2;-213.5002,481.3999;Float;True;Property;_Metallic;Metallic;2;0;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;6;0;SAMPLER2D;0,0;False;1;FLOAT2;1,0;False;2;FLOAT;1.0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1.0;False;5;COLOR;FLOAT;FLOAT;FLOAT;FLOAT
+Node;AmplifyShaderEditor.SamplerNode;1;-210.5004,83.20016;Float;True;Property;_Albedo;Albedo;5;0;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;6;0;SAMPLER2D;0,0;False;1;FLOAT2;1,0;False;2;FLOAT;1.0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1.0;False;5;COLOR;FLOAT;FLOAT;FLOAT;FLOAT
+Node;AmplifyShaderEditor.SamplerNode;4;-208.9012,673.0024;Float;True;Property;_Occlusion;Occlusion;3;0;None;True;0;False;white;Auto;False;Object;-1;Auto;Texture2D;6;0;SAMPLER2D;0,0;False;1;FLOAT2;1,0;False;2;FLOAT;1.0;False;3;FLOAT2;0,0;False;4;FLOAT2;0,0;False;5;FLOAT;1.0;False;5;COLOR;FLOAT;FLOAT;FLOAT;FLOAT
+Node;AmplifyShaderEditor.StandardSurfaceOutputNode;0;147.2,339.6;Fixed;False;True;2;Fixed;;0;0;Standard;ASESampleShaders/RimLight;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;False;Back;0;3;False;0;0;Opaque;0.5;True;True;0;False;Opaque;Geometry;All;True;True;True;True;True;True;True;True;True;True;True;True;True;True;True;True;True;False;0;255;255;0;0;0;0;0;0;0;0;False;0;4;10;25;False;0.5;True;0;Zero;Zero;0;Zero;Zero;OFF;OFF;0;False;0;0,0,0,0;VertexOffset;False;Cylindrical;False;Relative;0;;-1;-1;-1;-1;0;0;0;False;16;0;FLOAT3;0,0,0;False;1;FLOAT3;0,0,0;False;2;FLOAT3;0,0,0;False;3;FLOAT;0;False;4;FLOAT;0;False;5;FLOAT;0;False;6;FLOAT3;0,0,0;False;7;FLOAT3;0,0,0;False;8;FLOAT;0.0;False;9;FLOAT;0;False;10;FLOAT;0;False;13;FLOAT3;0,0,0;False;11;FLOAT3;0,0,0;False;12;FLOAT3;0,0,0;False;14;FLOAT4;0,0,0,0;False;15;FLOAT3;0,0,0;False;0
+WireConnection;23;0;22;0
+WireConnection;21;0;3;0
+WireConnection;21;1;23;0
+WireConnection;20;0;21;0
+WireConnection;5;0;20;0
+WireConnection;26;0;5;0
+WireConnection;26;1;28;0
+WireConnection;27;0;26;0
+WireConnection;27;1;25;0
+WireConnection;0;0;1;0
+WireConnection;0;1;3;0
+WireConnection;0;2;27;0
+WireConnection;0;3;2;0
+WireConnection;0;5;4;0
+ASEEND*/
+//CHKSM=2A3B3D22176020238140A4ABA160CFED64996DF3
diff --git a/Assets/Art/Shaders/Effects/RimLight 1.shader.meta b/Assets/Art/Shaders/Effects/RimLight 1.shader.meta
new file mode 100644
index 00000000..42ccdd1b
--- /dev/null
+++ b/Assets/Art/Shaders/Effects/RimLight 1.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: bcf940f2b1c46ba4ea736cc0d9807771
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Shaders/Effects/RimLight.shader b/Assets/Art/Shaders/Effects/RimLight.shader
new file mode 100644
index 00000000..4083623e
--- /dev/null
+++ b/Assets/Art/Shaders/Effects/RimLight.shader
@@ -0,0 +1,58 @@
+Shader "Unlit/RimLight"
+{
+    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/Art/Shaders/Effects/RimLight.shader.meta b/Assets/Art/Shaders/Effects/RimLight.shader.meta
new file mode 100644
index 00000000..9fd5a646
--- /dev/null
+++ b/Assets/Art/Shaders/Effects/RimLight.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 1b7109bb6e56e9a47af0551d67c44bc8
+ShaderImporter:
+  externalObjects: {}
+  defaultTextures: []
+  nonModifiableTextures: []
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Prefabs/Characters/Saionji_Clone.prefab b/Assets/Prefabs/Characters/Saionji_Clone.prefab
index d5b3b52f..71aa5220 100644
--- a/Assets/Prefabs/Characters/Saionji_Clone.prefab
+++ b/Assets/Prefabs/Characters/Saionji_Clone.prefab
@@ -757,14 +757,14 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 95b47e7944b743742b0be935e7e70db7, type: 2}
-  - {fileID: 2100000, guid: 95b47e7944b743742b0be935e7e70db7, type: 2}
-  - {fileID: 2100000, guid: 95b47e7944b743742b0be935e7e70db7, type: 2}
-  - {fileID: 2100000, guid: 95b47e7944b743742b0be935e7e70db7, type: 2}
-  - {fileID: 2100000, guid: 1eac7715cd6586a4ba808aaf589a31ce, type: 2}
-  - {fileID: 2100000, guid: 91388fadce550ac4ca364c9c2b2e2344, type: 2}
-  - {fileID: 2100000, guid: 0cbe5b0430ae64140ad565d6598c54a8, type: 2}
-  - {fileID: 2100000, guid: 211ee051f420fd041b717c8d5ceb38ac, type: 2}
+  - {fileID: 2100000, guid: f94255c3c8d53644ab79e63fdc9b77c5, type: 2}
+  - {fileID: 2100000, guid: f94255c3c8d53644ab79e63fdc9b77c5, type: 2}
+  - {fileID: 2100000, guid: f94255c3c8d53644ab79e63fdc9b77c5, type: 2}
+  - {fileID: 2100000, guid: f94255c3c8d53644ab79e63fdc9b77c5, type: 2}
+  - {fileID: 2100000, guid: e07419b2da43f394b9d0320522a98b97, type: 2}
+  - {fileID: 2100000, guid: fe27a77335691184a9614ea455f66a1b, type: 2}
+  - {fileID: 2100000, guid: 3bc37f9aaa16e434aa2bcf5dc4e7f464, type: 2}
+  - {fileID: 2100000, guid: 5384a215c78e13e4293236f2783b2c25, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -1797,61 +1797,6 @@ Transform:
   m_Father: {fileID: 3436738899185117725}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2043697860072736462
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 2043697860072736463}
-  - component: {fileID: 2043697860072736460}
-  m_Layer: 0
-  m_Name: GhostEffect
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2043697860072736463
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2043697860072736462}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children: []
-  m_Father: {fileID: 7408654347646493624}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2043697860072736460
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2043697860072736462}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 76b355b49906df24cac5ccfb0de69331, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Renderer: {fileID: 8204134728969198478}
-  Materials:
-  - {fileID: 2100000, guid: 55592d1917b963942bab26f8fdbae507, type: 2}
-  - {fileID: 2100000, guid: 060253b9b3d97a841addf8e029fa15c7, type: 2}
-  - {fileID: 2100000, guid: 953cbf717e2f67f40afc9e640cdbf9f1, type: 2}
-  - {fileID: 2100000, guid: b5902a72ec5053945a565c16b69f5058, type: 2}
-  SubmeshShareMaterial: 1
-  UseRangedSubmesh: 1
-  SubmeshRange: {x: 4, y: 7}
-  IsEnable: 1
-  Interval: 0.2
-  LifeTime: 0.2
 --- !u!1 &2091052820823270216
 GameObject:
   m_ObjectHideFlags: 0
@@ -2221,12 +2166,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2875732338032971249}
   m_LocalRotation: {x: -0, y: -0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: -0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 6706507541047699684}
   m_Father: {fileID: 5781047424522997049}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2884995743824110918
 GameObject:
@@ -2422,7 +2367,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &3436738899185117725
 Transform:
   m_ObjectHideFlags: 0
@@ -2726,37 +2671,6 @@ Transform:
   m_Father: {fileID: 5043489827336932327}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3789745410488857640
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 7408654347646493624}
-  m_Layer: 0
-  m_Name: Root_Effects
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &7408654347646493624
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3789745410488857640}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 2043697860072736463}
-  m_Father: {fileID: 5781047424522997049}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4183438078658906740
 GameObject:
   m_ObjectHideFlags: 0
@@ -3202,7 +3116,7 @@ Transform:
   m_Children:
   - {fileID: 6762985860821143200}
   m_Father: {fileID: 5781047424522997049}
-  m_RootOrder: 2
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5610077469004334351
 GameObject:
@@ -4810,10 +4724,9 @@ Transform:
   m_Children:
   - {fileID: 7142447298878011188}
   - {fileID: 8766018762636264669}
-  - {fileID: 4664293412087394862}
   - {fileID: 3729252457122631017}
+  - {fileID: 4664293412087394862}
   - {fileID: 2948388362522889441}
-  - {fileID: 7408654347646493624}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 90.00001, z: 0}
@@ -5828,6 +5741,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Pistol1Static (1)
       objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: ffe9971ac75494746b9dc21c63dc7836, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ffe9971ac75494746b9dc21c63dc7836, type: 3}
       propertyPath: m_LocalPosition.x
       value: -0.04
@@ -5891,6 +5808,10 @@ PrefabInstance:
       propertyPath: m_Name
       value: Pistol1Static
       objectReference: {fileID: 0}
+    - target: {fileID: 100000, guid: ffe9971ac75494746b9dc21c63dc7836, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 400000, guid: ffe9971ac75494746b9dc21c63dc7836, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0.048
diff --git a/Assets/Scenes/Demo/SaionjiShowOff.unity b/Assets/Scenes/Demo/SaionjiShowOff.unity
index 548d988d..b26c1f6b 100644
--- a/Assets/Scenes/Demo/SaionjiShowOff.unity
+++ b/Assets/Scenes/Demo/SaionjiShowOff.unity
@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 170076734}
-  m_IndirectSpecularColor: {r: 0.44092876, g: 0.4896468, b: 0.5697499, a: 1}
+  m_IndirectSpecularColor: {r: 0.44092834, g: 0.4896462, b: 0.5697487, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -1093,6 +1093,7 @@ Transform:
   m_Children:
   - {fileID: 9190676758873534539}
   - {fileID: 2018047305}
+  - {fileID: 2215054557743592673}
   m_Father: {fileID: 0}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1856,7 +1857,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!114 &1737075741
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2093,6 +2094,31 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 3250b3092f3b858438c6154710d18d3b, type: 3}
+--- !u!4 &2215054557743592673 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+    type: 3}
+  m_PrefabInstance: {fileID: 5658522667000265176}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &3674041106879106000 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 8969987971784487432, guid: 2bc84022d3389104b84680ddf3faeeda,
+    type: 3}
+  m_PrefabInstance: {fileID: 5658522667000265176}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &3674041106879106001
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3674041106879106000}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 92d46c9d136abdc46bb8fc83c650891f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Animator: {fileID: 7687474691083604173}
 --- !u!1001 &3741668519200845148
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -2100,6 +2126,22 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 861183510}
     m_Modifications:
+    - target: {fileID: 564123362, guid: 83d445123a203b14298b7a7662a0a470, type: 3}
+      propertyPath: Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: e07419b2da43f394b9d0320522a98b97, type: 2}
+    - target: {fileID: 564123362, guid: 83d445123a203b14298b7a7662a0a470, type: 3}
+      propertyPath: Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: fe27a77335691184a9614ea455f66a1b, type: 2}
+    - target: {fileID: 564123362, guid: 83d445123a203b14298b7a7662a0a470, type: 3}
+      propertyPath: Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: 3bc37f9aaa16e434aa2bcf5dc4e7f464, type: 2}
+    - target: {fileID: 564123362, guid: 83d445123a203b14298b7a7662a0a470, type: 3}
+      propertyPath: Materials.Array.data[3]
+      value: 
+      objectReference: {fileID: 2100000, guid: 5384a215c78e13e4293236f2783b2c25, type: 2}
     - target: {fileID: 3741668519095819896, guid: 83d445123a203b14298b7a7662a0a470,
         type: 3}
       propertyPath: m_Hurtbox.Array.size
@@ -2125,6 +2167,16 @@ PrefabInstance:
       propertyPath: m_BodyCollider
       value: 
       objectReference: {fileID: 281484682}
+    - target: {fileID: 3741668519095819896, guid: 83d445123a203b14298b7a7662a0a470,
+        type: 3}
+      propertyPath: UseBlade
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3741668519095819896, guid: 83d445123a203b14298b7a7662a0a470,
+        type: 3}
+      propertyPath: UsePistol
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 5505303514460593431, guid: 83d445123a203b14298b7a7662a0a470,
         type: 3}
       propertyPath: m_LocalPosition.x
@@ -2187,6 +2239,438 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 83d445123a203b14298b7a7662a0a470, type: 3}
+--- !u!137 &4551347825117135004 stripped
+SkinnedMeshRenderer:
+  m_CorrespondingSourceObject: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+    type: 3}
+  m_PrefabInstance: {fileID: 5658522667000265176}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &4671668680293680276 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 1031893361146133836, guid: 2bc84022d3389104b84680ddf3faeeda,
+    type: 3}
+  m_PrefabInstance: {fileID: 5658522667000265176}
+  m_PrefabAsset: {fileID: 0}
+--- !u!114 &4671668680293680277
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4671668680293680276}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06f8e7dbd5d25034ab87247a8458ed28, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  material: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+  renderer: {fileID: 4551347825117135004}
+  count: 63
+--- !u!1001 &5658522667000265176
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 861183510}
+    m_Modifications:
+    - target: {fileID: 2875732338032971249, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.149
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.14593506
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5781047424522997049, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5912529635291885054, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[2]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[3]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[4]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[5]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[6]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[7]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[8]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[9]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[10]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[11]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[12]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[13]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[14]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[15]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[16]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[17]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[18]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[19]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[20]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[21]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[22]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[23]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[24]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[25]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[26]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[27]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[28]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[29]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[30]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[31]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[32]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[33]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[34]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[35]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[36]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[37]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[38]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[39]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[40]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[41]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[42]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[43]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[44]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[45]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[46]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[47]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[48]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[49]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[50]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[51]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[52]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[53]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[54]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[55]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[56]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[57]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[58]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[59]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[60]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[61]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8191694612211005764, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Materials.Array.data[62]
+      value: 
+      objectReference: {fileID: 2100000, guid: cb6394a3aca55064386e6bf7f1da2a8c, type: 2}
+    - target: {fileID: 8969987971784487432, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_Name
+      value: Saionji_Clone
+      objectReference: {fileID: 0}
+    - target: {fileID: 8969987971784487432, guid: 2bc84022d3389104b84680ddf3faeeda,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2bc84022d3389104b84680ddf3faeeda, type: 3}
+--- !u!95 &7687474691083604173 stripped
+Animator:
+  m_CorrespondingSourceObject: {fileID: 2605466399590836501, guid: 2bc84022d3389104b84680ddf3faeeda,
+    type: 3}
+  m_PrefabInstance: {fileID: 5658522667000265176}
+  m_PrefabAsset: {fileID: 0}
 --- !u!4 &9190676758873534539 stripped
 Transform:
   m_CorrespondingSourceObject: {fileID: 5505303514460593431, guid: 83d445123a203b14298b7a7662a0a470,
diff --git a/Assets/Scripts/Avatar.meta b/Assets/Scripts/Avatar.meta
index 11b04f5f..0819432c 100644
--- a/Assets/Scripts/Avatar.meta
+++ b/Assets/Scripts/Avatar.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 10a2e913d181351499510c4c95e3eaae
+guid: 01431b5a11017ed49a2687d2ebc20e69
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Scripts/Avatar/Abilities/AttackAbility.cs b/Assets/Scripts/Avatar/Abilities/AttackAbility.cs
index 9ca52a4c..117dca7e 100644
--- a/Assets/Scripts/Avatar/Abilities/AttackAbility.cs
+++ b/Assets/Scripts/Avatar/Abilities/AttackAbility.cs
@@ -15,18 +15,15 @@ public class AttackAbility : AbilityBase
 {

     AttackAbilityConfig m_Config = new AttackAbilityConfig();

 

-    /// <summary>

-    /// 在跑动状态时可以切换的ability

-    /// </summary>

     private List<Trigger> m_Triggers = new List<Trigger>();

 

     private List<Trigger> m_LateTriggers = new List<Trigger>();

 

-    /// <summary>

-    /// 这个招式所有hit的效果

-    /// </summary>

-    public HitDefination[] HitDef;

-

+	/// <summary>

+	/// 这个招式产生的hit

+	/// </summary>

+	private List<HitInfo> m_HitInfo = new List<HitInfo>();

+   

     /// <summary>

     /// 从动画结束开始计时

     /// </summary>

@@ -46,7 +43,7 @@ public class AttackAbility : AbilityBase
     {

         get

         {

-            return HitDef != null ? HitDef.Length : 0;

+            return m_HitInfo != null ? m_HitInfo.Count : 0;

         }

     }

 

diff --git a/Assets/Scripts/Avatar/Abilities/JumpAbility.cs b/Assets/Scripts/Avatar/Abilities/JumpAbility.cs
index e0f73efa..5e953403 100644
--- a/Assets/Scripts/Avatar/Abilities/JumpAbility.cs
+++ b/Assets/Scripts/Avatar/Abilities/JumpAbility.cs
@@ -20,19 +20,23 @@ public struct JumpAbilityConfig
     public int animFD;

     public int animBD;

     public int animJumpEnd;

+

+	public bool skipStart; //没有准备动作

 }
 
 public class JumpAbility : AbilityBase
 {
     public enum Direction

     {

+		None,

         Neutral, 

         Forward, 

         Backward

     }
 
-    private enum State

+    public enum State

     {

+		None,

         Ready, 

         Up, 

         Down, 

@@ -66,7 +70,25 @@ public class JumpAbility : AbilityBase
 	int m_CurDownMotion;

 	Vector3 m_CurInitVelocity;

 

-    private List<Trigger> m_Triggers = new List<Trigger>();

+	public State CurState

+	{

+		get

+		{

+			return m_CurState;

+		}

+	}

+

+	public Direction CurDirection

+	{

+		get

+		{

+			return m_Dir;

+		}

+	}

+

+	private List<Trigger> m_Triggers = new List<Trigger>();

+

+	bool m_SkipStart;

 

     public JumpAbility(JumpAbilityConfig config)

     {

@@ -84,7 +106,8 @@ public class JumpAbility : AbilityBase
         m_AnimJumpBackUpwards = config.animBU;

         m_AnimJumpBackDownwards = config.animBD;

         m_AnimJumpEnd = config.animJumpEnd; // on ground again

-    }

+		m_SkipStart = config.skipStart;

+	}

 

     public void SetDir(Direction dir)

     {

@@ -121,9 +144,9 @@ public class JumpAbility : AbilityBase
 		bool isDown = m_Body.Velocity.y < 0;

 		bool isFreeFall = Mathf.Approximately(m_Body.Velocity.y, 0);

 

-		if (isOnGround)

+		if (isOnGround && !m_SkipStart)

 			m_CurState = State.Ready;

-		else if (isUp)

+		else if (isUp || isOnGround && m_SkipStart)

 			m_CurState = State.Up;

 		else if (isDown || isFreeFall)

 			m_CurState = State.Down; 

@@ -149,17 +172,17 @@ public class JumpAbility : AbilityBase
 				}

 				if(motionInfo.shortNameHash == m_AnimJumpStart && motionInfo.normalizedTime >= 1f)

 				{

-					m_Body.LocalVelocity = m_CurInitVelocity;

 					m_CurState = State.Up;

 				}

 				break;

 			case State.Up:

 				if(m_CurAnim != m_CurUpMotion)

 				{

+					m_Body.LocalVelocity = m_CurInitVelocity;

 					m_Animator.CrossFade(m_CurUpMotion, 0.2f);

 					m_CurAnim = m_CurUpMotion; 

 				}

-				if(m_Body.Velocity.y <= 0)

+				if(m_Body.Velocity.y < 0)

 				{

 					m_CurState = State.Down;

 				}

@@ -167,7 +190,7 @@ public class JumpAbility : AbilityBase
 			case State.Down:

 				if(m_CurAnim != m_CurDownMotion)

 				{

-					m_Animator.CrossFade(m_CurDownMotion, 0.2f);

+					m_Animator.CrossFade(m_CurDownMotion, 0.5f);

 					m_CurAnim = m_CurDownMotion;

 				}

 				if(m_Collider.IsOnGround)

@@ -210,12 +233,12 @@ public class JumpAbility : AbilityBase
     /// 结束

     /// </summary>

     /// <returns></returns>

-    public bool IsJumpDone()

+    public bool IsJumpDone(float t = 1f)

     {

         if (m_CurState == State.End)

         {

             AnimatorStateInfo state = m_Animator.GetCurrentAnimatorStateInfo(0);

-            return state.shortNameHash == m_AnimJumpEnd && state.normalizedTime >= 1f;

+            return state.shortNameHash == m_AnimJumpEnd && state.normalizedTime >= t;

         }

 

         return false;

@@ -237,5 +260,4 @@ public class JumpAbility : AbilityBase
         m_Triggers.Add(trigger);

     }

 

-

 }
\ No newline at end of file
diff --git a/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs
new file mode 100644
index 00000000..effc3ca7
--- /dev/null
+++ b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs
@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ActionSetVelocityX : ActionBase
+{
+	PhysicsBody m_Body;
+
+	float m_VelX;
+
+	public ActionSetVelocityX(PhysicsBody body, float x)
+	{
+		m_Body = body;
+		m_VelX = x;
+	}
+
+	public override void Execute()
+	{
+		Vector3 v = m_Body.Velocity;
+		v.x = m_VelX;
+		m_Body.Velocity = v;
+	}
+}
diff --git a/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs.meta b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs.meta
new file mode 100644
index 00000000..5b39b3ec
--- /dev/null
+++ b/Assets/Scripts/Avatar/Actions/ActionSetVelocityX.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 6130f371839788049b56f4d71468bc51
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Avatar/Conditions.meta b/Assets/Scripts/Avatar/Conditions.meta
index 0bfa1b8d..9ee89e8b 100644
--- a/Assets/Scripts/Avatar/Conditions.meta
+++ b/Assets/Scripts/Avatar/Conditions.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 2d3b745adf374e14b9f4e095c52ef3d6
+guid: 4564e909667997f48822cb2d05ed360f
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs
new file mode 100644
index 00000000..9afd68c4
--- /dev/null
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs
@@ -0,0 +1,38 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class ConditionCheckJumpState : ConditionBase
+{
+	JumpAbility m_Ability;
+	JumpAbility.State m_State;
+	JumpAbility.Direction m_Direction;
+
+	public ConditionCheckJumpState(JumpAbility ability, JumpAbility.State state = JumpAbility.State.None, JumpAbility.Direction direction = JumpAbility.Direction.None)
+	{
+		m_Ability = ability;
+		m_State = state;
+		m_Direction = direction;
+	}
+
+	public override bool Evaluate()
+	{
+		if (m_Ability == null)
+			return false;
+		if (m_State != JumpAbility.State.None && m_Direction != JumpAbility.Direction.None)
+		{
+			return m_Ability.CurState == m_State
+				&& m_Ability.CurDirection == m_Direction;
+		}
+		else if (m_State != JumpAbility.State.None && m_Direction == JumpAbility.Direction.None)
+		{
+			return m_Ability.CurState == m_State;
+		}
+		else if (m_State == JumpAbility.State.None && m_Direction != JumpAbility.Direction.None)
+		{
+			return m_Ability.CurDirection == m_Direction;
+		}
+		else
+			return false;
+	}
+}
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta
new file mode 100644
index 00000000..aefa0807
--- /dev/null
+++ b/Assets/Scripts/Avatar/Conditions/ConditionCheckJumpState.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: d7c948fe9eefbd14d9137b19e92e1fc4
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs
index 8d900348..1f213a50 100644
--- a/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs
+++ b/Assets/Scripts/Avatar/Conditions/ConditionJumpDone.cs
@@ -5,14 +5,16 @@ using UnityEngine;
 public class ConditionJumpDone : ConditionBase

 {

     JumpAbility m_Jump;

+	float m_T;

 

-    public ConditionJumpDone(JumpAbility jump)

+    public ConditionJumpDone(JumpAbility jump, float t = 1f)

     {

         m_Jump = jump;

-    }

+		m_T = t;

+	}

 

     public override bool Evaluate()

     {

-        return m_Jump.IsJumpDone();

+        return m_Jump.IsJumpDone(m_T);

     }

 }

diff --git a/Assets/Scripts/Avatar/HitDef.cs b/Assets/Scripts/Avatar/HitDef.cs
deleted file mode 100644
index a0361753..00000000
--- a/Assets/Scripts/Avatar/HitDef.cs
+++ /dev/null
@@ -1,9 +0,0 @@
-using System.Collections;

-using System.Collections.Generic;

-using UnityEngine;

-

-// 一个hit的效果，如果一个attack有多个hit，需要定义多个HitDef

-public struct HitDefination

-{

-

-}

diff --git a/Assets/Scripts/Avatar/HitDefination.cs b/Assets/Scripts/Avatar/HitDefination.cs
new file mode 100644
index 00000000..1f622b32
--- /dev/null
+++ b/Assets/Scripts/Avatar/HitDefination.cs
@@ -0,0 +1,18 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+// 一个hit的效果，如果一个attack有多个hit，需要定义多个HitDef
+public class HitDefination
+{
+	public float start = 0f;
+	public float end = 1f; // 触发的开始和结束时间范围，用来处理一个attack多个hit的情况
+
+	public int effectID = 0; // 特效
+ 	public Transform effectHost = null; // 特效挂点
+	public Vector3 effectPosition; // 特效位置（effectHost为空时生效）
+	public Quaternion effectRotation; // 特效旋转
+	public Vector3 effectScale = Vector3.one; // 特效缩放
+
+
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Avatar/HitDef.cs.meta b/Assets/Scripts/Avatar/HitDefination.cs.meta
index d542f9ff..d542f9ff 100644
--- a/Assets/Scripts/Avatar/HitDef.cs.meta
+++ b/Assets/Scripts/Avatar/HitDefination.cs.meta
diff --git a/Assets/Scripts/Avatar/HitInfo.cs b/Assets/Scripts/Avatar/HitInfo.cs
new file mode 100644
index 00000000..bdb116eb
--- /dev/null
+++ b/Assets/Scripts/Avatar/HitInfo.cs
@@ -0,0 +1,25 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class HitInfo
+{
+	public HitDefination defination;
+
+	/// <summary>
+	/// 记录这个hit命中的avatar
+	/// </summary>
+	private List<Avatar> m_HitAvatars;
+
+	public void AddRecord(Avatar avatar)
+	{
+		if (m_HitAvatars.Contains(avatar))
+			m_HitAvatars.Add(avatar);
+	}
+
+	// 招式结束后，清除记录的avatar
+	public void WipeRecords()
+	{
+		m_HitAvatars.Clear();
+	}
+}
diff --git a/Assets/Scripts/Avatar/HitInfo.cs.meta b/Assets/Scripts/Avatar/HitInfo.cs.meta
new file mode 100644
index 00000000..ab541e49
--- /dev/null
+++ b/Assets/Scripts/Avatar/HitInfo.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3f1668cf50ed81641a8f344328012e30
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Effects/HairAssignMaterials.cs b/Assets/Scripts/Effects/HairAssignMaterials.cs
new file mode 100644
index 00000000..d2b42d05
--- /dev/null
+++ b/Assets/Scripts/Effects/HairAssignMaterials.cs
@@ -0,0 +1,26 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+[ExecuteInEditMode]
+public class HairAssignMaterials : MonoBehaviour
+{
+	public Material material;
+
+	public SkinnedMeshRenderer renderer;
+
+	public int count;
+
+	public void OnEnable()
+	{
+		if (renderer == null)
+			return;
+		Material[] materials = new Material[count];
+		for(int i = 0; i < count;++i)
+		{
+			materials[i] = material;
+		}
+		renderer.sharedMaterials = materials;
+	}
+
+}
diff --git a/Assets/Scripts/Effects/HairAssignMaterials.cs.meta b/Assets/Scripts/Effects/HairAssignMaterials.cs.meta
new file mode 100644
index 00000000..a4a2c636
--- /dev/null
+++ b/Assets/Scripts/Effects/HairAssignMaterials.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 06f8e7dbd5d25034ab87247a8458ed28
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Assets/Scripts/Managers.meta
index fa9e76cd..08725b58 100644
--- a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
+++ b/Assets/Scripts/Managers.meta
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e38cb65072bb4a64cbe162792de9bec2
+guid: 8fa7e6d20cdfaee42b39f1c7f5b5afd6
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}
diff --git a/Assets/Scripts/Physics/PhysicsPrimGroup.cs b/Assets/Scripts/Physics/PhysicsPrimGroup.cs
index 4d296ac1..0a79eeff 100644
--- a/Assets/Scripts/Physics/PhysicsPrimGroup.cs
+++ b/Assets/Scripts/Physics/PhysicsPrimGroup.cs
@@ -16,6 +16,4 @@ public class PhysicsPrimGroup : MonoBehaviour
         }

     }

 

-

-

 }

diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta
deleted file mode 100644
index bb96602e..00000000
--- a/Assets/Scripts/Props.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: f299520ed9fcf4a45858ad4ef5a8d5d1
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
diff --git a/Assets/Scripts/Test/SaionjiCloneScript.cs b/Assets/Scripts/Test/SaionjiCloneScript.cs
new file mode 100644
index 00000000..d6ddba86
--- /dev/null
+++ b/Assets/Scripts/Test/SaionjiCloneScript.cs
@@ -0,0 +1,20 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class SaionjiCloneScript : MonoBehaviour
+{
+	public Animator m_Animator;
+
+	public void OnEnable()
+	{
+		int Anim_Idle;
+		Anim_Idle = Animator.StringToHash("Idle_Fight2");
+		m_Animator.CrossFade(Anim_Idle, 0);
+	}
+
+	public void Update()
+	{
+	}
+
+}
diff --git a/Assets/Scripts/Test/SaionjiCloneScript.cs.meta b/Assets/Scripts/Test/SaionjiCloneScript.cs.meta
new file mode 100644
index 00000000..64a58ee0
--- /dev/null
+++ b/Assets/Scripts/Test/SaionjiCloneScript.cs.meta
@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 92d46c9d136abdc46bb8fc83c650891f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Scripts/Test/SaionjiScript_Ability.cs b/Assets/Scripts/Test/SaionjiScript_Ability.cs
index 32859b8d..8934b5da 100644
--- a/Assets/Scripts/Test/SaionjiScript_Ability.cs
+++ b/Assets/Scripts/Test/SaionjiScript_Ability.cs
@@ -49,17 +49,24 @@ public partial class SaionjiScript : Avatar
 		MoveAbility move = new MoveAbility(animator, Anim_Run);

 		MoveAbility dash = new MoveAbility(animator, Anim_DashWithSword);

 

-        JumpAbilityConfig jumpConfig = new JumpAbilityConfig();

-        jumpConfig.animator = animator;

-        jumpConfig.collider = m_BodyCollider;

-        jumpConfig.body = m_Body;

-        jumpConfig.neutralJumpSpeedY = 10f;

-        jumpConfig.fowardJumpSpeedX = 5f;

-        jumpConfig.backwardJumpSpeedX = -5f;

-        jumpConfig.animJump = Anim_JumpStart;

-        jumpConfig.animJumpEnd = Anim_JumpEnd;

-        jumpConfig.animNU = Anim_JumpUp;

-        jumpConfig.animND = Anim_JumpDown;

+		JumpAbilityConfig jumpConfig = new JumpAbilityConfig

+		{

+			animator = animator,

+			collider = m_BodyCollider,

+			body = m_Body,

+			neutralJumpSpeedY = 13f,

+			fowardJumpSpeedX = 5f,

+			backwardJumpSpeedX = -5f,

+			animJump = Anim_JumpStart,

+			animJumpEnd = Anim_JumpEnd,

+			animNU = Anim_JumpUp,

+			animND = Anim_JumpDown,

+			animFU = Anim_JumpUp,

+			animFD = Anim_JumpDown,

+			animBU = Anim_JumpUp,

+			animBD = Anim_JumpDown,

+			skipStart = true,

+		};

         JumpAbility jump = new JumpAbility(jumpConfig);

 

 		AttackAbilityConfig config;

@@ -205,8 +212,17 @@ public partial class SaionjiScript : Avatar
 		move.AddTrigger(trigger);

 

 		// jump ability 

+		ConditionCheckJumpState condCheckJump = new ConditionCheckJumpState(jump, JumpAbility.State.None, JumpAbility.Direction.Neutral);

+		trigger = new Trigger(And(condRightButtonHold, condCheckJump), new List<ActionBase> { towardRight, new ActionSetVelocityX(m_Body, 4)}, TriggerOnlyOnce.Off, TriggerSwallow.Off);

+		jump.AddTrigger(trigger);

+		trigger = new Trigger(And(condLeftButtonHold, condCheckJump), new List<ActionBase> { towardLeft, new ActionSetVelocityX(m_Body,-4) }, TriggerOnlyOnce.Off, TriggerSwallow.Off);

+		jump.AddTrigger(trigger);

+		trigger = new Trigger(Ands(condCheckJump, Not(condRightButtonHold), Not(condLeftButtonHold)), new ActionSetVelocityX(m_Body, 0), TriggerOnlyOnce.Off, TriggerSwallow.Off);

+		jump.AddTrigger(trigger);

 		trigger = new Trigger(condJumpOnGround, new ActionSetVelocity(m_Body, Vector3.zero), TriggerOnlyOnce.On, TriggerSwallow.Off);

 		jump.AddTrigger(trigger);

+		trigger = new Trigger(Ands(new ConditionJumpDone(jump, 0.4f), condJumpOnGround, Or(condRightButtonHold, condLeftButtonHold)), switchToMove);

+		jump.AddTrigger(trigger);

 		trigger = new Trigger(condJumpDone, switchToIdle);

         jump.AddTrigger(trigger);

 

diff --git a/Assets/Scripts/Test/SaionjiScript_Anim.cs b/Assets/Scripts/Test/SaionjiScript_Anim.cs
index 9b7bfca5..4cc729b9 100644
--- a/Assets/Scripts/Test/SaionjiScript_Anim.cs
+++ b/Assets/Scripts/Test/SaionjiScript_Anim.cs
@@ -52,7 +52,6 @@ public partial class SaionjiScript : Avatar
 		Anim_Gun3 = Animator.StringToHash("Gun03");
 		Anim_Gun4 = Animator.StringToHash("Gun04");
 
-
         Anim_JumpStart = Animator.StringToHash("Jump_Start");
         Anim_JumpUp = Animator.StringToHash("Jump_Up");
         Anim_JumpDown = Animator.StringToHash("Jump_Down");