summaryrefslogtreecommitdiff
path: root/Assets
diff options
context:
space:
mode:
Diffstat (limited to 'Assets')
-rw-r--r--Assets/Art/Shaders/Effects/RimLight 1.shader35
-rw-r--r--Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta8
-rw-r--r--Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta8
-rw-r--r--Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta8
-rw-r--r--Assets/Scenes/Demo/SaionjiShowOff.unity93
-rw-r--r--Assets/Scripts/Avatar/Actions/ActionEffects.meta8
-rw-r--r--Assets/Scripts/Props.meta8
7 files changed, 71 insertions, 97 deletions
diff --git a/Assets/Art/Shaders/Effects/RimLight 1.shader b/Assets/Art/Shaders/Effects/RimLight 1.shader
index eb751153..bcf6609c 100644
--- a/Assets/Art/Shaders/Effects/RimLight 1.shader
+++ b/Assets/Art/Shaders/Effects/RimLight 1.shader
@@ -15,6 +15,8 @@ Shader "ASESampleShaders/RimLight"
_StencilMask("Mask Layer", Range(0, 255)) = 1
[Enum(CompareFunction)] _StencilComp("Mask Mode", Int) = 6
+ _Albedo("Albedo", 2D) = "white" {}
+ _CutOff("Alpha CutOff", Float) = 0.5
}
SubShader
{
@@ -36,7 +38,7 @@ Shader "ASESampleShaders/RimLight"
Tags{ "Queue" = "AlphaTest-1" "IgnoreProjector" = "False" "RenderType" = "Transparent" "RenderType" = "MKGlow" }
Pass
{
- Cull Back
+ Cull Front
ZTest LEqual
ZWrite Off
Blend One OneMinusSrcAlpha
@@ -44,13 +46,29 @@ Shader "ASESampleShaders/RimLight"
#pragma vertex vert
#pragma fragment frag
+ struct appdata
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ float4 vertex : SV_POSITION;
+ };
+
// vertex shader
// this time instead of using "appdata" struct, just spell inputs manually,
// and instead of returning v2f struct, also just return a single output
// float4 clip position
- float4 vert(float4 vertex : POSITION) : SV_POSITION
+ v2f vert(appdata i)
{
- return UnityObjectToClipPos(vertex);
+ v2f o;
+ o.vertex = UnityObjectToClipPos(i.vertex);
+ o.uv = i.uv;
+ return o;
}
// color from the material
@@ -58,8 +76,12 @@ Shader "ASESampleShaders/RimLight"
float _Intensity;
fixed4 _MKGlowColor;
float _MKGlowPower;
+
+ sampler2D _Albedo;
+ float _CutOff;
+
// pixel shader, no inputs needed
- fixed4 frag() : SV_Target
+ fixed4 frag(v2f i) : SV_Target
{
//_Color.rgb *= _Intensity;
//_Color.rgb *= _Color.a;
@@ -69,7 +91,10 @@ Shader "ASESampleShaders/RimLight"
//_MKGlowColor = _Color;
//_MKGlowPower = _Intensity;
-
+ float alpha = tex2D(_Albedo, i.uv);
+ if(alpha <= _CutOff)
+ discard;
+ _Color.rgb *= _Intensity;
return _Color; // just return it
}
ENDCG
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
new file mode 100644
index 00000000..b76e98a5
--- /dev/null
+++ b/Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 20381b3eecfbfe34a9d9222868969d29
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
new file mode 100644
index 00000000..41200932
--- /dev/null
+++ b/Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: abff7cb61c760094f8ab9437379e0f2c
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
new file mode 100644
index 00000000..fa9e76cd
--- /dev/null
+++ b/Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e38cb65072bb4a64cbe162792de9bec2
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/Demo/SaionjiShowOff.unity b/Assets/Scenes/Demo/SaionjiShowOff.unity
index 9a3f1116..a4b1975b 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.44092834, g: 0.4896462, b: 0.5697487, a: 1}
+ m_IndirectSpecularColor: {r: 0.44092876, g: 0.4896468, b: 0.5697499, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -1057,7 +1057,6 @@ Transform:
m_Children:
- {fileID: 9190676758873534539}
- {fileID: 2018047305}
- - {fileID: 2215054557743592673}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2000,12 +1999,6 @@ 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!1001 &3741668519200845148
PrefabInstance:
m_ObjectHideFlags: 0
@@ -2112,90 +2105,6 @@ Animator:
type: 3}
m_PrefabInstance: {fileID: 3741668519200845148}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &5658522667000265176
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- m_TransformParent: {fileID: 861183510}
- m_Modifications:
- - target: {fileID: 3674041106879106001, guid: 2bc84022d3389104b84680ddf3faeeda,
- type: 3}
- propertyPath: targetAnimator
- value:
- objectReference: {fileID: 3741668519200845150}
- - target: {fileID: 3674041106879106001, guid: 2bc84022d3389104b84680ddf3faeeda,
- type: 3}
- propertyPath: targetObject
- value:
- objectReference: {fileID: 3741668519200845149}
- - 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: 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!4 &9190676758873534539 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5505303514460593431, guid: 83d445123a203b14298b7a7662a0a470,
diff --git a/Assets/Scripts/Avatar/Actions/ActionEffects.meta b/Assets/Scripts/Avatar/Actions/ActionEffects.meta
new file mode 100644
index 00000000..17a426dd
--- /dev/null
+++ b/Assets/Scripts/Avatar/Actions/ActionEffects.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0b5ccfefc2e6b104a8566f4da9a16c5f
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scripts/Props.meta b/Assets/Scripts/Props.meta
new file mode 100644
index 00000000..bb96602e
--- /dev/null
+++ b/Assets/Scripts/Props.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f299520ed9fcf4a45858ad4ef5a8d5d1
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
generated by cgit v1.1-26-g67d0 at 2025-05-28 19:23:48 +0000