From cec37ddb003304a224b804a78479ae46dae58fed Mon Sep 17 00:00:00 2001 From: chai Date: Thu, 16 Sep 2021 20:51:19 +0800 Subject: + motion blur --- Assets/Art/Models/Characters/Default.meta | 8 ++ Assets/Art/Models/Characters/Erika2.meta | 8 ++ .../AbstractWiresEffect/Scripts.meta | 8 ++ Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta | 8 ++ Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta | 8 ++ Assets/Bundle/Materials/Unit.meta | 8 ++ Assets/Bundle/Materials/Unit/Effect.meta | 8 ++ Assets/Bundle/Materials/Unit/ImageEffect.meta | 8 ++ .../Unit/ImageEffect/unit_img_motionBlur.mat | 77 +++++++++++++ .../Unit/ImageEffect/unit_img_motionBlur.mat.meta | 8 ++ Assets/Bundle/Materials/eff_teleport.mat | 98 ----------------- Assets/Bundle/Materials/eff_teleport.mat.meta | 8 -- Assets/Bundle/Models.meta | 8 ++ Assets/Bundle/Prefabs.meta | 8 ++ Assets/Bundle/Scenes/Demo/AnimationEditScene.unity | 5 +- Assets/Bundle/Shaders/Unit/Effect.meta | 2 +- .../Shaders/Unit/Effect/unit_effect_blur.shader | 67 ------------ .../Unit/Effect/unit_effect_blur.shader.meta | 9 -- Assets/Bundle/Shaders/Unit/ImageEffect.meta | 8 ++ .../Unit/ImageEffect/unit_img_colorDrift.shader | 58 ++++++++++ .../ImageEffect/unit_img_colorDrift.shader.meta | 9 ++ .../Unit/ImageEffect/unit_img_glitch.shader | 58 ++++++++++ .../Unit/ImageEffect/unit_img_glitch.shader.meta | 9 ++ .../Unit/ImageEffect/unit_img_motionBlur.shader | 74 +++++++++++++ .../ImageEffect/unit_img_motionBlur.shader.meta | 9 ++ .../Unit/ImageEffect/unit_img_speedLine.shader | 58 ++++++++++ .../ImageEffect/unit_img_speedLine.shader.meta | 9 ++ Assets/Bundle/UI.meta | 8 ++ .../Unit/Monster/Robots_Prowler/ActionData.meta | 8 ++ .../Unit/Monster/Robots_Prowler/UnitData.meta | 8 ++ Assets/Bundle/Unit/NPC.meta | 8 ++ .../PC/Erika/AnimationData/Air_Combo03_Z0_1.asset | 57 ++++++++-- .../Unit/PC/Erika/AnimationData/Air_Dash.asset | 119 ++++++++++++++++++++- .../PC/Erika/Materials/Effect/unit_effect_blur.mat | 1 + Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta | 8 ++ Assets/Bundle/Unit/PC/Erika/Models.meta | 8 ++ Assets/Bundle/Unit/PC/Erika/UnitData.meta | 8 ++ Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta | 8 -- Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta | 8 ++ .../Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta | 8 ++ .../Bundle/Unit/PC/ErikaCyborg/AnimationData.meta | 8 ++ .../Unit/PC/ErikaCyborg/Materials/AfterImage.meta | 8 ++ .../Unit/PC/ErikaCyborg/Materials/Normal.meta | 8 ++ Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta | 8 ++ Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta | 8 ++ Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta | 8 ++ Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta | 8 ++ Assets/Bundle/Unit/Prop.meta | 8 ++ Assets/Data/RootMotionData.meta | 8 -- Assets/Scripts/Curve3D.meta | 8 ++ Assets/Scripts/Drone.meta | 8 ++ Assets/Scripts/Managers/SceneManager.cs | 15 +++ Assets/Scripts/Managers/SceneManager.cs.meta | 11 ++ Assets/Scripts/Props.meta | 8 ++ Assets/Scripts/Robot.meta | 8 ++ Assets/Scripts/Scene.meta | 8 ++ Assets/Scripts/Test 1/TestCamera.cs | 5 +- Assets/Scripts/Test 1/TestErika.cs | 2 + Assets/Scripts/Unit/AI/Actions.meta | 8 ++ Assets/Scripts/Unit/AI/Conditionals.meta | 8 ++ Assets/Scripts/Unit/AnimationData.cs | 6 ++ Assets/Scripts/Unit/Components/UnitEffect.cs | 47 ++++++++ Assets/Scripts/Unit/Components/UnitEffect.cs.meta | 11 ++ Assets/Scripts/Unit/Components/UnitRender.cs | 17 +++ Assets/Scripts/Unit/Controller/PCController.cs | 13 ++- Assets/Scripts/Unit/Effect/UnitCamera.cs | 2 +- .../Events/EventMesh_ImageEffect_MotionBlur.cs | 17 +++ .../EventMesh_ImageEffect_MotionBlur.cs.meta | 11 ++ .../Events/EventMesh_VisibilityInMainCamera.cs | 13 +++ .../EventMesh_VisibilityInMainCamera.cs.meta | 11 ++ Assets/Scripts/Unit/TimelineEventProxy.cs | 31 +++--- Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs | 17 +++ .../Tools/ActionTool/Editor/ActionPreviewEditor.cs | 20 ++-- 73 files changed, 1036 insertions(+), 244 deletions(-) create mode 100644 Assets/Art/Models/Characters/Default.meta create mode 100644 Assets/Art/Models/Characters/Erika2.meta create mode 100644 Assets/Art/Vfx/GrabSquaresEffect/AbstractWiresEffect/Scripts.meta create mode 100644 Assets/Art/Vfx/GrabSquaresEffect/Scripts.meta create mode 100644 Assets/Art/Vfx/GrabSquaresEffect/Shaders.meta create mode 100644 Assets/Bundle/Materials/Unit.meta create mode 100644 Assets/Bundle/Materials/Unit/Effect.meta create mode 100644 Assets/Bundle/Materials/Unit/ImageEffect.meta create mode 100644 Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat create mode 100644 Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat.meta delete mode 100644 Assets/Bundle/Materials/eff_teleport.mat delete mode 100644 Assets/Bundle/Materials/eff_teleport.mat.meta create mode 100644 Assets/Bundle/Models.meta create mode 100644 Assets/Bundle/Prefabs.meta delete mode 100644 Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader delete mode 100644 Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader.meta create mode 100644 Assets/Bundle/Shaders/Unit/ImageEffect.meta create mode 100644 Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader create mode 100644 Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_colorDrift.shader.meta create mode 100644 Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_glitch.shader create mode 100644 Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_glitch.shader.meta create mode 100644 Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader create mode 100644 Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta create mode 100644 Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader create mode 100644 Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_speedLine.shader.meta create mode 100644 Assets/Bundle/UI.meta create mode 100644 Assets/Bundle/Unit/Monster/Robots_Prowler/ActionData.meta create mode 100644 Assets/Bundle/Unit/Monster/Robots_Prowler/UnitData.meta create mode 100644 Assets/Bundle/Unit/NPC.meta create mode 100644 Assets/Bundle/Unit/PC/Erika/Materials/Normal.meta create mode 100644 Assets/Bundle/Unit/PC/Erika/Models.meta create mode 100644 Assets/Bundle/Unit/PC/Erika/UnitData.meta delete mode 100644 Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/ActionData.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/AnimationClip.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/AnimationData.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Materials/AfterImage.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Materials/Normal.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Models.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/RootMotion.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/UnitData.meta create mode 100644 Assets/Bundle/Unit/PC/ErikaCyborg/Weapons.meta create mode 100644 Assets/Bundle/Unit/Prop.meta delete mode 100644 Assets/Data/RootMotionData.meta create mode 100644 Assets/Scripts/Curve3D.meta create mode 100644 Assets/Scripts/Drone.meta create mode 100644 Assets/Scripts/Managers/SceneManager.cs create mode 100644 Assets/Scripts/Managers/SceneManager.cs.meta create mode 100644 Assets/Scripts/Props.meta create mode 100644 Assets/Scripts/Robot.meta create mode 100644 Assets/Scripts/Scene.meta create mode 100644 Assets/Scripts/Unit/AI/Actions.meta create mode 100644 Assets/Scripts/Unit/AI/Conditionals.meta create mode 100644 Assets/Scripts/Unit/Components/UnitEffect.cs create mode 100644 Assets/Scripts/Unit/Components/UnitEffect.cs.meta create mode 100644 Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs create mode 100644 Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs.meta create mode 100644 Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs create mode 100644 Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs.meta (limited to 'Assets') diff --git a/Assets/Art/Models/Characters/Default.meta b/Assets/Art/Models/Characters/Default.meta new file mode 100644 index 00000000..43499fc7 --- /dev/null +++ b/Assets/Art/Models/Characters/Default.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e8a40298dd4efd14c9f90a63734ca39b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/Models/Characters/Erika2.meta b/Assets/Art/Models/Characters/Erika2.meta new file mode 100644 index 00000000..fd7369d9 --- /dev/null +++ b/Assets/Art/Models/Characters/Erika2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 077f81003f9fc564791cce182048c2b0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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/Bundle/Materials/Unit.meta b/Assets/Bundle/Materials/Unit.meta new file mode 100644 index 00000000..b2db0fdd --- /dev/null +++ b/Assets/Bundle/Materials/Unit.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f48ccdc5d29d31849a72a586f64f480d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: 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/Unit/ImageEffect/unit_img_motionBlur.mat b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat new file mode 100644 index 00000000..3f655bb6 --- /dev/null +++ b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat @@ -0,0 +1,77 @@ +%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: unit_img_motionBlur + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + 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: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat.meta b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat.meta new file mode 100644 index 00000000..8322b5dd --- /dev/null +++ b/Assets/Bundle/Materials/Unit/ImageEffect/unit_img_motionBlur.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 91c7bc1a7ec9d5b428fa8b647cae5e6b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Bundle/Materials/eff_teleport.mat b/Assets/Bundle/Materials/eff_teleport.mat deleted file mode 100644 index 862809a1..00000000 --- a/Assets/Bundle/Materials/eff_teleport.mat +++ /dev/null @@ -1,98 +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: eff_teleport - m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON - m_LightmapFlags: 0 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: 3000 - stringTagMap: - RenderType: Transparent - disabledShaderPasses: - - ALWAYS - 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: 2800000, guid: 50c4a6456461a2e4f9c41755e6002738, type: 3} - 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: - - _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 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _LightingEnabled: 0 - - _Metallic: 0 - - _Mode: 2 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SoftParticlesEnabled: 0 - - _SoftParticlesFarFadeDistance: 1 - - _SoftParticlesNearFadeDistance: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 5 - - _UVSec: 0 - - _ZWrite: 0 - 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/eff_teleport.mat.meta deleted file mode 100644 index 2febaaec..00000000 --- a/Assets/Bundle/Materials/eff_teleport.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d16f3f62fd188a645b0451bd8f022807 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: 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/Effect/unit_effect_blur.shader b/Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader deleted file mode 100644 index 6a3aad0b..00000000 --- a/Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader +++ /dev/null @@ -1,67 +0,0 @@ -// 1:09 https://www.youtube.com/watch?v=LhqI_yj3zO0 -Shader "Erika/Unit/Effect/unit_effect_blur" -{ - Properties - { - _MainTex("Texture", 2D) = "white" {} - _BlurTex("Texture", 2D) = "black" {} - _MaskColor ("Mask Color", Color) = (1,1,1,1) - } - SubShader - { - Tags { "RenderType"="Opaque" "Queue" = "Transparent"} - LOD 100 - - Blend SrcAlpha OneMinusSrcAlpha - - Pass - { - CGPROGRAM - #pragma vertex vert - #pragma fragment frag - - #include "UnityCG.cginc" - - struct appdata - { - float4 vertex : POSITION; - float2 uv : TEXCOORD0; - }; - - struct v2f - { - float2 uv : TEXCOORD0; - float4 vertex : SV_POSITION; - }; - - sampler2D _MainTex; - float4 _MainTex_ST; - - sampler2D _BlurTex; - float4 _BlurTex_ST; - - fixed4 _MaskColor; - - v2f vert (appdata v) - { - v2f o; - o.vertex = UnityObjectToClipPos(v.vertex); - o.uv = TRANSFORM_TEX(v.uv, _MainTex); - return o; - } - - 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; - } - ENDCG - } - } -} diff --git a/Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader.meta b/Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader.meta deleted file mode 100644 index 4afe3c18..00000000 --- a/Assets/Bundle/Shaders/Unit/Effect/unit_effect_blur.shader.meta +++ /dev/null @@ -1,9 +0,0 @@ -fileFormatVersion: 2 -guid: f0e5d0965cb119045abf4f057a692835 -ShaderImporter: - externalObjects: {} - defaultTextures: [] - nonModifiableTextures: [] - userData: - assetBundleName: - assetBundleVariant: 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/ImageEffect/unit_img_motionBlur.shader b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader new file mode 100644 index 00000000..c4802a07 --- /dev/null +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader @@ -0,0 +1,74 @@ +// 1:09 https://www.youtube.com/watch?v=LhqI_yj3zO0 +Shader "Erika/Unit/Effect/unit_effect_blur" +{ + Properties + { + _MainTex("Texture", 2D) = "white" {} + _BlurTex("Texture", 2D) = "black" {} + _MaskColor ("Mask Color", Color) = (1,1,1,1) + _Angle("Angle", float) = 0 + } + SubShader + { + Tags { "RenderType"="Opaque" "Queue" = "Transparent"} + LOD 100 + + Blend SrcAlpha OneMinusSrcAlpha + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + + #include "UnityCG.cginc" + + struct appdata + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct v2f + { + float2 uv : TEXCOORD0; + float4 vertex : SV_POSITION; + }; + + sampler2D _MainTex; + float4 _MainTex_ST; + + sampler2D _BlurTex; + float4 _BlurTex_ST; + + fixed4 _MaskColor; + + float _Angle; + + v2f vert (appdata v) + { + v2f o; + o.vertex = UnityObjectToClipPos(v.vertex); + o.uv = TRANSFORM_TEX(v.uv, _MainTex); + return o; + } + + fixed4 frag (v2f i) : SV_Target + { + 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/ImageEffect/unit_img_motionBlur.shader.meta b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta new file mode 100644 index 00000000..4afe3c18 --- /dev/null +++ b/Assets/Bundle/Shaders/Unit/ImageEffect/unit_img_motionBlur.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: f0e5d0965cb119045abf4f057a692835 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: 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/Erika/Weapons/Materials.meta b/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta deleted file mode 100644 index be6badd6..00000000 --- a/Assets/Bundle/Unit/PC/Erika/Weapons/Materials.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 2c46a5a23283c7d428ae8bb13663ab6a -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: diff --git a/Assets/Data/RootMotionData.meta b/Assets/Data/RootMotionData.meta deleted file mode 100644 index 14abf402..00000000 --- a/Assets/Data/RootMotionData.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 5cfee9bde9754254f83510f88dd2a19b -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Curve3D.meta b/Assets/Scripts/Curve3D.meta new file mode 100644 index 00000000..fef1c5e7 --- /dev/null +++ b/Assets/Scripts/Curve3D.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad8b718b6b700d8419838dad07158567 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Drone.meta b/Assets/Scripts/Drone.meta new file mode 100644 index 00000000..694cff70 --- /dev/null +++ b/Assets/Scripts/Drone.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec3412151f8a72a41b2ed21316763399 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Managers/SceneManager.cs b/Assets/Scripts/Managers/SceneManager.cs new file mode 100644 index 00000000..c986a1b1 --- /dev/null +++ b/Assets/Scripts/Managers/SceneManager.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SceneManager : Singleton +{ + + public Camera mainCamera { get; private set; } + + public void SetMainCamera(Camera cam) + { + mainCamera = cam; + } + +} diff --git a/Assets/Scripts/Managers/SceneManager.cs.meta b/Assets/Scripts/Managers/SceneManager.cs.meta new file mode 100644 index 00000000..c8bbc8f8 --- /dev/null +++ b/Assets/Scripts/Managers/SceneManager.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: fc495e12ea00bc248889c82ebc476f03 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + 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: diff --git a/Assets/Scripts/Robot.meta b/Assets/Scripts/Robot.meta new file mode 100644 index 00000000..0b5a087e --- /dev/null +++ b/Assets/Scripts/Robot.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c09ca1609552d24bbe697d1516f8aa9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scene.meta b/Assets/Scripts/Scene.meta new file mode 100644 index 00000000..eb7a8716 --- /dev/null +++ b/Assets/Scripts/Scene.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: eaee2d0f48cff9b40baf0686a8105600 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Test 1/TestCamera.cs b/Assets/Scripts/Test 1/TestCamera.cs index 62b3a2d9..8e4ba89e 100644 --- a/Assets/Scripts/Test 1/TestCamera.cs +++ b/Assets/Scripts/Test 1/TestCamera.cs @@ -6,10 +6,9 @@ public class TestCamera : MonoBehaviour { public Vector3 offset = Vector3.zero; - // Start is called before the first frame update - void Start() + void Awake() { - + SceneManager.Instance.SetMainCamera(this.gameObject.GetComponent()); } // Update is called once per frame diff --git a/Assets/Scripts/Test 1/TestErika.cs b/Assets/Scripts/Test 1/TestErika.cs index 90ac0499..9f889934 100644 --- a/Assets/Scripts/Test 1/TestErika.cs +++ b/Assets/Scripts/Test 1/TestErika.cs @@ -30,12 +30,14 @@ public class TestErika : SingletonMB { public UnitSetUp erika; public UnitSetUp monster; + public GameObject unitEffect; protected override void Awake() { base.Awake(); SetupErika(); SetupMonster(); + UnitEffect.effectPlane = unitEffect; } private void Update() diff --git a/Assets/Scripts/Unit/AI/Actions.meta b/Assets/Scripts/Unit/AI/Actions.meta new file mode 100644 index 00000000..9b4ad463 --- /dev/null +++ b/Assets/Scripts/Unit/AI/Actions.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 971e9d55b8bc0894eb6a110fb962000b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/AI/Conditionals.meta b/Assets/Scripts/Unit/AI/Conditionals.meta new file mode 100644 index 00000000..70a86da5 --- /dev/null +++ b/Assets/Scripts/Unit/AI/Conditionals.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 85b7e0c7ed1d12f42a5178bfbf3d934c +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/AnimationData.cs b/Assets/Scripts/Unit/AnimationData.cs index 784acf05..9af3d51c 100644 --- a/Assets/Scripts/Unit/AnimationData.cs +++ b/Assets/Scripts/Unit/AnimationData.cs @@ -437,6 +437,8 @@ public class AnimationData : ScriptableObject events.Clear(); foreach (var animeEvent in animationEvents) { + if (animeEvent == null) + continue; if(animeEvent.startFrame == frame) { events.Add(animeEvent); @@ -476,6 +478,8 @@ public class AnimationData : ScriptableObject frames.Clear(); foreach (var animeEvent in animationEvents) { + if (animeEvent == null) + continue; if (!frames.Contains(animeEvent.startFrame)) { frames.Add(animeEvent.startFrame); @@ -509,6 +513,8 @@ public class AnimationData : ScriptableObject { foreach(var animEvent in animationEvents) { + if (animEvent == null) + continue; if(!AssetDatabase.IsSubAsset(animEvent)) { AssetDatabase.AddObjectToAsset(animEvent, this); diff --git a/Assets/Scripts/Unit/Components/UnitEffect.cs b/Assets/Scripts/Unit/Components/UnitEffect.cs new file mode 100644 index 00000000..9add6513 --- /dev/null +++ b/Assets/Scripts/Unit/Components/UnitEffect.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EffectHandle +{ + public float lifeTime; + public float curTime; + public bool markDead; +} + +//Unit后处理效果 +public class UnitEffect : UnitComponent +{ + public List effects = new List(); + public static GameObject effectPlane; + + public void ShowMotionBlur(float lifetime) + { + EffectHandle eff = new EffectHandle(); + eff.lifeTime = lifetime; + eff.curTime = 0; + eff.markDead = false; + effects.Add(eff); + effectPlane.gameObject.SetActive(true); + } + + public override void OnUpdate() + { + base.OnUpdate(); + + effectPlane.transform.position = UnitManager.Instance.pc.center; + + for(int i = 0; i < effects.Count; ++i) + { + if (effects[i].markDead) + continue; + effects[i].curTime += Time.deltaTime; + if(effects[i].curTime > effects[i].lifeTime) + { + effects[i].markDead = true; + effectPlane.gameObject.SetActive(false); + } + } + } + +} diff --git a/Assets/Scripts/Unit/Components/UnitEffect.cs.meta b/Assets/Scripts/Unit/Components/UnitEffect.cs.meta new file mode 100644 index 00000000..f71585b2 --- /dev/null +++ b/Assets/Scripts/Unit/Components/UnitEffect.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 62163ab86151f004294a831544bb3c39 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/Components/UnitRender.cs b/Assets/Scripts/Unit/Components/UnitRender.cs index b3fd18c8..435c517d 100644 --- a/Assets/Scripts/Unit/Components/UnitRender.cs +++ b/Assets/Scripts/Unit/Components/UnitRender.cs @@ -7,6 +7,23 @@ using UnityEngine; public class UnitRender : UnitComponent { + public override void Initialize() + { + base.Initialize(); + } + public void SetVisibilityInMainCamera(bool isVisible) + { + LayerMask mask = LayerMask.GetMask("PlayerCharacter"); + + if(!isVisible) + { + SceneManager.Instance.mainCamera.cullingMask &= ~mask.value; + } + else + { + SceneManager.Instance.mainCamera.cullingMask |= mask.value; + } + } } diff --git a/Assets/Scripts/Unit/Controller/PCController.cs b/Assets/Scripts/Unit/Controller/PCController.cs index 2294ae62..f3defbd7 100644 --- a/Assets/Scripts/Unit/Controller/PCController.cs +++ b/Assets/Scripts/Unit/Controller/PCController.cs @@ -8,7 +8,9 @@ public class PCController : UnitController { public static PCController instance; - private UnitAfterImage unitAfterImage; + public UnitAfterImage unitAfterImage; + + public UnitEffect unitEffect; public override UnitType type { get { return UnitType.PC; } } @@ -29,13 +31,18 @@ public class PCController : UnitController unitAfterImage = gameObject.GetOrAddComponent(); unitAfterImage.Initialize(); - } + + unitEffect = gameObject.GetOrAddComponent(); + unitEffect.Initialize(); + + } public override void Update() { base.Update(); unitAfterImage.OnUpdate(); - } + unitEffect.OnUpdate(); + } public override void OnHit(CollisionInfo info) { diff --git a/Assets/Scripts/Unit/Effect/UnitCamera.cs b/Assets/Scripts/Unit/Effect/UnitCamera.cs index 01194512..90d78730 100644 --- a/Assets/Scripts/Unit/Effect/UnitCamera.cs +++ b/Assets/Scripts/Unit/Effect/UnitCamera.cs @@ -4,7 +4,7 @@ using UnityEngine; // 专门用来渲染player character的相机，用来做特效 [RequireComponent(typeof(Camera))] -public class UnitCamera : MonoBehaviour +public class UnitCamera : SingletonMB { PCController pc { get { return UnitManager.Instance.pc; } } diff --git a/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs b/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs new file mode 100644 index 00000000..714d65e5 --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EventMesh_ImageEffect_MotionBlur : AnimationEventBase +{ + public override TimelineEventProxy.EEventType type => TimelineEventProxy.EEventType.EventMesh_ImageEffect_MotionBlur; + + public override string shortName => "M"; + + public float lifeTime; + + public float angle; + + public float amount; + +} diff --git a/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs.meta b/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs.meta new file mode 100644 index 00000000..e8e385f9 --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventMesh_ImageEffect_MotionBlur.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a75401f0015aa1e4f856979c8aa1dae2 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs b/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs new file mode 100644 index 00000000..cf6e1bc8 --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs @@ -0,0 +1,13 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EventMesh_VisibilityInMainCamera : AnimationEventBase +{ + public override TimelineEventProxy.EEventType type => TimelineEventProxy.EEventType.EventMesh_VisibilityInMainCamera; + + public override string shortName => "V"; + + public bool isVisible; + +} diff --git a/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs.meta b/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs.meta new file mode 100644 index 00000000..eb3e8bf8 --- /dev/null +++ b/Assets/Scripts/Unit/Events/EventMesh_VisibilityInMainCamera.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a4957372b8a4fd946b86016c20f83750 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Unit/TimelineEventProxy.cs b/Assets/Scripts/Unit/TimelineEventProxy.cs index 356a7498..9e41e30e 100644 --- a/Assets/Scripts/Unit/TimelineEventProxy.cs +++ b/Assets/Scripts/Unit/TimelineEventProxy.cs @@ -48,23 +48,26 @@ public partial class TimelineEventProxy // 不要序列化枚举值，因为可能会随时更改 public enum EEventType { - EventGame_TimeScale, // 缩放时间 - + EventGame_TimeScale, // 缩放时间 + + EventMesh_ImageEffect_MotionBlur, // 运动模糊 + EventMesh_ImageEffect_Glitch, // glitch + EventMesh_AfterImage, // 角色残像 + EventMesh_AfterImageStop, // 角色残像停止事件 + EventMesh_FadeIn, // 角色透明度 + EventMesh_FadeOut, // 角色透明度 + EventMesh_Gloss, // 角色泛光 + EventMesh_VisibilityInMainCamera, // 是否在主相机渲染 + + EventUnit_SetPosition, // 设置位置 + EventUnit_BulletTime, // 子弹时间 + EventCamera_Zoom, // 相机聚焦 EventCamera_Shake, // 相机晃动 EventCamera_Blur, // 相机模糊 EventCamera_WhiteOut, // 相机白屏 - - EventUnit_SetPosition, // 设置位置 - - EventMesh_AfterImage, // 角色残像 - EventMesh_AfterImageStop, // 角色残像停止事件 - EventMesh_FadeIn, // 角色透明度 - EventMesh_FadeOut, // 角色透明度 - EventMesh_Gloss, // 角色泛光 - EventMesh_Blur, // 运动模糊（非后处理） - - EventEnv_Dark, + + EventEnv_Dark, EventEnv_Exposure, EventUI_Drift, // @@ -73,8 +76,6 @@ public partial class TimelineEventProxy EventProjectile, // 发射体 EventEffect, // 特效 EventSound, // 音效 - - EventBulletTime, // 子弹时间 } public const int FPS = 30; // timeline 每秒采样30次 diff --git a/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs b/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs index a3eef37a..a15d262e 100644 --- a/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs +++ b/Assets/Scripts/Unit/TimelineEventProxy_Handlers.cs @@ -160,4 +160,21 @@ public partial class TimelineEventProxy // 在unitState回调里处理 } + void EventMesh_VisibilityInMainCamera(AnimationEventBase animEvent) + { + EventMesh_VisibilityInMainCamera visible = animEvent as EventMesh_VisibilityInMainCamera; + if (visible == null) + return; + if (owner == null || owner.unitRender == null) + return; + owner.unitRender.SetVisibilityInMainCamera(visible.isVisible); + } + + void EventMesh_ImageEffect_MotionBlur(AnimationEventBase animEvent) + { + EventMesh_ImageEffect_MotionBlur motionBlur = animEvent as EventMesh_ImageEffect_MotionBlur; + if (motionBlur == null) + return ; + ((PCController)owner).unitEffect.ShowMotionBlur(motionBlur.lifeTime); + } } \ No newline at end of file diff --git a/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs b/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs index 03858393..3699762c 100644 --- a/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs +++ b/Assets/Tools/ActionTool/Editor/ActionPreviewEditor.cs @@ -1001,17 +1001,15 @@ namespace ActionTool { GUIContent item = null; string shortName = name.Replace("Event", ""); - int underscore = shortName.IndexOf('_'); - if(underscore != -1) - { - string category = shortName.Substring(0, underscore); - shortName = shortName.Substring(underscore + 1, shortName.Length - underscore - 1); - item = new GUIContent("New Event/" + category + "/" + shortName); - } - else - { - item = new GUIContent("New Event/" + shortName); - } + string path = "New Event/"; + while(shortName.IndexOf('_') != -1) + { + int underscore = shortName.IndexOf('_'); + string category = shortName.Substring(0, underscore); + path += category + "/"; + shortName = shortName.Substring(underscore + 1, shortName.Length - underscore - 1); + } + item = new GUIContent(path + shortName); EventParam param = new EventParam(); param.eventName = name; param.frame = frame; -- cgit v1.1-26-g67d0