diff options
Diffstat (limited to 'Assets/Bundle')
38 files changed, 577 insertions, 56 deletions
diff --git a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta b/Assets/Bundle/Materials/Unit.meta index be6badd6..b2db0fdd 100644 --- a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta +++ b/Assets/Bundle/Materials/Unit.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2c46a5a23283c7d428ae8bb13663ab6a +guid: f48ccdc5d29d31849a72a586f64f480d folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Materials/Unit/Effect.meta b/Assets/Bundle/Materials/Unit/Effect.meta new file mode 100644 index 00000000..fdf8c1db --- /dev/null +++ b/Assets/Bundle/Materials/Unit/Effect.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0525fec1eb7cc94458170e9e106955d5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Materials/Unit/ImageEffect.meta b/Assets/Bundle/Materials/Unit/ImageEffect.meta new file mode 100644 index 00000000..b69f107b --- /dev/null +++ b/Assets/Bundle/Materials/Unit/ImageEffect.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e08c241f06b185d42a50a9d6d2ab5dc0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Materials/eff_teleport.mat b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat index 862809a1..3f655bb6 100644 --- a/Assets/Bundle/Materials/eff_teleport.mat +++ b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat @@ -7,17 +7,15 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: eff_teleport - m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON - m_LightmapFlags: 0 + m_Name: unit_img_motionBlur + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - ALWAYS + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -42,7 +40,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 50c4a6456461a2e4f9c41755e6002738, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -58,41 +56,22 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _BlendOp: 0 - _BumpScale: 1 - - _CameraFadingEnabled: 0 - - _CameraFarFadeDistance: 2 - - _CameraNearFadeDistance: 1 - - _ColorMode: 0 - - _Cull: 0 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DistortionBlend: 0.5 - - _DistortionEnabled: 0 - - _DistortionStrength: 1 - - _DistortionStrengthScaled: 0 - - _DstBlend: 10 - - _EmissionEnabled: 0 - - _FlipbookMode: 0 + - _DstBlend: 0 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1 - - _LightingEnabled: 0 - _Metallic: 0 - - _Mode: 2 + - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - _SmoothnessTextureChannel: 0 - - _SoftParticlesEnabled: 0 - - _SoftParticlesFarFadeDistance: 1 - - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 5 + - _SrcBlend: 1 - _UVSec: 0 - - _ZWrite: 0 + - _ZWrite: 1 m_Colors: - - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0} diff --git a/Assets/Bundle/Materials/eff_teleport.mat.meta b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat.meta index 2febaaec..8322b5dd 100644 --- a/Assets/Bundle/Materials/eff_teleport.mat.meta +++ b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: d16f3f62fd188a645b0451bd8f022807 +guid: 91c7bc1a7ec9d5b428fa8b647cae5e6b NativeFormatImporter: externalObjects: {} mainObjectFileID: 2100000 diff --git a/Assets/Bundle/Models.meta b/Assets/Bundle/Models.meta new file mode 100644 index 00000000..c9b5bf44 --- /dev/null +++ b/Assets/Bundle/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: adab1ca5f61452c4c90f19e7c11adf0e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Prefabs.meta b/Assets/Bundle/Prefabs.meta new file mode 100644 index 00000000..82588fb1 --- /dev/null +++ b/Assets/Bundle/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dac6442cad7539149a7527510665d510 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity index 659a4af1..c728de00 100644 --- a/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity +++ b/Assets/Bundle/Scenes/Demo/AnimationEditScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571328, b: 0.3069217, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -19280,7 +19280,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!23 &160840156 MeshRenderer: m_ObjectHideFlags: 0 @@ -81971,6 +81971,7 @@ MonoBehaviour: unit: {fileID: 0} unitController: {fileID: 0} owner: {fileID: 0} + unitEffect: {fileID: 160840154} --- !u!4 &1141527492 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Bundle/Shaders/Unit/Effect.meta b/Assets/Bundle/Shaders/Unit/Effect.meta index bba3c4c9..7df9a033 100644 --- a/Assets/Bundle/Shaders/Unit/Effect.meta +++ b/Assets/Bundle/Shaders/Unit/Effect.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7557aede65843b24681351bc9fd2eda4 +guid: 9cc4684b9f432f149b16a51f148c9490 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect.meta b/Assets/Bundle/Shaders/Unit/ImageEffect.meta new file mode 100644 index 00000000..bba3c4c9 --- /dev/null +++ b/Assets/Bundle/Shaders/Unit/ImageEffect.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7557aede65843b24681351bc9fd2eda4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader new file mode 100644 index 00000000..63e98344 --- /dev/null +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader @@ -0,0 +1,58 @@ +Shader "Unlit/unit_effect_colorDrift"
+{
+ Properties
+ {
+ _MainTex ("Texture", 2D) = "white" {}
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ LOD 100
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+ // make fog work
+ #pragma multi_compile_fog
+
+ #include "UnityCG.cginc"
+
+ struct appdata
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ UNITY_FOG_COORDS(1)
+ float4 vertex : SV_POSITION;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ v2f vert (appdata v)
+ {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ UNITY_TRANSFER_FOG(o,o.vertex);
+ return o;
+ }
+
+ fixed4 frag (v2f i) : SV_Target
+ {
+ // sample the texture
+ fixed4 col = tex2D(_MainTex, i.uv);
+ // apply fog
+ UNITY_APPLY_FOG(i.fogCoord, col);
+ return col;
+ }
+ ENDCG
+ }
+ }
+}
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader.meta new file mode 100644 index 00000000..d42d528f --- /dev/null +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 6e37e3ab4ebfc3a4aa32667859687930 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_glitch.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_glitch.shader new file mode 100644 index 00000000..2e2c9fa2 --- /dev/null +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_glitch.shader @@ -0,0 +1,58 @@ +Shader "Unlit/unit_effect_glitch"
+{
+ Properties
+ {
+ _MainTex ("Texture", 2D) = "white" {}
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ LOD 100
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+ // make fog work
+ #pragma multi_compile_fog
+
+ #include "UnityCG.cginc"
+
+ struct appdata
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ UNITY_FOG_COORDS(1)
+ float4 vertex : SV_POSITION;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ v2f vert (appdata v)
+ {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ UNITY_TRANSFER_FOG(o,o.vertex);
+ return o;
+ }
+
+ fixed4 frag (v2f i) : SV_Target
+ {
+ // sample the texture
+ fixed4 col = tex2D(_MainTex, i.uv);
+ // apply fog
+ UNITY_APPLY_FOG(i.fogCoord, col);
+ return col;
+ }
+ ENDCG
+ }
+ }
+}
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_glitch.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_glitch.shader.meta new file mode 100644 index 00000000..f5e3cd72 --- /dev/null +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_glitch.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f1567ae3bc1c0964cb12b2cf79240e61 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader index 6a3aad0b..c4802a07 100644 --- a/Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader @@ -6,6 +6,7 @@ Shader "Erika/Unit/Effect/unit_effect_blur" _MainTex("Texture", 2D) = "white" {} _BlurTex("Texture", 2D) = "black" {} _MaskColor ("Mask Color", Color) = (1,1,1,1) + _Angle("Angle", float) = 0 } SubShader { @@ -42,6 +43,8 @@ Shader "Erika/Unit/Effect/unit_effect_blur" fixed4 _MaskColor; + float _Angle; + v2f vert (appdata v) { v2f o; @@ -52,14 +55,18 @@ Shader "Erika/Unit/Effect/unit_effect_blur" fixed4 frag (v2f i) : SV_Target { - float2 uv = i.uv; - fixed4 blur = tex2D(_BlurTex, uv).r; - //uv.x += blur.r; - //uv.y += blur.r; - fixed4 col = tex2D(_MainTex, uv); - col *= blur; - - return col; + fixed2 uv = i.uv; + fixed2 offset = fixed2(0.05, 0.05);
+ float sampleCount = 30;
+ fixed4 color = fixed4(0,0,0,0);
+ float radian = radians(_Angle);
+ float distance = 0.3f;
+ for(int i = 0; i < sampleCount; i++){
+ float dx = distance * cos(radian) / sampleCount * i;
+ float dy = distance * sin(radian) / sampleCount * i;
+ color += tex2D(_MainTex,float2(uv.x + dx,uv.y + dy)) * (1 / sampleCount);
+ }
+ return color; } ENDCG } diff --git a/Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta index 4afe3c18..4afe3c18 100644 --- a/Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader.meta +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader new file mode 100644 index 00000000..fbc32eb5 --- /dev/null +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader @@ -0,0 +1,58 @@ +Shader "Unlit/unit_effect_speedLine"
+{
+ Properties
+ {
+ _MainTex ("Texture", 2D) = "white" {}
+ }
+ SubShader
+ {
+ Tags { "RenderType"="Opaque" }
+ LOD 100
+
+ Pass
+ {
+ CGPROGRAM
+ #pragma vertex vert
+ #pragma fragment frag
+ // make fog work
+ #pragma multi_compile_fog
+
+ #include "UnityCG.cginc"
+
+ struct appdata
+ {
+ float4 vertex : POSITION;
+ float2 uv : TEXCOORD0;
+ };
+
+ struct v2f
+ {
+ float2 uv : TEXCOORD0;
+ UNITY_FOG_COORDS(1)
+ float4 vertex : SV_POSITION;
+ };
+
+ sampler2D _MainTex;
+ float4 _MainTex_ST;
+
+ v2f vert (appdata v)
+ {
+ v2f o;
+ o.vertex = UnityObjectToClipPos(v.vertex);
+ o.uv = TRANSFORM_TEX(v.uv, _MainTex);
+ UNITY_TRANSFER_FOG(o,o.vertex);
+ return o;
+ }
+
+ fixed4 frag (v2f i) : SV_Target
+ {
+ // sample the texture
+ fixed4 col = tex2D(_MainTex, i.uv);
+ // apply fog
+ UNITY_APPLY_FOG(i.fogCoord, col);
+ return col;
+ }
+ ENDCG
+ }
+ }
+}
diff --git a/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader.meta new file mode 100644 index 00000000..37726c12 --- /dev/null +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 1926c69018f6247438d2babd9d7b4674 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/UI.meta b/Assets/Bundle/UI.meta new file mode 100644 index 00000000..0914914c --- /dev/null +++ b/Assets/Bundle/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4392471259b05a74a82a4bc72b510eb1 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta new file mode 100644 index 00000000..ca7266b0 --- /dev/null +++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a1d7b6e0d8fb1a642a65011fb6cd7d89 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta new file mode 100644 index 00000000..142f5872 --- /dev/null +++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ad7401709700f34db2b795830937d76 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/NPC.meta b/Assets/Bundle/Unit/NPC.meta new file mode 100644 index 00000000..eeea13e1 --- /dev/null +++ b/Assets/Bundle/Unit/NPC.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8ced034d375cdfa488814663ea17a79b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset index 333f59bc..2e6c13c6 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Combo03_Z0_1.asset @@ -18,6 +18,7 @@ MonoBehaviour: animationEvents: - {fileID: 114581710045323768} - {fileID: 114435450776992514} + - {fileID: 114721479198979772} hurtBoxes: [] hitBoxes: - collider: @@ -139,8 +140,10 @@ MonoBehaviour: startFrame: 12 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab attached: 1 - attachNode: 0 - bone: + parentNode: 0 + bonePath: + bone: 0 + referencePoint: 0 position: {x: 0, y: 0.8, z: 0} rotation: {x: -24.814, y: 33.032, z: -30.331} scale: {x: 0.7, y: 0.7, z: 0.7} @@ -159,8 +162,10 @@ MonoBehaviour: startFrame: 9 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab attached: 0 - attachNode: 0 - bone: + parentNode: 0 + bonePath: + bone: 0 + referencePoint: 0 position: {x: 0, y: 1.3, z: 0} rotation: {x: -24.814, y: 33.032, z: -30.331} scale: {x: 0.4, y: 0.4, z: 0.4} @@ -179,11 +184,45 @@ MonoBehaviour: startFrame: 7 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9 small.prefab attached: 1 - attachNode: 0 - bone: + parentNode: 0 + bonePath: + bone: 0 + referencePoint: 0 position: {x: 0, y: 1, z: 0} rotation: {x: -24.814, y: 33.032, z: -30.331} scale: {x: 0.4, y: 0.4, z: 0.4} +--- !u!114 &114721479198979772 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9101593d2baa73a42bb4bd8ecec714c6, type: 3} + m_Name: EventMesh_MotionBlur + m_EditorClassIdentifier: + startFrame: 7 + lifeTime: 0.3 + angle: 0 + amount: 0 +--- !u!114 &114932985571805638 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9101593d2baa73a42bb4bd8ecec714c6, type: 3} + m_Name: EventMesh_MotionBlur + m_EditorClassIdentifier: + startFrame: 2 + lifeTime: 0.3 + angle: 0 + amount: 0 --- !u!114 &114949443759766766 MonoBehaviour: m_ObjectHideFlags: 0 @@ -199,8 +238,10 @@ MonoBehaviour: startFrame: 9 effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab attached: 0 - attachNode: 0 - bone: + parentNode: 0 + bonePath: + bone: 0 + referencePoint: 0 position: {x: 0, y: 1, z: 0} rotation: {x: -24.814, y: 33.032, z: -30.331} scale: {x: 0.6, y: 0.6, z: 0.6} diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset index 21c6882a..965fe6ab 100644 --- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset +++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Air_Dash.asset @@ -10,11 +10,18 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3} - m_Name: Air_Dash + m_Name: Air_Dash(Clone)(Clone) m_EditorClassIdentifier: animationName: Air_Dash animationPath: Assets/Art/Animations/Erika/Air_Dash.anim - animationEvents: [] + note: + animationEvents: + - {fileID: 114365720091602376} + - {fileID: 114701209950120328} + - {fileID: 0} + - {fileID: 0} + - {fileID: 114895186165284124} + - {fileID: 114163276615738028} hurtBoxes: - collider: type: 0 @@ -161,3 +168,111 @@ MonoBehaviour: properties: m_keys: m_values: [] +--- !u!114 &114163276615738028 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a75401f0015aa1e4f856979c8aa1dae2, type: 3} + m_Name: EventMesh_ImageEffect_MotionBlur + m_EditorClassIdentifier: + startFrame: 14 + lifeTime: 0.1 + angle: 0 + amount: 0 +--- !u!114 &114365720091602376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4957372b8a4fd946b86016c20f83750, type: 3} + m_Name: EventMesh_VisibilityInMainCamera + m_EditorClassIdentifier: + startFrame: 4 + isVisible: 0 +--- !u!114 &114393851134311434 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9101593d2baa73a42bb4bd8ecec714c6, type: 3} + m_Name: EventMesh_MotionBlur + m_EditorClassIdentifier: + startFrame: 13 + lifeTime: 0.05 + angle: 0 + amount: 0 +--- !u!114 &114434948509151598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9101593d2baa73a42bb4bd8ecec714c6, type: 3} + m_Name: EventMesh_MotionBlur + m_EditorClassIdentifier: + startFrame: 16 + lifeTime: 0.3 + angle: 0 + amount: 0 +--- !u!114 &114677701672343994 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9101593d2baa73a42bb4bd8ecec714c6, type: 3} + m_Name: EventMesh_MotionBlur + m_EditorClassIdentifier: + startFrame: 4 + lifeTime: 0.05 + angle: 0 + amount: 0 +--- !u!114 &114701209950120328 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a4957372b8a4fd946b86016c20f83750, type: 3} + m_Name: EventMesh_VisibilityInMainCamera + m_EditorClassIdentifier: + startFrame: 16 + isVisible: 1 +--- !u!114 &114895186165284124 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a75401f0015aa1e4f856979c8aa1dae2, type: 3} + m_Name: EventMesh_ImageEffect_MotionBlur + m_EditorClassIdentifier: + startFrame: 4 + lifeTime: 0.1 + angle: 0 + amount: 0 diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Effect/unit_effect_blur.mat b/Assets/Bundle/Unit/PC/Erika/Materials/Effect/unit_effect_blur.mat index 0caa6c1a..56f408b5 100644 --- a/Assets/Bundle/Unit/PC/Erika/Materials/Effect/unit_effect_blur.mat +++ b/Assets/Bundle/Unit/PC/Erika/Materials/Effect/unit_effect_blur.mat @@ -60,6 +60,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: + - _Angle: 14.9 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 diff --git a/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta new file mode 100644 index 00000000..8c41a6b2 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5dc1b71affc68b54594096a1b96a5c00 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/Models.meta b/Assets/Bundle/Unit/PC/Erika/Models.meta new file mode 100644 index 00000000..11148d17 --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d712421d808a43438a43d8a5d34effe +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/Erika/UnitData.meta b/Assets/Bundle/Unit/PC/Erika/UnitData.meta new file mode 100644 index 00000000..7d4b13eb --- /dev/null +++ b/Assets/Bundle/Unit/PC/Erika/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 922befa8a94692845b88500a23229d7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta new file mode 100644 index 00000000..f5434a00 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 07c3b2bf6cb8cc2498422bbb105cbad8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta new file mode 100644 index 00000000..4ed2c938 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 827d77abe87680a47ae2d71a9e953a18 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta new file mode 100644 index 00000000..43a52cd1 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a2b72fbb41383047ac45e6c22ea9663 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta new file mode 100644 index 00000000..85d58a8c --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b2b0838fb0603964e99904eefe81ad7f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta new file mode 100644 index 00000000..dd867045 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c8a678ea9e801f439a1003d04f33cf5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta new file mode 100644 index 00000000..dc530723 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ebf636c7cf7b1934b885298ce1f5f42e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta new file mode 100644 index 00000000..b28b6f04 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2022e8298d3a8624992143eb57c0f8ac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta new file mode 100644 index 00000000..eeca0d3b --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f6aa859c834c51f498ef0b3c3b83a0f5 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta new file mode 100644 index 00000000..7f91da28 --- /dev/null +++ b/Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: df69962f5b01e444a8bea87e31c7d0a4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Unit/Prop.meta b/Assets/Bundle/Unit/Prop.meta new file mode 100644 index 00000000..affd6eed --- /dev/null +++ b/Assets/Bundle/Unit/Prop.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dafc173db1ebeab4c80641cc3d4fa528 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: |