summaryrefslogtreecommitdiff
path: root/Assets/Art
diff options
context:
space:
mode:
Diffstat (limited to 'Assets/Art')
-rw-r--r--Assets/Art/Animations/Saionji/Light_Attk_Rush.anim16
-rw-r--r--Assets/Art/Materials/Character/mat_saionji_ghost_body.mat10
-rw-r--r--Assets/Art/Materials/Character/mat_white.mat77
-rw-r--r--Assets/Art/Materials/Character/mat_white.mat.meta8
-rw-r--r--Assets/Art/PostProcessing_setup.asset4
-rw-r--r--Assets/Art/Shaders/Shader_GhostEffect.shader69
-rw-r--r--Assets/Art/Shaders/Shader_GhostEffect.shader.meta9
7 files changed, 100 insertions, 93 deletions
diff --git a/Assets/Art/Animations/Saionji/Light_Attk_Rush.anim b/Assets/Art/Animations/Saionji/Light_Attk_Rush.anim
index 617bae2d..35e2fb1d 100644
--- a/Assets/Art/Animations/Saionji/Light_Attk_Rush.anim
+++ b/Assets/Art/Animations/Saionji/Light_Attk_Rush.anim
@@ -38462,4 +38462,18 @@ AnimationClip:
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
- m_Events: []
+ m_Events:
+ - time: 0.2
+ functionName: SpawnGhost
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
+ - time: 0.33333334
+ functionName: SpawnGhost
+ data:
+ objectReferenceParameter: {fileID: 0}
+ floatParameter: 0
+ intParameter: 0
+ messageOptions: 0
diff --git a/Assets/Art/Materials/Character/mat_saionji_ghost_body.mat b/Assets/Art/Materials/Character/mat_saionji_ghost_body.mat
index 919c9103..93f42d51 100644
--- a/Assets/Art/Materials/Character/mat_saionji_ghost_body.mat
+++ b/Assets/Art/Materials/Character/mat_saionji_ghost_body.mat
@@ -8,14 +8,13 @@ Material:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: mat_saionji_ghost_body
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
+ m_Shader: {fileID: 4800000, guid: f5cfad9bdef0be649bb9dd39094a6b4d, type: 3}
m_ShaderKeywords: _ALPHAPREMULTIPLY_ON
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
- m_CustomRenderQueue: 3000
- stringTagMap:
- RenderType: Transparent
+ m_CustomRenderQueue: -1
+ stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
@@ -41,7 +40,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
- m_Texture: {fileID: 0}
+ m_Texture: {fileID: 2800000, guid: 8ca9678b5b408794581da6c8fcb4eaba, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -76,3 +75,4 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _GlowColor: {r: 0.34454945, g: 0.74464995, b: 1.8729352, a: 1}
diff --git a/Assets/Art/Materials/Character/mat_white.mat b/Assets/Art/Materials/Character/mat_white.mat
deleted file mode 100644
index 268084e7..00000000
--- a/Assets/Art/Materials/Character/mat_white.mat
+++ /dev/null
@@ -1,77 +0,0 @@
-%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: mat_white
- m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
- m_ShaderKeywords: _EMISSION
- m_LightmapFlags: 2
- m_EnableInstancingVariants: 0
- m_DoubleSidedGI: 0
- m_CustomRenderQueue: -1
- stringTagMap: {}
- disabledShaderPasses: []
- m_SavedProperties:
- serializedVersion: 3
- m_TexEnvs:
- - _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}
- - _MetallicGlossMap:
- 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}
- m_Floats:
- - _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
- - _SmoothnessTextureChannel: 0
- - _SpecularHighlights: 1
- - _SrcBlend: 1
- - _UVSec: 0
- - _ZWrite: 1
- m_Colors:
- - _Color: {r: 1, g: 1, b: 1, a: 1}
- - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/Art/Materials/Character/mat_white.mat.meta b/Assets/Art/Materials/Character/mat_white.mat.meta
deleted file mode 100644
index 5da8bb19..00000000
--- a/Assets/Art/Materials/Character/mat_white.mat.meta
+++ /dev/null
@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 5bfb364ecf9a54a439a68d1fb4500e24
-NativeFormatImporter:
- externalObjects: {}
- mainObjectFileID: 2100000
- userData:
- assetBundleName:
- assetBundleVariant:
diff --git a/Assets/Art/PostProcessing_setup.asset b/Assets/Art/PostProcessing_setup.asset
index df3be555..039f1a57 100644
--- a/Assets/Art/PostProcessing_setup.asset
+++ b/Assets/Art/PostProcessing_setup.asset
@@ -35,10 +35,10 @@ MonoBehaviour:
value: 1
intensity:
overrideState: 1
- value: 18.57
+ value: 15
threshold:
overrideState: 1
- value: 0.96
+ value: 1
softKnee:
overrideState: 0
value: 0
diff --git a/Assets/Art/Shaders/Shader_GhostEffect.shader b/Assets/Art/Shaders/Shader_GhostEffect.shader
new file mode 100644
index 00000000..432ae27b
--- /dev/null
+++ b/Assets/Art/Shaders/Shader_GhostEffect.shader
@@ -0,0 +1,69 @@
+Shader "Erika/Character/Shader_GhostEffect"
+{
+ Properties
+ {
+ _MainTex ("Texture", 2D) = "white" {}
+ _Cutoff("Cutoff", Float) = 0.5
+ [HDR]_GlowColor ("GlowColor", Color) = (1,1,1,1)
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" "Queue" = "Geometry+1"}
+ LOD 100
+
+ Pass
+ {
+ ZWrite Off
+
+ 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;
+
+ float _Cutoff;
+
+ float4 _GlowColor;
+
+ 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);
+ if(col.a <= _Cutoff)
+ discard;
+ //// apply fog
+ //UNITY_APPLY_FOG(i.fogCoord, col);
+ //return col;
+ return _GlowColor;
+ }
+ ENDCG
+ }
+ }
+}
diff --git a/Assets/Art/Shaders/Shader_GhostEffect.shader.meta b/Assets/Art/Shaders/Shader_GhostEffect.shader.meta
new file mode 100644
index 00000000..4c0f25ae
--- /dev/null
+++ b/Assets/Art/Shaders/Shader_GhostEffect.shader.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: f5cfad9bdef0be649bb9dd39094a6b4d
+ShaderImporter:
+ externalObjects: {}
+ defaultTextures: []
+ nonModifiableTextures: []
+ userData:
+ assetBundleName:
+ assetBundleVariant:
generated by cgit v1.1-26-g67d0 at 2025-05-30 22:35:41 +0000