diff --git a/Assets/External VFXs/MasterStylizedProjectiles/Materials/Shuriken/ShurikenTrail.mat b/Assets/External VFXs/MasterStylizedProjectiles/Materials/Shuriken/ShurikenTrail.mat index 6320e810c..904486ee8 100644 --- a/Assets/External VFXs/MasterStylizedProjectiles/Materials/Shuriken/ShurikenTrail.mat +++ b/Assets/External VFXs/MasterStylizedProjectiles/Materials/Shuriken/ShurikenTrail.mat @@ -32,11 +32,13 @@ Material: m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque + RenderType: Transparent disabledShaderPasses: - GRABPASS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -99,8 +101,8 @@ Material: - _DistortionEnabled: 0 - _DistortionStrength: 1 - _DistortionStrengthScaled: 0 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EmissionEnabled: 0 - _FlipbookBlending: 0 - _FlipbookMode: 0 @@ -118,16 +120,16 @@ Material: - _SoftParticlesFarFadeDistance: 1 - _SoftParticlesNearFadeDistance: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _SrcBlendAlpha: 1 - _Surface: 1 - _UVSec: 0 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - _BaseColor: {r: 1, g: 1, b: 1, a: 0.7607843} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 0.7607843} - _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/Input/PlayerInputActions.cs b/Assets/Input/PlayerInputActions.cs index ad1cb5c65..d33b41dc8 100644 --- a/Assets/Input/PlayerInputActions.cs +++ b/Assets/Input/PlayerInputActions.cs @@ -273,7 +273,7 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable ""initialStateCheck"": false }, { - ""name"": ""LockOnTarget"", + ""name"": ""LockonTarget"", ""type"": ""Button"", ""id"": ""eed9b745-4c84-4af3-b428-6badafdfe7d8"", ""expectedControlType"": """", @@ -281,6 +281,15 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable ""interactions"": """", ""initialStateCheck"": false }, + { + ""name"": ""SelectLockonTarget"", + ""type"": ""PassThrough"", + ""id"": ""dac3603a-fa3a-4145-b35e-2ea340e2f291"", + ""expectedControlType"": ""Axis"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false + }, { ""name"": ""RouletteSwitchMainWeapon"", ""type"": ""Button"", @@ -606,8 +615,8 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable ""path"": ""/middleButton"", ""interactions"": """", ""processors"": """", - ""groups"": """", - ""action"": ""LockOnTarget"", + ""groups"": "";KeyboardMouse"", + ""action"": ""LockonTarget"", ""isComposite"": false, ""isPartOfComposite"": false }, @@ -676,6 +685,17 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable ""action"": ""RouletteSwitchMainWeapon"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""13962bd7-cc43-4f3a-987c-361c84f01629"", + ""path"": ""/scroll/y"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""SelectLockonTarget"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -752,7 +772,8 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable m_Player_SwitchNextMainWeapon = m_Player.FindAction("SwitchNextMainWeapon", throwIfNotFound: true); m_Player_Walk = m_Player.FindAction("Walk", throwIfNotFound: true); m_Player_FlyUp = m_Player.FindAction("FlyUp", throwIfNotFound: true); - m_Player_LockOnTarget = m_Player.FindAction("LockOnTarget", throwIfNotFound: true); + m_Player_LockonTarget = m_Player.FindAction("LockonTarget", throwIfNotFound: true); + m_Player_SelectLockonTarget = m_Player.FindAction("SelectLockonTarget", throwIfNotFound: true); m_Player_RouletteSwitchMainWeapon = m_Player.FindAction("RouletteSwitchMainWeapon", throwIfNotFound: true); } @@ -854,7 +875,8 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable private readonly InputAction m_Player_SwitchNextMainWeapon; private readonly InputAction m_Player_Walk; private readonly InputAction m_Player_FlyUp; - private readonly InputAction m_Player_LockOnTarget; + private readonly InputAction m_Player_LockonTarget; + private readonly InputAction m_Player_SelectLockonTarget; private readonly InputAction m_Player_RouletteSwitchMainWeapon; /// /// Provides access to input actions defined in input action map "Player". @@ -948,9 +970,13 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable /// public InputAction @FlyUp => m_Wrapper.m_Player_FlyUp; /// - /// Provides access to the underlying input action "Player/LockOnTarget". + /// Provides access to the underlying input action "Player/LockonTarget". /// - public InputAction @LockOnTarget => m_Wrapper.m_Player_LockOnTarget; + public InputAction @LockonTarget => m_Wrapper.m_Player_LockonTarget; + /// + /// Provides access to the underlying input action "Player/SelectLockonTarget". + /// + public InputAction @SelectLockonTarget => m_Wrapper.m_Player_SelectLockonTarget; /// /// Provides access to the underlying input action "Player/RouletteSwitchMainWeapon". /// @@ -1041,9 +1067,12 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable @FlyUp.started += instance.OnFlyUp; @FlyUp.performed += instance.OnFlyUp; @FlyUp.canceled += instance.OnFlyUp; - @LockOnTarget.started += instance.OnLockOnTarget; - @LockOnTarget.performed += instance.OnLockOnTarget; - @LockOnTarget.canceled += instance.OnLockOnTarget; + @LockonTarget.started += instance.OnLockonTarget; + @LockonTarget.performed += instance.OnLockonTarget; + @LockonTarget.canceled += instance.OnLockonTarget; + @SelectLockonTarget.started += instance.OnSelectLockonTarget; + @SelectLockonTarget.performed += instance.OnSelectLockonTarget; + @SelectLockonTarget.canceled += instance.OnSelectLockonTarget; @RouletteSwitchMainWeapon.started += instance.OnRouletteSwitchMainWeapon; @RouletteSwitchMainWeapon.performed += instance.OnRouletteSwitchMainWeapon; @RouletteSwitchMainWeapon.canceled += instance.OnRouletteSwitchMainWeapon; @@ -1118,9 +1147,12 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable @FlyUp.started -= instance.OnFlyUp; @FlyUp.performed -= instance.OnFlyUp; @FlyUp.canceled -= instance.OnFlyUp; - @LockOnTarget.started -= instance.OnLockOnTarget; - @LockOnTarget.performed -= instance.OnLockOnTarget; - @LockOnTarget.canceled -= instance.OnLockOnTarget; + @LockonTarget.started -= instance.OnLockonTarget; + @LockonTarget.performed -= instance.OnLockonTarget; + @LockonTarget.canceled -= instance.OnLockonTarget; + @SelectLockonTarget.started -= instance.OnSelectLockonTarget; + @SelectLockonTarget.performed -= instance.OnSelectLockonTarget; + @SelectLockonTarget.canceled -= instance.OnSelectLockonTarget; @RouletteSwitchMainWeapon.started -= instance.OnRouletteSwitchMainWeapon; @RouletteSwitchMainWeapon.performed -= instance.OnRouletteSwitchMainWeapon; @RouletteSwitchMainWeapon.canceled -= instance.OnRouletteSwitchMainWeapon; @@ -1357,12 +1389,19 @@ public partial class @PlayerInputActions: IInputActionCollection2, IDisposable /// void OnFlyUp(InputAction.CallbackContext context); /// - /// Method invoked when associated input action "LockOnTarget" is either , or . + /// Method invoked when associated input action "LockonTarget" is either , or . /// /// /// /// - void OnLockOnTarget(InputAction.CallbackContext context); + void OnLockonTarget(InputAction.CallbackContext context); + /// + /// Method invoked when associated input action "SelectLockonTarget" is either , or . + /// + /// + /// + /// + void OnSelectLockonTarget(InputAction.CallbackContext context); /// /// Method invoked when associated input action "RouletteSwitchMainWeapon" is either , or . /// diff --git a/Assets/Input/PlayerInputActions.inputactions b/Assets/Input/PlayerInputActions.inputactions index 6365bdada..4e7fb1a7f 100644 --- a/Assets/Input/PlayerInputActions.inputactions +++ b/Assets/Input/PlayerInputActions.inputactions @@ -187,7 +187,7 @@ "initialStateCheck": false }, { - "name": "LockOnTarget", + "name": "LockonTarget", "type": "Button", "id": "eed9b745-4c84-4af3-b428-6badafdfe7d8", "expectedControlType": "", @@ -195,6 +195,15 @@ "interactions": "", "initialStateCheck": false }, + { + "name": "SelectLockonTarget", + "type": "PassThrough", + "id": "dac3603a-fa3a-4145-b35e-2ea340e2f291", + "expectedControlType": "Axis", + "processors": "", + "interactions": "", + "initialStateCheck": false + }, { "name": "RouletteSwitchMainWeapon", "type": "Button", @@ -520,8 +529,8 @@ "path": "/middleButton", "interactions": "", "processors": "", - "groups": "", - "action": "LockOnTarget", + "groups": ";KeyboardMouse", + "action": "LockonTarget", "isComposite": false, "isPartOfComposite": false }, @@ -590,6 +599,17 @@ "action": "RouletteSwitchMainWeapon", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "13962bd7-cc43-4f3a-987c-361c84f01629", + "path": "/scroll/y", + "interactions": "", + "processors": "", + "groups": "", + "action": "SelectLockonTarget", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash.asset b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash.asset index f8db77feb..53cfb4c36 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash.asset @@ -77,115 +77,84 @@ MonoBehaviour: - rid: 1359146319654682975 type: {class: CameraFieldOfViewAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.12 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0.12 - inSlope: -0.6 - outSlope: -0.3 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -0.1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - remapMin: 0 - remapMax: 1 - relativeToInitial: 1 + fovCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 10 + outSlope: 10 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.1111112 + outSlope: -1.1111112 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1.5 + relativeToInitial: 1 - rid: 1359146319654682976 type: {class: CameraRotationShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 10 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.32 - value: -0.3 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.52 - value: 0.12 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.72 - value: -0.04 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - rotationAmplitude: {x: 1.5, y: 0, z: 0} + amplitude: {x: 1.5, y: 0, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 10 + outSlope: 10 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.1111112 + outSlope: -1.1111112 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 directionSettings: affectedByCameraDirection: 0 affectedByCharacterDirection: 1 @@ -218,40 +187,71 @@ MonoBehaviour: - rid: 1359146319654683306 type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - positionAmplitude: {x: 0, y: -0.6, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 10 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.32 + value: -0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.52 + value: 0.12 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.72 + value: -0.04 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: 0, y: -0.5, z: 0} directionSettings: affectedByCameraDirection: 0 affectedByCharacterDirection: 0 @@ -284,41 +284,42 @@ MonoBehaviour: - rid: 1359146319654683401 type: {class: RadialBlurAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 10 - outSlope: 10 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1.1111112 - outSlope: -1.1111112 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - remapMin: 0 - remapMax: 0.25 - relativeToInitial: 0 + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 10 + outSlope: 10 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.1111112 + outSlope: -1.1111112 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.25 + relativeToInitial: 1 modifyCenter: 0 center: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash_NoCameraRotation.asset b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash_NoCameraRotation.asset new file mode 100644 index 000000000..de1e50ecb --- /dev/null +++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash_NoCameraRotation.asset @@ -0,0 +1,246 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 87e69f21423d3c746ae55ea47c545ba6, type: 3} + m_Name: Player_Feedback_Dash_NoCameraRotation + m_EditorClassIdentifier: SLSUtilities::SLSUtilities.Feedback.FeedbackData + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + parentCollection: {fileID: 11400000, guid: 97907d6e971a2dd41b795615cb499f34, type: 2} + feedbackName: Dash_NoCameraRotation + defaultTimeSettings: + timeScaleType: 1 + applyDynamicTimeScale: 1 + tracks: + - trackName: Camera + mute: 0 + solo: 0 + clips: + - clipName: + startTime: 0 + duration: 0.8 + overrideTimeSettings: 0 + timeSettings: + timeScaleType: 1 + applyDynamicTimeScale: 1 + action: + rid: 1359146319654682975 + - clipName: + startTime: 0 + duration: 0.8 + overrideTimeSettings: 0 + timeSettings: + timeScaleType: 1 + applyDynamicTimeScale: 1 + action: + rid: 1359146319654683306 + - trackName: Postprocessing + mute: 0 + solo: 0 + clips: + - clipName: + startTime: 0 + duration: 0.8 + overrideTimeSettings: 0 + timeSettings: + timeScaleType: 1 + applyDynamicTimeScale: 1 + action: + rid: 1359146319654683401 + references: + version: 2 + RefIds: + - rid: 1359146319654682975 + type: {class: CameraFieldOfViewAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} + data: + fovCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 10 + outSlope: 10 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.1111112 + outSlope: -1.1111112 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1.5 + relativeToInitial: 1 + - rid: 1359146319654683306 + type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} + data: + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 10 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.32 + value: -0.3 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.52 + value: 0.12 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.72 + value: -0.04 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: 0, y: -0.5, z: 0} + directionSettings: + affectedByCameraDirection: 0 + affectedByCharacterDirection: 0 + useAttenuation: 0 + attenuationRange: 50 + attenuationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + - rid: 1359146319654683401 + type: {class: RadialBlurAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} + data: + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 10 + outSlope: 10 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.1111112 + outSlope: -1.1111112 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.25 + relativeToInitial: 1 + modifyCenter: 0 + center: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/SLSUtilities/Effects.meta b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash_NoCameraRotation.asset.meta similarity index 52% rename from Assets/Scripts/SLSUtilities/Effects.meta rename to Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash_NoCameraRotation.asset.meta index cfb2ad120..a0166e5ee 100644 --- a/Assets/Scripts/SLSUtilities/Effects.meta +++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dash_NoCameraRotation.asset.meta @@ -1,8 +1,8 @@ fileFormatVersion: 2 -guid: 383b31d5ddcc89e4692157c4cc81b9aa -folderAsset: yes -DefaultImporter: +guid: 9548a16e378165340823512202cfd978 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 11400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_DisruptionStartup.asset b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_DisruptionStartup.asset index 3d62a8804..b552feb9a 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_DisruptionStartup.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_DisruptionStartup.asset @@ -24,10 +24,8 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: 97907d6e971a2dd41b795615cb499f34, type: 2} feedbackName: DisruptionStartup defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Time mute: 0 @@ -38,10 +36,8 @@ MonoBehaviour: duration: 0.53333336 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146284165628324 - trackName: Postprocessing @@ -53,10 +49,8 @@ MonoBehaviour: duration: 0.5 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146297969082861 references: @@ -264,189 +258,196 @@ MonoBehaviour: - rid: 1359146297969082861 type: {class: AnimeACESAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - relativeToInitial: 1 modifyExposure: 0 - exposureCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - exposureRemapMin: 0 - exposureRemapMax: 20 + exposureChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 modifyContrast: 0 - contrastCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - contrastRemapMin: 0 - contrastRemapMax: 0.3 + contrastChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 modifySaturation: 1 - saturationCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 10 - outSlope: 10 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: -0 - outSlope: -1.4764988 - tangentMode: 5 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - saturationRemapMin: 0 - saturationRemapMax: -1.2 - enableAdvancedSettings: 0 + saturationChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 10 + outSlope: 10 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.3 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: -1.2 + relativeToInitial: 1 modifyHue: 0 - hueCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - hueRemapMin: 0 - hueRemapMax: 0.5 + hueChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 modifyColorFilter: 0 - colorFilterGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + colorFilterChannel: + gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 diff --git a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dodge.asset b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dodge.asset index dfb47bb5c..11ecf6bee 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dodge.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_Dodge.asset @@ -24,10 +24,8 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: 97907d6e971a2dd41b795615cb499f34, type: 2} feedbackName: Dodge defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Camera mute: 0 @@ -38,10 +36,8 @@ MonoBehaviour: duration: 0.8 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146321109320280 - clipName: @@ -49,10 +45,8 @@ MonoBehaviour: duration: 0.8 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146321109320282 - trackName: Postprocessing @@ -64,10 +58,8 @@ MonoBehaviour: duration: 0.8 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146321109320283 references: @@ -76,88 +68,102 @@ MonoBehaviour: - rid: 1359146321109320280 type: {class: CameraFieldOfViewAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.12 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0.12 - inSlope: -0.6 - outSlope: -0.3 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -0.1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - remapMin: 0 - remapMax: -2 - relativeToInitial: 1 + fovCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.8 + relativeToInitial: 1 - rid: 1359146321109320282 type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - positionAmplitude: {x: 0, y: -0.5, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: 0, y: -0.3, z: 0} directionSettings: affectedByCameraDirection: 0 affectedByCharacterDirection: 0 @@ -190,41 +196,42 @@ MonoBehaviour: - rid: 1359146321109320283 type: {class: RadialBlurAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 10 - outSlope: 10 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1.1111112 - outSlope: -1.1111112 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - remapMin: 0 - remapMax: 0.125 - relativeToInitial: 0 + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 10 + outSlope: 10 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.1111112 + outSlope: -1.1111112 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.15 + relativeToInitial: 1 modifyCenter: 0 center: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_GetHitMedium.asset b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_GetHitMedium.asset new file mode 100644 index 000000000..4f7967273 --- /dev/null +++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_GetHitMedium.asset @@ -0,0 +1,178 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +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: 87e69f21423d3c746ae55ea47c545ba6, type: 3} + m_Name: Player_Feedback_GetHitMedium + m_EditorClassIdentifier: SLSUtilities::SLSUtilities.Feedback.FeedbackData + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + parentCollection: {fileID: 11400000, guid: 97907d6e971a2dd41b795615cb499f34, type: 2} + feedbackName: GetHitMedium + defaultTimeSettings: + timeScaleType: 1 + applyDynamicTimeScale: 1 + tracks: + - trackName: New Track + mute: 0 + solo: 0 + clips: + - clipName: + startTime: 0 + duration: 0.2 + overrideTimeSettings: 0 + timeSettings: + timeScaleType: 1 + applyDynamicTimeScale: 1 + action: + rid: 1359146347520065664 + references: + version: 2 + RefIds: + - rid: 1359146347520065664 + type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} + data: + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 20 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.05 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13 + value: -0.72 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.21 + value: 0.52 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.29 + value: -0.36 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38 + value: 0.24 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.48 + value: -0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6 + value: 0.08 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.75 + value: -0.03 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: 0.5, y: 0.5, z: 0} + directionSettings: + affectedByCameraDirection: 0 + affectedByCharacterDirection: 0 + useAttenuation: 0 + attenuationRange: 50 + attenuationCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_GetHitMedium.asset.meta b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_GetHitMedium.asset.meta new file mode 100644 index 000000000..a2fb5f0d5 --- /dev/null +++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_GetHitMedium.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a0cb75b536ebea6489c731b3d2775109 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_PerfectDodge.asset b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_PerfectDodge.asset index a959afe72..9dd26a915 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_PerfectDodge.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Feedbacks/Player_Feedback_PerfectDodge.asset @@ -24,11 +24,8 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: 97907d6e971a2dd41b795615cb499f34, type: 2} feedbackName: PerfectDodge defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Time mute: 0 @@ -39,11 +36,8 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 1 timeSettings: - useTimeScale: 0 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 0 action: rid: 1359146321375395937 - trackName: Postprocessing @@ -55,11 +49,8 @@ MonoBehaviour: duration: 0.6 overrideTimeSettings: 0 timeSettings: - useTimeScale: 0 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 0 action: rid: 1359146321375395938 - clipName: @@ -67,11 +58,8 @@ MonoBehaviour: duration: 0.6 overrideTimeSettings: 0 timeSettings: - useTimeScale: 0 - affectedByGlobalTimeScale: 0 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 0 action: rid: 1359146321375395939 references: @@ -270,245 +258,441 @@ MonoBehaviour: - rid: 1359146321375395938 type: {class: VignetteAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 10 - outSlope: 10 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1.1111112 - outSlope: -1.1111112 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - remapMin: 0 - remapMax: 0.35 - relativeToInitial: 1 + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.35 + relativeToInitial: 1 modifyCenter: 0 center: {x: 0.5, y: 0.5} - modifyColors: 1 - colorOuter: {r: 0, g: 0, b: 0, a: 1} - colorInner: {r: 0, g: 0, b: 0.05, a: 1} - modifyShape: 1 - smoothness: 0.75 + centerCurve: + curveX: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + curveY: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: {x: 0, y: 0} + remapMax: {x: 1, y: 1} + relativeToInitial: 0 + modifyColors: 0 + outColor: {r: 0, g: 0, b: 0, a: 1} + innerColor: {r: 0, g: 0, b: 0.1, a: 1} + outerColorCurve: + gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + innerColorCurve: + gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + modifyShape: 0 + smoothness: 0.5 roundness: 1 + smoothnessCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -2 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.5 + relativeToInitial: 0 + roundnessCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -2 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 0 - rid: 1359146321375395939 type: {class: AnimeACESAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - relativeToInitial: 1 modifyExposure: 1 - exposureCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.3 - value: 1 - inSlope: 0 - outSlope: -3.5615866 - tangentMode: 1 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.02679991 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - exposureRemapMin: 0 - exposureRemapMax: 0.6 + exposureChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.5 + relativeToInitial: 1 modifyContrast: 0 - contrastCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - contrastRemapMin: 0 - contrastRemapMax: -0.1 + contrastChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0 + relativeToInitial: 1 modifySaturation: 1 - saturationCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.3 - value: 1 - inSlope: 0 - outSlope: -3.5615866 - tangentMode: 1 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.02679991 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - saturationRemapMin: 0 - saturationRemapMax: 0.3 - enableAdvancedSettings: 0 + saturationChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.5 + relativeToInitial: 1 modifyHue: 0 - hueCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - hueRemapMin: 0 - hueRemapMax: 0.5 + hueChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0 + relativeToInitial: 1 modifyColorFilter: 0 - colorFilterGradient: - serializedVersion: 2 - key0: {r: 1, g: 0, b: 0, a: 1} - key1: {r: 1, g: 1, b: 0, a: 1} - key2: {r: 0, g: 1, b: 0, a: 0} - key3: {r: 0, g: 1, b: 1, a: 0} - key4: {r: 0, g: 0, b: 1, a: 0} - key5: {r: 1, g: 0, b: 1, a: 0} - key6: {r: 1, g: 1, b: 1, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 6554 - ctime2: 13107 - ctime3: 19661 - ctime4: 26214 - ctime5: 32768 - ctime6: 39321 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 7 - m_NumAlphaKeys: 2 + colorFilterChannel: + gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 diff --git a/Assets/Prefabs/MainGame/Characters/Player/Data/Player_FeedbackDataCollection.asset b/Assets/Prefabs/MainGame/Characters/Player/Data/Player_FeedbackDataCollection.asset index c69bc1857..6e1bcb761 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Data/Player_FeedbackDataCollection.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Data/Player_FeedbackDataCollection.asset @@ -27,3 +27,4 @@ MonoBehaviour: - {fileID: 11400000, guid: 53d16894bc1b70a478d8c4adb2884ab1, type: 2} - {fileID: 11400000, guid: 8e5f98cbcfebbe94ab42a318488f19c9, type: 2} - {fileID: 11400000, guid: ed0fa067d61c36c46b4daf3e726ff241, type: 2} + - {fileID: 11400000, guid: 9548a16e378165340823512202cfd978, type: 2} diff --git a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_Breakthrough.asset b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_Breakthrough.asset index 555d26c1d..2be81bf43 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_Breakthrough.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_Breakthrough.asset @@ -24,10 +24,8 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: ff9f9e981b108894dbbd1aa6eb9bd12b, type: 2} feedbackName: Breakthrough defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Time mute: 0 @@ -38,10 +36,8 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146299250704421 - trackName: Postprocessing @@ -53,10 +49,8 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146299250704422 - clipName: @@ -64,14 +58,12 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146299250704423 - trackName: Camera - mute: 0 + mute: 1 solo: 0 clips: - clipName: @@ -79,10 +71,8 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146299250704424 references: @@ -93,7 +83,7 @@ MonoBehaviour: data: globalChannel: active: 1 - mode: 0 + mode: 1 fixedValue: 0.1 curve: serializedVersion: 2 @@ -107,20 +97,11 @@ MonoBehaviour: weightedMode: 0 inWeight: 0 outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - serializedVersion: 3 time: 1 - value: 0 - inSlope: 0 - outSlope: 0 + value: 1 + inSlope: 2 + outSlope: 2 tangentMode: 0 weightedMode: 0 inWeight: 0 @@ -290,296 +271,376 @@ MonoBehaviour: - rid: 1359146299250704422 type: {class: AnimeACESAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - relativeToInitial: 1 modifyExposure: 0 - exposureCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - exposureRemapMin: 0 - exposureRemapMax: 0.5 + exposureChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 modifyContrast: 0 - contrastCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - contrastRemapMin: 0 - contrastRemapMax: 0.3 + contrastChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 modifySaturation: 1 - saturationCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 10 - outSlope: 10 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1.1111112 - outSlope: -1.1111112 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - saturationRemapMin: 0 - saturationRemapMax: 0.2 - enableAdvancedSettings: 0 + saturationChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.5 + relativeToInitial: 1 modifyHue: 0 - hueCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - hueRemapMin: 0 - hueRemapMax: 0.5 + hueChannel: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 modifyColorFilter: 0 - colorFilterGradient: - serializedVersion: 2 - key0: {r: 1, g: 1, b: 1, a: 1} - key1: {r: 1, g: 1, b: 1, a: 1} - key2: {r: 0, g: 0, b: 0, a: 0} - key3: {r: 0, g: 0, b: 0, a: 0} - key4: {r: 0, g: 0, b: 0, a: 0} - key5: {r: 0, g: 0, b: 0, a: 0} - key6: {r: 0, g: 0, b: 0, a: 0} - key7: {r: 0, g: 0, b: 0, a: 0} - ctime0: 0 - ctime1: 65535 - ctime2: 0 - ctime3: 0 - ctime4: 0 - ctime5: 0 - ctime6: 0 - ctime7: 0 - atime0: 0 - atime1: 65535 - atime2: 0 - atime3: 0 - atime4: 0 - atime5: 0 - atime6: 0 - atime7: 0 - m_Mode: 0 - m_ColorSpace: -1 - m_NumColorKeys: 2 - m_NumAlphaKeys: 2 + colorFilterChannel: + gradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_ColorSpace: -1 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 - rid: 1359146299250704423 type: {class: ChromaticAberrationAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 10 - outSlope: 10 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1.1111112 - outSlope: -1.1111112 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - remapMin: 0 - remapMax: 0.1 - relativeToInitial: 0 + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.1 + relativeToInitial: 1 modifyCenter: 0 - center: {x: 0.5, y: 0.5} + centerCurve: + curveX: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + curveY: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: {x: 0, y: 0} + remapMax: {x: 1, y: 1} + relativeToInitial: 0 modifyJitter: 0 jitterCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - jitterRemapMin: 0 - jitterRemapMax: 0.5 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.5 + relativeToInitial: 1 - rid: 1359146299250704424 type: {class: CameraFieldOfViewAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - curve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 10 - outSlope: 10 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1.1111112 - outSlope: -1.1111112 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - remapMin: 0 - remapMax: 5 - relativeToInitial: 1 + fovCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 10 + outSlope: 10 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -1.1111112 + outSlope: -1.1111112 + tangentMode: 34 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 5 + relativeToInitial: 1 diff --git a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_HeavyHit.asset b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_HeavyHit.asset index c97f5bc2f..0634ff9a3 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_HeavyHit.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_HeavyHit.asset @@ -24,11 +24,8 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: ff9f9e981b108894dbbd1aa6eb9bd12b, type: 2} feedbackName: HeavyHit defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Time mute: 0 @@ -39,11 +36,8 @@ MonoBehaviour: duration: 0.1 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146284165628324 - trackName: Camera @@ -52,14 +46,11 @@ MonoBehaviour: clips: - clipName: startTime: 0 - duration: 0.33 + duration: 0.2 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146284165628323 - trackName: Postprocessing @@ -71,11 +62,8 @@ MonoBehaviour: duration: 0.2 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146284165628795 references: @@ -84,71 +72,57 @@ MonoBehaviour: - rid: 1359146284165628323 type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 12 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.08 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.24 - value: -0.55 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.42 - value: 0.3 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.62 - value: -0.12 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - positionAmplitude: {x: 0.18, y: 0, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: 0.17320955, y: 0.04897401, z: 0} directionSettings: affectedByCameraDirection: 0 - affectedByCharacterDirection: 0 - useAttenuation: 1 + affectedByCharacterDirection: 1 + useAttenuation: 0 attenuationRange: 50 attenuationCurve: serializedVersion: 2 @@ -186,85 +160,13 @@ MonoBehaviour: m_Curve: - serializedVersion: 3 time: 0 - value: 0 - inSlope: 0 - outSlope: 20 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.05 value: 1 - inSlope: 0 - outSlope: 0 + inSlope: -3.1114726 + outSlope: -3.1114726 tangentMode: 0 weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.13 - value: -0.72 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.21 - value: 0.52 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.29 - value: -0.36 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.38 - value: 0.24 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.48 - value: -0.15 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.6 - value: 0.08 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.75 - value: -0.03 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.0352 - serializedVersion: 3 time: 1 value: 0 @@ -439,50 +341,42 @@ MonoBehaviour: - rid: 1359146284165628795 type: {class: RadialBlurAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.12 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0.12 - inSlope: -0.6 - outSlope: -0.3 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -0.1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - remapMin: 0 - remapMax: 0.5 - relativeToInitial: 1 + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 modifyCenter: 0 center: {x: 0.5, y: 0.5} diff --git a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_HeavySwing.asset b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_HeavySwing.asset index 07495961f..98aa011bd 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_HeavySwing.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_HeavySwing.asset @@ -24,33 +24,29 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: ff9f9e981b108894dbbd1aa6eb9bd12b, type: 2} feedbackName: HeavySwing defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Camera mute: 0 solo: 0 clips: - - startTime: 0 + - clipName: + startTime: 0 duration: 0.6 overrideTimeSettings: 0 timeSettings: - useTimeScale: 0 - affectedByGlobalTimeScale: 0 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146170251739534 - - startTime: -0 + - clipName: + startTime: -0 duration: 0.6 overrideTimeSettings: 0 timeSettings: - useTimeScale: 0 - affectedByGlobalTimeScale: 0 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146183674298531 references: @@ -59,71 +55,57 @@ MonoBehaviour: - rid: 1359146170251739534 type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 10 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.32 - value: -0.3 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.52 - value: 0.12 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.72 - value: -0.04 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - positionAmplitude: {x: 0, y: 0, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: 0, y: 0, z: 0} directionSettings: - affectedByCameraDirection: 1 + affectedByCameraDirection: 0 affectedByCharacterDirection: 1 - useAttenuation: 1 + useAttenuation: 0 attenuationRange: 50 attenuationCurve: serializedVersion: 2 @@ -152,53 +134,57 @@ MonoBehaviour: - rid: 1359146183674298531 type: {class: CameraRotationShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.12 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0.12 - inSlope: -0.6 - outSlope: -0.3 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -0.1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - rotationAmplitude: {x: -0.7, y: 2.5, z: 0} + amplitude: {x: -0.7, y: 2.5, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 directionSettings: - affectedByCameraDirection: 1 + affectedByCameraDirection: 0 affectedByCharacterDirection: 1 - useAttenuation: 1 + useAttenuation: 0 attenuationRange: 50 attenuationCurve: serializedVersion: 2 diff --git a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_MultiNormalHit.asset b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_MultiNormalHit.asset index 9b7d9bb8d..4c195720a 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_MultiNormalHit.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_MultiNormalHit.asset @@ -24,11 +24,8 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: ff9f9e981b108894dbbd1aa6eb9bd12b, type: 2} feedbackName: MultiNormalHit defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Camera mute: 0 @@ -39,11 +36,8 @@ MonoBehaviour: duration: 0.1 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146284165628323 - trackName: Time @@ -55,11 +49,8 @@ MonoBehaviour: duration: 0.02 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146284165628324 references: @@ -68,53 +59,48 @@ MonoBehaviour: - rid: 1359146284165628323 type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.12 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0.12 - inSlope: -0.6 - outSlope: -0.3 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -0.1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - positionAmplitude: {x: -0.058582496, y: -0.012964979, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: -0.058582496, y: -0.012964979, z: 0} directionSettings: affectedByCameraDirection: 0 - affectedByCharacterDirection: 0 - useAttenuation: 1 + affectedByCharacterDirection: 1 + useAttenuation: 0 attenuationRange: 50 attenuationCurve: serializedVersion: 2 diff --git a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_NormalSwing.asset b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_NormalSwing.asset index 9b9af9eb6..6a4e6edde 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_NormalSwing.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_NormalSwing.asset @@ -24,10 +24,8 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: ff9f9e981b108894dbbd1aa6eb9bd12b, type: 2} feedbackName: NormalSwing defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Camera mute: 0 @@ -38,10 +36,8 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 0 - affectedByGlobalTimeScale: 0 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146170251739534 - clipName: @@ -49,10 +45,8 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 0 - affectedByGlobalTimeScale: 0 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146183674298531 references: @@ -61,71 +55,57 @@ MonoBehaviour: - rid: 1359146170251739534 type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 10 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.32 - value: -0.3 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.52 - value: 0.12 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.72 - value: -0.04 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - positionAmplitude: {x: 0, y: 0, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: 0, y: 0, z: 0} directionSettings: - affectedByCameraDirection: 1 + affectedByCameraDirection: 0 affectedByCharacterDirection: 1 - useAttenuation: 1 + useAttenuation: 0 attenuationRange: 50 attenuationCurve: serializedVersion: 2 @@ -154,44 +134,57 @@ MonoBehaviour: - rid: 1359146183674298531 type: {class: CameraRotationShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.2 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - rotationAmplitude: {x: -0.36, y: 1, z: 0} + amplitude: {x: 0.36, y: -1, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 0 directionSettings: - affectedByCameraDirection: 1 + affectedByCameraDirection: 0 affectedByCharacterDirection: 1 - useAttenuation: 1 + useAttenuation: 0 attenuationRange: 50 attenuationCurve: serializedVersion: 2 diff --git a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_PerfectBlock.asset b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_PerfectBlock.asset index 67355e39f..6cf949b28 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_PerfectBlock.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_PerfectBlock.asset @@ -24,10 +24,8 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: ff9f9e981b108894dbbd1aa6eb9bd12b, type: 2} feedbackName: PerfectBlock defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Time mute: 0 @@ -38,10 +36,8 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146302359208182 - trackName: Camera @@ -50,13 +46,11 @@ MonoBehaviour: clips: - clipName: startTime: 0 - duration: 0.2 + duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 0 - affectedByGlobalTimeScale: 0 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146170251739534 - clipName: @@ -64,10 +58,8 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 0 - affectedByGlobalTimeScale: 0 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146183674298531 - trackName: Postprocessing @@ -79,10 +71,8 @@ MonoBehaviour: duration: 0.4 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146301147054243 references: @@ -91,69 +81,109 @@ MonoBehaviour: - rid: 1359146170251739534 type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 12 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.08 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.24 - value: -0.55 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.42 - value: 0.3 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.62 - value: -0.12 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - positionAmplitude: {x: 0, y: 0.25, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 20 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.05 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.13 + value: -0.72 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.21 + value: 0.52 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.29 + value: -0.36 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.38 + value: 0.24 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.48 + value: -0.15 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.6 + value: 0.08 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.75 + value: -0.03 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: 0.5, y: 0.5, z: 0} directionSettings: - affectedByCameraDirection: 1 + affectedByCameraDirection: 0 affectedByCharacterDirection: 1 useAttenuation: 1 attenuationRange: 50 @@ -184,35 +214,57 @@ MonoBehaviour: - rid: 1359146183674298531 type: {class: CameraRotationShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: -3.1114726 - outSlope: -3.1114726 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.0352 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - rotationAmplitude: {x: 0, y: -4, z: 2} + amplitude: {x: 0, y: 0, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 directionSettings: affectedByCameraDirection: 1 affectedByCharacterDirection: 1 - useAttenuation: 1 + useAttenuation: 0 attenuationRange: 50 attenuationCurve: serializedVersion: 2 @@ -241,51 +293,52 @@ MonoBehaviour: - rid: 1359146301147054243 type: {class: RadialBlurAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.12 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0.12 - inSlope: -0.6 - outSlope: -0.3 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -0.1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - remapMin: 0 - remapMax: 0.5 - relativeToInitial: 0 + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 0.3 + relativeToInitial: 1 modifyCenter: 0 center: {x: 0.5, y: 0.5} - rid: 1359146302359208182 @@ -293,7 +346,7 @@ MonoBehaviour: data: globalChannel: active: 1 - mode: 0 + mode: 1 fixedValue: 0.1 curve: serializedVersion: 2 @@ -319,7 +372,7 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - remapZero: 0.1 + remapZero: 0 remapOne: 1 advancedSettings: 0 playerChannel: diff --git a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_SingleNormalHit.asset b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_SingleNormalHit.asset index aac934647..b37a6a532 100644 --- a/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_SingleNormalHit.asset +++ b/Assets/Prefabs/MainGame/Characters/Player/Items/MainWeapons/Collection/Polychrome/Data/Feedbacks/Polychrome_Feedback_SingleNormalHit.asset @@ -24,11 +24,8 @@ MonoBehaviour: parentCollection: {fileID: 11400000, guid: ff9f9e981b108894dbbd1aa6eb9bd12b, type: 2} feedbackName: SingleNormalHit defaultTimeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 tracks: - trackName: Camera mute: 0 @@ -39,11 +36,8 @@ MonoBehaviour: duration: 0.2 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146284165628323 - trackName: Time @@ -55,11 +49,8 @@ MonoBehaviour: duration: 0.06 overrideTimeSettings: 0 timeSettings: - useTimeScale: 1 - affectedByGlobalTimeScale: 1 - affectedByGroupTimeScale: 0 - affectedByLocalTimeScale: 0 - useDynamicTimeScale: 1 + timeScaleType: 1 + applyDynamicTimeScale: 1 action: rid: 1359146284165628324 references: @@ -68,53 +59,57 @@ MonoBehaviour: - rid: 1359146284165628323 type: {class: CameraPositionShakeAction, ns: Cielonos.MainGame.Effects.Feedback, asm: Assembly-CSharp} data: - shakeCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 8 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.12 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 0.12 - inSlope: -0.6 - outSlope: -0.3 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -0.1 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - positionAmplitude: {x: -0.1127682, y: 0.041028433, z: 0} + intensityCurve: + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 8 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.12 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0.12 + inSlope: -0.6 + outSlope: -0.3 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: -0.1 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + remapMin: 0 + remapMax: 1 + relativeToInitial: 1 + amplitude: {x: -0.1127682, y: 0.041028433, z: 0} directionSettings: affectedByCameraDirection: 0 - affectedByCharacterDirection: 0 - useAttenuation: 1 + affectedByCharacterDirection: 1 + useAttenuation: 0 attenuationRange: 50 attenuationCurve: serializedVersion: 2 diff --git a/Assets/Scenes/MainGame.unity b/Assets/Scenes/MainGame.unity index bafb46c3d..5523264db 100644 --- a/Assets/Scenes/MainGame.unity +++ b/Assets/Scenes/MainGame.unity @@ -832,7 +832,7 @@ MonoBehaviour: FieldOfView: 29.862837 OrthographicSize: 5 NearClipPlane: 0.05 - FarClipPlane: 500 + FarClipPlane: 300 Dutch: 0 ModeOverride: 0 PhysicalProperties: @@ -1133,6 +1133,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dbbfef1d7cc479c47837ff154e4a7c5e, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Effects.Feedback.CameraFovShaker + initialFov: 0 --- !u!1 &158519375 GameObject: m_ObjectHideFlags: 0 @@ -1803,7 +1804,6 @@ MonoBehaviour: DebugActive: 0 InScriptDrivenPause: 0 FeedbacksList: - - rid: 563130913674494246 - rid: 7925884838403112961 KeepPlayModeChanges: 0 PerformanceMode: 0 @@ -1813,255 +1813,6 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 563130913674494246 - type: {class: CIF_TimeScaleModifier, ns: MoreMountains.FeedbacksForThirdParty.Cielonos, asm: Assembly-CSharp} - data: - Active: 1 - UniqueID: 2108454796 - Label: Time Scale Modifier - OriginalLabel: Time Scale Modifier - ChannelMode: 0 - Channel: 0 - MMChannelDefinition: {fileID: 0} - Chance: 100 - Timing: - TimescaleMode: 0 - applyOwnerExternalTimescale: 0 - ExcludeFromHoldingPauses: 0 - ContributeToTotalDuration: 1 - InitialDelay: 0 - CooldownDuration: 0 - InterruptsOnStop: 1 - NumberOfRepeats: 0 - RepeatForever: 0 - DelayBetweenRepeats: 1 - PlayCount: 0 - LimitPlayCount: 0 - MaxPlayCount: 3 - SetPlayCountToZeroOnReset: 0 - MMFeedbacksDirectionCondition: 0 - PlayDirection: 0 - ConstantIntensity: 0 - UseIntensityInterval: 0 - IntensityIntervalMin: 0 - IntensityIntervalMax: 0 - Sequence: {fileID: 0} - TrackID: 0 - Quantized: 0 - TargetBPM: 120 - AutomatedTargetAcquisition: - Mode: 0 - ChildIndex: 0 - RandomizeOutput: 0 - RandomMultiplier: {x: 0.8, y: 1} - RandomizeDuration: 0 - RandomDurationMultiplier: {x: 0.5, y: 2} - UseRange: 0 - RangeDistance: 5 - UseRangeFalloff: 0 - RangeFalloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapRangeFalloff: {x: 0, y: 1} - AutomaticShakerSetupButton: - ButtonText: - Owner: {fileID: 243863199} - DebugActive: 0 - Duration: 0.3 - ModifyGlobal: 0 - GlobalOverrideDuration: 0 - GlobalDuration: 0.5 - GlobalMode: 0 - GlobalFixedValue: 0 - GlobalCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - GlobalRemapZero: 0 - GlobalRemapOne: 1 - ModifyPlayer: 0 - PlayerOverrideDuration: 0 - PlayerDuration: 0.5 - PlayerMode: 0 - PlayerFixedValue: 0.5 - PlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - PlayerRemapZero: 1 - PlayerRemapOne: 0.1 - ModifyEnemy: 1 - EnemyOverrideDuration: 0 - EnemyDuration: 0.5 - EnemyMode: 0 - EnemyFixedValue: 0.1 - EnemyCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - EnemyRemapZero: 1 - EnemyRemapOne: 0 - ModifyNonPlayer: 0 - NonPlayerOverrideDuration: 0 - NonPlayerDuration: 0.5 - NonPlayerMode: 0 - NonPlayerFixedValue: 1 - NonPlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - NonPlayerRemapZero: 0 - NonPlayerRemapOne: 1 - ModifyAllied: 0 - AlliedOverrideDuration: 0 - AlliedDuration: 0.5 - AlliedMode: 0 - AlliedFixedValue: 1 - AlliedCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - AlliedRemapZero: 0 - AlliedRemapOne: 1 - rid: 7925884838403112961 type: {class: MMF_ColorAdjustments_URP, ns: MoreMountains.FeedbacksForThirdParty, asm: MoreMountains.Tools} data: @@ -2745,11 +2496,8 @@ MonoBehaviour: DebugActive: 0 InScriptDrivenPause: 0 FeedbacksList: - - rid: 563130772503134311 - rid: 563130452439728279 - - rid: 563130770630901866 - rid: 563130772503134332 - - rid: 563130772503134333 KeepPlayModeChanges: 0 PerformanceMode: 0 RestoreInitialValuesOnDisable: 0 @@ -3042,362 +2790,6 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - - rid: 563130770630901866 - type: {class: MMF_RadialBlur, ns: MoreMountains.FeedbacksForThirdParty, asm: Assembly-CSharp} - data: - Active: 1 - UniqueID: 947404294 - Label: Radial Blur - OriginalLabel: Radial Blur - ChannelMode: 0 - Channel: 0 - MMChannelDefinition: {fileID: 0} - Chance: 100 - Timing: - TimescaleMode: 0 - applyOwnerExternalTimescale: 1 - ExcludeFromHoldingPauses: 0 - ContributeToTotalDuration: 1 - InitialDelay: 0 - CooldownDuration: 0 - InterruptsOnStop: 1 - NumberOfRepeats: 0 - RepeatForever: 0 - DelayBetweenRepeats: 1 - PlayCount: 0 - LimitPlayCount: 0 - MaxPlayCount: 3 - SetPlayCountToZeroOnReset: 0 - MMFeedbacksDirectionCondition: 0 - PlayDirection: 0 - ConstantIntensity: 0 - UseIntensityInterval: 0 - IntensityIntervalMin: 0 - IntensityIntervalMax: 0 - Sequence: {fileID: 0} - TrackID: 0 - Quantized: 0 - TargetBPM: 120 - AutomatedTargetAcquisition: - Mode: 0 - ChildIndex: 0 - RandomizeOutput: 0 - RandomMultiplier: {x: 0.8, y: 1} - RandomizeDuration: 0 - RandomDurationMultiplier: {x: 0.5, y: 2} - UseRange: 0 - RangeDistance: 5 - UseRangeFalloff: 0 - RangeFalloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapRangeFalloff: {x: 0, y: 1} - AutomaticShakerSetupButton: - ButtonText: - Owner: {fileID: 323159030} - DebugActive: 0 - ShakeDuration: 0.2 - RelativeIntensity: 0 - ShakeIntensity: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: -3.1114726 - outSlope: -3.1114726 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.0352 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapIntensityZero: 0 - RemapIntensityOne: 0.5 - ModifyCenter: 1 - TargetCenter: {x: 0.5, y: 0.5} - ResetShakerValuesAfterShake: 1 - ResetTargetValuesAfterShake: 1 - - rid: 563130772503134311 - type: {class: CIF_TimeScaleModifier, ns: MoreMountains.FeedbacksForThirdParty.Cielonos, asm: Assembly-CSharp} - data: - Active: 1 - UniqueID: 690701765 - Label: Time Scale Modifier - OriginalLabel: Time Scale Modifier - ChannelMode: 0 - Channel: 0 - MMChannelDefinition: {fileID: 0} - Chance: 100 - Timing: - TimescaleMode: 0 - applyOwnerExternalTimescale: 1 - ExcludeFromHoldingPauses: 0 - ContributeToTotalDuration: 1 - InitialDelay: 0 - CooldownDuration: 0 - InterruptsOnStop: 1 - NumberOfRepeats: 0 - RepeatForever: 0 - DelayBetweenRepeats: 1 - PlayCount: 0 - LimitPlayCount: 0 - MaxPlayCount: 3 - SetPlayCountToZeroOnReset: 0 - MMFeedbacksDirectionCondition: 0 - PlayDirection: 0 - ConstantIntensity: 0 - UseIntensityInterval: 0 - IntensityIntervalMin: 0 - IntensityIntervalMax: 0 - Sequence: {fileID: 0} - TrackID: 0 - Quantized: 0 - TargetBPM: 120 - AutomatedTargetAcquisition: - Mode: 0 - ChildIndex: 0 - RandomizeOutput: 0 - RandomMultiplier: {x: 0.8, y: 1} - RandomizeDuration: 0 - RandomDurationMultiplier: {x: 0.5, y: 2} - UseRange: 0 - RangeDistance: 5 - UseRangeFalloff: 0 - RangeFalloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapRangeFalloff: {x: 0, y: 1} - AutomaticShakerSetupButton: - ButtonText: - Owner: {fileID: 323159030} - DebugActive: 0 - Duration: 0.2 - ModifyGlobal: 1 - GlobalOverrideDuration: 0 - GlobalDuration: 0.5 - GlobalMode: 0 - GlobalFixedValue: 0.2 - GlobalCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - GlobalRemapZero: 0 - GlobalRemapOne: 1 - ModifyPlayer: 0 - PlayerOverrideDuration: 0 - PlayerDuration: 0.5 - PlayerMode: 1 - PlayerFixedValue: 0.5 - PlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - PlayerRemapZero: 1 - PlayerRemapOne: 0.1 - ModifyEnemy: 0 - EnemyOverrideDuration: 0 - EnemyDuration: 0.5 - EnemyMode: 0 - EnemyFixedValue: 0 - EnemyCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - EnemyRemapZero: 1 - EnemyRemapOne: 0 - ModifyNonPlayer: 0 - NonPlayerOverrideDuration: 0 - NonPlayerDuration: 0.5 - NonPlayerMode: 0 - NonPlayerFixedValue: 1 - NonPlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - NonPlayerRemapZero: 0 - NonPlayerRemapOne: 1 - ModifyAllied: 0 - AlliedOverrideDuration: 0 - AlliedDuration: 0.5 - AlliedMode: 0 - AlliedFixedValue: 1 - AlliedCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - AlliedRemapZero: 0 - AlliedRemapOne: 1 - rid: 563130772503134332 type: {class: MMF_Light, ns: MoreMountains.Feedbacks, asm: MoreMountains.Tools} data: @@ -3633,119 +3025,6 @@ MonoBehaviour: RemapShadowStrengthOne: 1 InstantShadowStrength: 1 ToDestinationShadowStrength: 1 - - rid: 563130772503134333 - type: {class: MMF_AdvancedVignette, ns: MoreMountains.FeedbacksForThirdParty, asm: Assembly-CSharp} - data: - Active: 1 - UniqueID: -558280106 - Label: Advanced Vignette - OriginalLabel: Advanced Vignette - ChannelMode: 0 - Channel: 0 - MMChannelDefinition: {fileID: 0} - Chance: 100 - Timing: - TimescaleMode: 0 - applyOwnerExternalTimescale: 1 - ExcludeFromHoldingPauses: 0 - ContributeToTotalDuration: 1 - InitialDelay: 0 - CooldownDuration: 0 - InterruptsOnStop: 1 - NumberOfRepeats: 0 - RepeatForever: 0 - DelayBetweenRepeats: 1 - PlayCount: 0 - LimitPlayCount: 0 - MaxPlayCount: 3 - SetPlayCountToZeroOnReset: 0 - MMFeedbacksDirectionCondition: 0 - PlayDirection: 0 - ConstantIntensity: 0 - UseIntensityInterval: 0 - IntensityIntervalMin: 0 - IntensityIntervalMax: 0 - Sequence: {fileID: 0} - TrackID: 0 - Quantized: 0 - TargetBPM: 120 - AutomatedTargetAcquisition: - Mode: 0 - ChildIndex: 0 - RandomizeOutput: 0 - RandomMultiplier: {x: 0.8, y: 1} - RandomizeDuration: 0 - RandomDurationMultiplier: {x: 0.5, y: 2} - UseRange: 0 - RangeDistance: 5 - UseRangeFalloff: 0 - RangeFalloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapRangeFalloff: {x: 0, y: 1} - AutomaticShakerSetupButton: - ButtonText: - Owner: {fileID: 323159030} - DebugActive: 0 - Duration: 0.2 - RelativeIntensity: 0 - ShakeIntensity: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: -3.1114726 - outSlope: -3.1114726 - tangentMode: 0 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.0352 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapIntensityZero: 0 - RemapIntensityOne: 0.2 - ModifyCenter: 1 - Center: {x: 0.5, y: 0.5} - ModifyColors: 1 - ColorOuter: {r: 0.23529412, g: 0, b: 1, a: 1} - ColorInner: {r: 0, g: 0, b: 0, a: 1} - ModifyExtra: 0 - Smoothness: 0.5 - Roundness: 1 - ResetShakerValuesAfterShake: 1 - ResetTargetValuesAfterShake: 1 --- !u!1 &340812651 GameObject: m_ObjectHideFlags: 0 @@ -7682,7 +6961,6 @@ MonoBehaviour: - rid: 563130768424697961 - rid: 563130768424697964 - rid: 563130768424698002 - - rid: 563130769577082987 KeepPlayModeChanges: 0 PerformanceMode: 0 RestoreInitialValuesOnDisable: 0 @@ -8079,122 +7357,6 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 DrawGizmos: 1 - - rid: 563130769577082987 - type: {class: MMF_RadialBlur, ns: MoreMountains.FeedbacksForThirdParty, asm: Assembly-CSharp} - data: - Active: 1 - UniqueID: -148984850 - Label: Radial Blur - OriginalLabel: Radial Blur - ChannelMode: 0 - Channel: 0 - MMChannelDefinition: {fileID: 0} - Chance: 100 - Timing: - TimescaleMode: 0 - applyOwnerExternalTimescale: 1 - ExcludeFromHoldingPauses: 0 - ContributeToTotalDuration: 1 - InitialDelay: 0 - CooldownDuration: 0 - InterruptsOnStop: 1 - NumberOfRepeats: 0 - RepeatForever: 0 - DelayBetweenRepeats: 1 - PlayCount: 0 - LimitPlayCount: 0 - MaxPlayCount: 3 - SetPlayCountToZeroOnReset: 0 - MMFeedbacksDirectionCondition: 0 - PlayDirection: 0 - ConstantIntensity: 0 - UseIntensityInterval: 0 - IntensityIntervalMin: 0 - IntensityIntervalMax: 0 - Sequence: {fileID: 0} - TrackID: 0 - Quantized: 0 - TargetBPM: 120 - AutomatedTargetAcquisition: - Mode: 0 - ChildIndex: 0 - RandomizeOutput: 0 - RandomMultiplier: {x: 0.8, y: 1} - RandomizeDuration: 0 - RandomDurationMultiplier: {x: 0.5, y: 2} - UseRange: 0 - RangeDistance: 5 - UseRangeFalloff: 0 - RangeFalloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapRangeFalloff: {x: 0, y: 1} - AutomaticShakerSetupButton: - ButtonText: - Owner: {fileID: 1114034486} - DebugActive: 0 - ShakeDuration: 0.4 - RelativeIntensity: 1 - ShakeIntensity: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 3.3333333 - outSlope: 3.3333333 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1.4285715 - outSlope: -1.4285715 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapIntensityZero: 0 - RemapIntensityOne: -0.25 - ModifyCenter: 1 - TargetCenter: {x: 0.5, y: 0.5} - ResetShakerValuesAfterShake: 1 - ResetTargetValuesAfterShake: 1 --- !u!1 &1147005565 GameObject: m_ObjectHideFlags: 0 @@ -9384,7 +8546,6 @@ MonoBehaviour: DebugActive: 0 InScriptDrivenPause: 0 FeedbacksList: - - rid: 563130913674494246 - rid: 7925884838403112961 KeepPlayModeChanges: 0 PerformanceMode: 0 @@ -9394,255 +8555,6 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 563130913674494246 - type: {class: CIF_TimeScaleModifier, ns: MoreMountains.FeedbacksForThirdParty.Cielonos, asm: Assembly-CSharp} - data: - Active: 1 - UniqueID: 2108454796 - Label: Time Scale Modifier - OriginalLabel: Time Scale Modifier - ChannelMode: 0 - Channel: 0 - MMChannelDefinition: {fileID: 0} - Chance: 100 - Timing: - TimescaleMode: 0 - applyOwnerExternalTimescale: 0 - ExcludeFromHoldingPauses: 0 - ContributeToTotalDuration: 1 - InitialDelay: 0 - CooldownDuration: 0 - InterruptsOnStop: 1 - NumberOfRepeats: 0 - RepeatForever: 0 - DelayBetweenRepeats: 1 - PlayCount: 0 - LimitPlayCount: 0 - MaxPlayCount: 3 - SetPlayCountToZeroOnReset: 0 - MMFeedbacksDirectionCondition: 0 - PlayDirection: 0 - ConstantIntensity: 0 - UseIntensityInterval: 0 - IntensityIntervalMin: 0 - IntensityIntervalMax: 0 - Sequence: {fileID: 0} - TrackID: 0 - Quantized: 0 - TargetBPM: 120 - AutomatedTargetAcquisition: - Mode: 0 - ChildIndex: 0 - RandomizeOutput: 0 - RandomMultiplier: {x: 0.8, y: 1} - RandomizeDuration: 0 - RandomDurationMultiplier: {x: 0.5, y: 2} - UseRange: 0 - RangeDistance: 5 - UseRangeFalloff: 0 - RangeFalloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapRangeFalloff: {x: 0, y: 1} - AutomaticShakerSetupButton: - ButtonText: - Owner: {fileID: 1375121750} - DebugActive: 0 - Duration: 0.5 - ModifyGlobal: 1 - GlobalOverrideDuration: 0 - GlobalDuration: 0.5 - GlobalMode: 0 - GlobalFixedValue: 0.1 - GlobalCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - GlobalRemapZero: 0 - GlobalRemapOne: 1 - ModifyPlayer: 0 - PlayerOverrideDuration: 0 - PlayerDuration: 0.5 - PlayerMode: 0 - PlayerFixedValue: 0.5 - PlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - PlayerRemapZero: 1 - PlayerRemapOne: 0.1 - ModifyEnemy: 0 - EnemyOverrideDuration: 0 - EnemyDuration: 0.5 - EnemyMode: 0 - EnemyFixedValue: 0.1 - EnemyCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - EnemyRemapZero: 1 - EnemyRemapOne: 0 - ModifyNonPlayer: 0 - NonPlayerOverrideDuration: 0 - NonPlayerDuration: 0.5 - NonPlayerMode: 0 - NonPlayerFixedValue: 1 - NonPlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - NonPlayerRemapZero: 0 - NonPlayerRemapOne: 1 - ModifyAllied: 0 - AlliedOverrideDuration: 0 - AlliedDuration: 0.5 - AlliedMode: 0 - AlliedFixedValue: 1 - AlliedCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - AlliedRemapZero: 0 - AlliedRemapOne: 1 - rid: 7925884838403112961 type: {class: MMF_ColorAdjustments_URP, ns: MoreMountains.FeedbacksForThirdParty, asm: MoreMountains.Tools} data: @@ -12457,7 +11369,6 @@ MonoBehaviour: - rid: 5266334818782412952 - rid: 5266334821235818657 - rid: 563130768424697966 - - rid: 563130769577082986 KeepPlayModeChanges: 0 PerformanceMode: 0 RestoreInitialValuesOnDisable: 0 @@ -12603,122 +11514,6 @@ MonoBehaviour: m_PostInfinity: 2 m_RotationOrder: 4 DrawGizmos: 1 - - rid: 563130769577082986 - type: {class: MMF_RadialBlur, ns: MoreMountains.FeedbacksForThirdParty, asm: Assembly-CSharp} - data: - Active: 1 - UniqueID: 1856682114 - Label: Radial Blur - OriginalLabel: Radial Blur - ChannelMode: 0 - Channel: 0 - MMChannelDefinition: {fileID: 0} - Chance: 100 - Timing: - TimescaleMode: 0 - applyOwnerExternalTimescale: 1 - ExcludeFromHoldingPauses: 0 - ContributeToTotalDuration: 1 - InitialDelay: 0 - CooldownDuration: 0 - InterruptsOnStop: 1 - NumberOfRepeats: 0 - RepeatForever: 0 - DelayBetweenRepeats: 1 - PlayCount: 0 - LimitPlayCount: 0 - MaxPlayCount: 3 - SetPlayCountToZeroOnReset: 0 - MMFeedbacksDirectionCondition: 0 - PlayDirection: 0 - ConstantIntensity: 0 - UseIntensityInterval: 0 - IntensityIntervalMin: 0 - IntensityIntervalMax: 0 - Sequence: {fileID: 0} - TrackID: 0 - Quantized: 0 - TargetBPM: 120 - AutomatedTargetAcquisition: - Mode: 0 - ChildIndex: 0 - RandomizeOutput: 0 - RandomMultiplier: {x: 0.8, y: 1} - RandomizeDuration: 0 - RandomDurationMultiplier: {x: 0.5, y: 2} - UseRange: 0 - RangeDistance: 5 - UseRangeFalloff: 0 - RangeFalloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapRangeFalloff: {x: 0, y: 1} - AutomaticShakerSetupButton: - ButtonText: - Owner: {fileID: 1804306729} - DebugActive: 0 - ShakeDuration: 0.4 - RelativeIntensity: 1 - ShakeIntensity: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 3.3333333 - outSlope: 3.3333333 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 0.3 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: -1.4285715 - outSlope: -1.4285715 - tangentMode: 34 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapIntensityZero: 0 - RemapIntensityOne: 0.25 - ModifyCenter: 1 - TargetCenter: {x: 0.5, y: 0.5} - ResetShakerValuesAfterShake: 1 - ResetTargetValuesAfterShake: 1 - rid: 5266334818782412946 type: {class: MMF_LensDistortion_URP, ns: MoreMountains.FeedbacksForThirdParty, asm: MoreMountains.Tools} data: @@ -13198,7 +11993,6 @@ MonoBehaviour: DebugActive: 0 InScriptDrivenPause: 0 FeedbacksList: - - rid: 563130913674494246 - rid: 7925884838403112961 KeepPlayModeChanges: 0 PerformanceMode: 0 @@ -13208,255 +12002,6 @@ MonoBehaviour: references: version: 2 RefIds: - - rid: 563130913674494246 - type: {class: CIF_TimeScaleModifier, ns: MoreMountains.FeedbacksForThirdParty.Cielonos, asm: Assembly-CSharp} - data: - Active: 1 - UniqueID: 2108454796 - Label: Time Scale Modifier - OriginalLabel: Time Scale Modifier - ChannelMode: 0 - Channel: 0 - MMChannelDefinition: {fileID: 0} - Chance: 100 - Timing: - TimescaleMode: 0 - applyOwnerExternalTimescale: 0 - ExcludeFromHoldingPauses: 0 - ContributeToTotalDuration: 1 - InitialDelay: 0 - CooldownDuration: 0 - InterruptsOnStop: 1 - NumberOfRepeats: 0 - RepeatForever: 0 - DelayBetweenRepeats: 1 - PlayCount: 0 - LimitPlayCount: 0 - MaxPlayCount: 3 - SetPlayCountToZeroOnReset: 0 - MMFeedbacksDirectionCondition: 0 - PlayDirection: 0 - ConstantIntensity: 0 - UseIntensityInterval: 0 - IntensityIntervalMin: 0 - IntensityIntervalMax: 0 - Sequence: {fileID: 0} - TrackID: 0 - Quantized: 0 - TargetBPM: 120 - AutomatedTargetAcquisition: - Mode: 0 - ChildIndex: 0 - RandomizeOutput: 0 - RandomMultiplier: {x: 0.8, y: 1} - RandomizeDuration: 0 - RandomDurationMultiplier: {x: 0.5, y: 2} - UseRange: 0 - RangeDistance: 5 - UseRangeFalloff: 0 - RangeFalloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapRangeFalloff: {x: 0, y: 1} - AutomaticShakerSetupButton: - ButtonText: - Owner: {fileID: 1863351465} - DebugActive: 0 - Duration: 0.5 - ModifyGlobal: 1 - GlobalOverrideDuration: 0 - GlobalDuration: 0.5 - GlobalMode: 0 - GlobalFixedValue: 0.1 - GlobalCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - GlobalRemapZero: 0 - GlobalRemapOne: 1 - ModifyPlayer: 0 - PlayerOverrideDuration: 0 - PlayerDuration: 0.5 - PlayerMode: 0 - PlayerFixedValue: 0.5 - PlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - PlayerRemapZero: 1 - PlayerRemapOne: 0.1 - ModifyEnemy: 0 - EnemyOverrideDuration: 0 - EnemyDuration: 0.5 - EnemyMode: 0 - EnemyFixedValue: 0.1 - EnemyCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - EnemyRemapZero: 1 - EnemyRemapOne: 0 - ModifyNonPlayer: 0 - NonPlayerOverrideDuration: 0 - NonPlayerDuration: 0.5 - NonPlayerMode: 0 - NonPlayerFixedValue: 1 - NonPlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - NonPlayerRemapZero: 0 - NonPlayerRemapOne: 1 - ModifyAllied: 0 - AlliedOverrideDuration: 0 - AlliedDuration: 0.5 - AlliedMode: 0 - AlliedFixedValue: 1 - AlliedCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - AlliedRemapZero: 0 - AlliedRemapOne: 1 - rid: 7925884838403112961 type: {class: MMF_ColorAdjustments_URP, ns: MoreMountains.FeedbacksForThirdParty, asm: MoreMountains.Tools} data: @@ -15487,8 +14032,7 @@ MonoBehaviour: m_Calls: [] DebugActive: 0 InScriptDrivenPause: 0 - FeedbacksList: - - rid: 563130913674494246 + FeedbacksList: [] KeepPlayModeChanges: 0 PerformanceMode: 0 RestoreInitialValuesOnDisable: 0 @@ -15496,256 +14040,7 @@ MonoBehaviour: PlayCount: 0 references: version: 2 - RefIds: - - rid: 563130913674494246 - type: {class: CIF_TimeScaleModifier, ns: MoreMountains.FeedbacksForThirdParty.Cielonos, asm: Assembly-CSharp} - data: - Active: 1 - UniqueID: 2108454796 - Label: Time Scale Modifier - OriginalLabel: Time Scale Modifier - ChannelMode: 0 - Channel: 0 - MMChannelDefinition: {fileID: 0} - Chance: 100 - Timing: - TimescaleMode: 0 - applyOwnerExternalTimescale: 0 - ExcludeFromHoldingPauses: 0 - ContributeToTotalDuration: 1 - InitialDelay: 0 - CooldownDuration: 0 - InterruptsOnStop: 1 - NumberOfRepeats: 0 - RepeatForever: 0 - DelayBetweenRepeats: 1 - PlayCount: 0 - LimitPlayCount: 0 - MaxPlayCount: 3 - SetPlayCountToZeroOnReset: 0 - MMFeedbacksDirectionCondition: 0 - PlayDirection: 0 - ConstantIntensity: 0 - UseIntensityInterval: 0 - IntensityIntervalMin: 0 - IntensityIntervalMax: 0 - Sequence: {fileID: 0} - TrackID: 0 - Quantized: 0 - TargetBPM: 120 - AutomatedTargetAcquisition: - Mode: 0 - ChildIndex: 0 - RandomizeOutput: 0 - RandomMultiplier: {x: 0.8, y: 1} - RandomizeDuration: 0 - RandomDurationMultiplier: {x: 0.5, y: 2} - UseRange: 0 - RangeDistance: 5 - UseRangeFalloff: 0 - RangeFalloff: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - RemapRangeFalloff: {x: 0, y: 1} - AutomaticShakerSetupButton: - ButtonText: - Owner: {fileID: 2133098106} - DebugActive: 0 - Duration: 0 - ModifyGlobal: 0 - GlobalOverrideDuration: 0 - GlobalDuration: 0.5 - GlobalMode: 0 - GlobalFixedValue: 0 - GlobalCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - GlobalRemapZero: 0 - GlobalRemapOne: 1 - ModifyPlayer: 0 - PlayerOverrideDuration: 0 - PlayerDuration: 0.5 - PlayerMode: 0 - PlayerFixedValue: 0.5 - PlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 0.5 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - PlayerRemapZero: 1 - PlayerRemapOne: 0.1 - ModifyEnemy: 0 - EnemyOverrideDuration: 0 - EnemyDuration: 0.5 - EnemyMode: 0 - EnemyFixedValue: 0 - EnemyCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - EnemyRemapZero: 1 - EnemyRemapOne: 0 - ModifyNonPlayer: 0 - NonPlayerOverrideDuration: 0 - NonPlayerDuration: 0.5 - NonPlayerMode: 0 - NonPlayerFixedValue: 1 - NonPlayerCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - NonPlayerRemapZero: 0 - NonPlayerRemapOne: 1 - ModifyAllied: 0 - AlliedOverrideDuration: 0 - AlliedDuration: 0.5 - AlliedMode: 0 - AlliedFixedValue: 1 - AlliedCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 3 - time: 0 - value: 0 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - - serializedVersion: 3 - time: 1 - value: 1 - inSlope: 0 - outSlope: 0 - tangentMode: 0 - weightedMode: 0 - inWeight: 0 - outWeight: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - AlliedRemapZero: 0 - AlliedRemapOne: 1 + RefIds: [] --- !u!1 &2145101576 GameObject: m_ObjectHideFlags: 0 @@ -26728,6 +25023,9 @@ MonoBehaviour: PrefabModificationsReferencedUnityObjects: [] PrefabModifications: [] SerializationNodes: + - Name: cameraFovSm + Entry: 6 + Data: - Name: cameraRotationSm Entry: 6 Data: @@ -26772,8 +25070,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4058222402463592529} serializedVersion: 2 - m_LocalRotation: {x: 0.0000000018620641, y: -5.7210935e-17, z: -7.776564e-19, w: 1} - m_LocalPosition: {x: 0, y: 2.1, z: -13.5} + m_LocalRotation: {x: -0.022205776, y: 3.4543013e-10, z: 7.6724365e-12, w: 0.9997534} + m_LocalPosition: {x: 0, y: 1.5, z: -13.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -76642,7 +74940,7 @@ Camera: width: 1 height: 1 near clip plane: 0.05 - far clip plane: 500 + far clip plane: 300 field of view: 29.862837 orthographic: 0 orthographic size: 5 @@ -79211,7 +77509,7 @@ MonoBehaviour: FieldOfView: 29.862837 OrthographicSize: 5 NearClipPlane: 0.05 - FarClipPlane: 500 + FarClipPlane: 300 Dutch: 0 ModeOverride: 0 PhysicalProperties: @@ -81173,7 +79471,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3b5d7c088409d9a40b7b09aa707777f8, type: 3} m_Name: m_EditorClassIdentifier: Unity.Cinemachine::Unity.Cinemachine.CinemachineOrbitalFollow - TargetOffset: {x: 0, y: 0.6, z: 0} + TargetOffset: {x: 0, y: 0, z: 0} TrackerSettings: BindingMode: 4 PositionDamping: {x: 0.1, y: 0.2, z: 0.1} @@ -81302,6 +79600,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dbbfef1d7cc479c47837ff154e4a7c5e, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Cielonos.MainGame.Effects.Feedback.CameraFovShaker + initialFov: 0 --- !u!114 &6231509679067270574 MonoBehaviour: m_ObjectHideFlags: 0 @@ -83611,8 +81910,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2317150787485973026} serializedVersion: 2 - m_LocalRotation: {x: 0.0000000018620641, y: -5.7210935e-17, z: 1.0653043e-25, w: 1} - m_LocalPosition: {x: 0, y: 2.1, z: -13.5} + m_LocalRotation: {x: -0.022205777, y: 3.4543016e-10, z: 7.6724365e-12, w: 0.9997534} + m_LocalPosition: {x: 0, y: 1.5, z: -13.5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scripts/MainGame/Characters/Automata/AI/Actions/PlayFuncAnim.cs b/Assets/Scripts/MainGame/Characters/Automata/AI/Actions/PlayFuncAnim.cs index 11c592100..a63c71d87 100644 --- a/Assets/Scripts/MainGame/Characters/Automata/AI/Actions/PlayFuncAnim.cs +++ b/Assets/Scripts/MainGame/Characters/Automata/AI/Actions/PlayFuncAnim.cs @@ -74,7 +74,7 @@ namespace Cielonos.MainGame.Characters.AI if (willTurnToTargetAtStart) { - self.movementSc.TurnToTarget(target); + self.movementSc.SmartTurnToTarget(target); } if (willAdjustAdsorption) diff --git a/Assets/Scripts/MainGame/Characters/Automata/AI/Actions/PlayLoopFuncAnim.cs b/Assets/Scripts/MainGame/Characters/Automata/AI/Actions/PlayLoopFuncAnim.cs index facaee3e2..0cfd4df29 100644 --- a/Assets/Scripts/MainGame/Characters/Automata/AI/Actions/PlayLoopFuncAnim.cs +++ b/Assets/Scripts/MainGame/Characters/Automata/AI/Actions/PlayLoopFuncAnim.cs @@ -83,7 +83,7 @@ namespace Cielonos.MainGame.Characters.AI if (willTurnToTarget) { - self.movementSc.TurnToTarget(target); + self.movementSc.SmartTurnToTarget(target); } if (willAdjustAdsorption) diff --git a/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/MovementSubcontrollerBase.cs b/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/MovementSubcontrollerBase.cs index 4fed31aa3..24e25f94e 100644 --- a/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/MovementSubcontrollerBase.cs +++ b/Assets/Scripts/MainGame/Characters/Base/Subcontrollers/MovementSubcontrollerBase.cs @@ -47,9 +47,28 @@ namespace Cielonos.MainGame.Characters } } - public void TurnToTarget(CharacterBase target, float duration = 0.2f) + public void SmartTurnToTarget(CharacterBase target, float maxTurnAngle = 150f) { - characterTransform.DOLookAt(target.transform.position, duration, AxisConstraint.Y).Play(); + Vector3 directionToTarget = (target.centerPoint.position - owner.centerPoint.position).Flatten(); + if (directionToTarget.sqrMagnitude < 0.001f) return; + + float angleToTarget = Vector3.SignedAngle(owner.transform.forward, directionToTarget, Vector3.up); + float absAngle = Mathf.Abs(angleToTarget); + + // 超过最大角度不转身 + if (absAngle > maxTurnAngle) return; + + // 小角度瞬间转身 + if (absAngle <= 45f) + { + owner.transform.rotation = Quaternion.LookRotation(directionToTarget); + } + // 大角度平滑转身 + else + { + float duration = Mathf.Lerp(0.1f, 0.2f, (absAngle - 45f) / 135f); + owner.transform.DORotateQuaternion(Quaternion.LookRotation(directionToTarget), duration).Play(); + } } public void TurnToTargetByAngle(CharacterBase target, float angularSpeed) diff --git a/Assets/Scripts/MainGame/Characters/Player/Animation/PlayerAnimScDashDodge.cs b/Assets/Scripts/MainGame/Characters/Player/Animation/PlayerAnimScDashDodge.cs index 033f5f4e9..7cd5c6ae4 100644 --- a/Assets/Scripts/MainGame/Characters/Player/Animation/PlayerAnimScDashDodge.cs +++ b/Assets/Scripts/MainGame/Characters/Player/Animation/PlayerAnimScDashDodge.cs @@ -1,5 +1,6 @@ using Cielonos.MainGame.Effects.Feedback; using SLSUtilities.General; +using Unity.Mathematics; using UnityEngine; namespace Cielonos.MainGame.Characters @@ -22,9 +23,6 @@ namespace Cielonos.MainGame.Characters { player.landMovementSc.TurnToDirection(direction, 0f); } - - // 计算冲刺方向用于相机震动方向设置 - // Dash反馈的方向设置将在DashStart中通过新Feedback系统统一处理 } } @@ -32,10 +30,15 @@ namespace Cielonos.MainGame.Characters { player.landMovementSc.isDashing = true; player.audioSc.PlayDashSound(); - - // 使用新Feedback系统播放Dash反馈 - player.feedbackSc.PlayFeedback("Dash"); - + + Vector3 playerForward = player.transform.forward.Flatten(); + Vector3 cameraForward = player.viewSc.playerCamera.transform.forward.Flatten(); + float forwardDot = Vector3.Dot(playerForward, cameraForward); + //如果角色和相机的角度相差120度以上 + //播放普通Dash反馈 + //播放背向Dash反馈 + player.feedbackSc.PlayFeedback(forwardDot < -0.5f ? "Dash_NoCameraRotation" : "Dash"); + //player.renderSc.dashTrails.ForEach(ds => ds.active = true); //player.renderSc.dashTrails.ForEach(ds => ds.Restart()); diff --git a/Assets/Scripts/MainGame/Characters/Player/Input/PlayerInputSubcontroller.cs b/Assets/Scripts/MainGame/Characters/Player/Input/PlayerInputSubcontroller.cs index d5c4a6c5d..200be65c7 100644 --- a/Assets/Scripts/MainGame/Characters/Player/Input/PlayerInputSubcontroller.cs +++ b/Assets/Scripts/MainGame/Characters/Player/Input/PlayerInputSubcontroller.cs @@ -117,11 +117,20 @@ namespace Cielonos.MainGame.Characters } }; - inputActions.Player.LockOnTarget.performed += ctx => + inputActions.Player.LockonTarget.performed += ctx => { if (ctx.performed && isCursorLocked.Value) { - operation.LockOnTarget(); + operation.LockonTarget(); + } + }; + + inputActions.Player.SelectLockonTarget.performed += ctx => + { + if (ctx.performed && isCursorLocked.Value) + { + Debug.Log("Value: " + ctx.ReadValue()); + operation.SelectLockonTarget(ctx.ReadValue()); } }; diff --git a/Assets/Scripts/MainGame/Characters/Player/Items/Base/ItemBase.cs b/Assets/Scripts/MainGame/Characters/Player/Items/Base/ItemBase.cs index 00f50869a..ef0ac7b31 100644 --- a/Assets/Scripts/MainGame/Characters/Player/Items/Base/ItemBase.cs +++ b/Assets/Scripts/MainGame/Characters/Player/Items/Base/ItemBase.cs @@ -159,7 +159,12 @@ namespace Cielonos.MainGame.Characters.Inventory comboSm?[comboTreeName].SuspendThenSetup(actionCoolDownTime); if (target != null) { - if (autoRotate) player.landMovementSc.TurnToTarget(target); + if (autoRotate) + { + float angleLimit = player.viewSc.lockTargetModule.isLocking ? 240 : 150; + player.landMovementSc.SmartTurnToTarget(target, angleLimit); + } + if (keepAdsorption) { funcAnimSm.currentRuntimeFuncAnim.AddUpdateEvent(new SetRootAdsorptionAdjustment.Keep(target, adsorptionMinDistance)); @@ -185,13 +190,15 @@ namespace Cielonos.MainGame.Characters.Inventory Debug.LogWarning($"没有找到名为 'Camera' 的轨道，请检查 FeedbackData '{feedBackName}' 的设置。"); return; } - - if (cameraTrack.clips.Find(clip => clip.action is CameraPositionShakeAction)?.action is CameraPositionShakeAction positionShakeAction) + + var positionShakeAction = feedBackData.Action("Camera"); + if (positionShakeAction != null) { positionShakeAction.amplitude = swingPosition; } - - if (cameraTrack.clips.Find(clip => clip.action is CameraRotationShakeAction)?.action is CameraRotationShakeAction rotationShakeAction) + + var rotationShakeAction = feedBackData.Action("Camera"); + if (rotationShakeAction != null) { rotationShakeAction.amplitude = swingRotation; } diff --git a/Assets/Scripts/MainGame/Characters/Player/Player.cs b/Assets/Scripts/MainGame/Characters/Player/Player.cs index 722af3501..e017c5588 100644 --- a/Assets/Scripts/MainGame/Characters/Player/Player.cs +++ b/Assets/Scripts/MainGame/Characters/Player/Player.cs @@ -54,7 +54,7 @@ namespace Cielonos.MainGame.Characters eventSm.onHealthChanged.InsertByPriority("UI_HealthBarUpdate", new PrioritizedAction(UI_HealthBarUpdate)); eventSm.onEnergyChanged.InsertByPriority("UI_EnergyBarUpdate", new PrioritizedAction(UI_EnergyBarUpdate)); - eventSm.onDodgeStart.InsertByPriority("Feedback_DodgeStart", new PrioritizedAction(() => { feedbackSc.PlayFeedback("PerfectDodge"); })); + //eventSm.onDodgeStart.InsertByPriority("Feedback_DodgeStart", new PrioritizedAction(() => { feedbackSc.PlayFeedback("PerfectDodge"); })); eventSm.onNormalDodgeSuccess.InsertByPriority("Feedback_NormalDodge", new PrioritizedAction(Feedback_NormalDodge)); eventSm.onPerfectDodgeSuccess.InsertByPriority("Feedback_PerfectDodge", new PrioritizedAction(Feedback_PerfectDodge)); } @@ -113,14 +113,14 @@ namespace Cielonos.MainGame.Characters BreakthroughType breakthroughType = attackArea.attackSm.attackValue.breakthroughType; if(breakthroughType == BreakthroughType.None) return; string feedbackName = "GetHit" + breakthroughType.ToString(); - feedbackSc[feedbackName]?.Play(); + feedbackSc.PlayFeedback(feedbackName); } private void Feedback_GetAttacked(AttackAreaBase attackArea, AttackResult attackResult) { float ratio = attackResult.finalDamage / (attributeSm["MaximumHealth"] * 0.2f); float intensity = Mathf.Lerp(0.25f, 1f, ratio); - feedbackSc["GetAttacked"]?.Play(); + //feedbackSc.GetFeedbackData("GetAttacked") } private void Feedback_PerfectDodge(AttackAreaBase attackArea, DodgeSource dodgeSource) diff --git a/Assets/Scripts/MainGame/Characters/Player/PlayerLandMovementSubcontroller.cs b/Assets/Scripts/MainGame/Characters/Player/PlayerLandMovementSubcontroller.cs index 12137c04b..3475aa74e 100644 --- a/Assets/Scripts/MainGame/Characters/Player/PlayerLandMovementSubcontroller.cs +++ b/Assets/Scripts/MainGame/Characters/Player/PlayerLandMovementSubcontroller.cs @@ -1,8 +1,10 @@ using System; +using Cielonos.MainGame.Effects.Feedback; using DG.Tweening; using SLSUtilities.General; using SLSUtilities.FunctionalAnimation; using UniRx; +using Unity.Cinemachine; using UnityEngine; namespace Cielonos.MainGame.Characters @@ -249,6 +251,8 @@ namespace Cielonos.MainGame.Characters float horizontalSpeed = horizontalMovement.magnitude / DeltaTime; float remapFactor = Mathf.InverseLerp(10f, 15f, horizontalSpeed); PostProcessingManager.Instance.speedLinesSm.SetRemap(1 - remapFactor); + + //player.viewSc.cameraFovSm.UpdateFovBySpeed(horizontalSpeed, DeltaTime); } else { diff --git a/Assets/Scripts/MainGame/Characters/Player/PlayerOperationSubcontroller.cs b/Assets/Scripts/MainGame/Characters/Player/PlayerOperationSubcontroller.cs index f6a086b08..43a7b6beb 100644 --- a/Assets/Scripts/MainGame/Characters/Player/PlayerOperationSubcontroller.cs +++ b/Assets/Scripts/MainGame/Characters/Player/PlayerOperationSubcontroller.cs @@ -23,7 +23,8 @@ namespace Cielonos.MainGame.Characters public event Action OnDash; public event Action OnDodge; - public event Action OnLockOnTarget; + public event Action OnLockonTarget; + public event Action OnSelectLockonTarget; public event Action OnWalkPress; public event Action OnWalkRelease; @@ -70,7 +71,9 @@ namespace Cielonos.MainGame.Characters public void Dodge(float length = -1) => OnDodge?.Invoke(length); - public void LockOnTarget() => OnLockOnTarget?.Invoke(); + public void LockonTarget() => OnLockonTarget?.Invoke(); + + public void SelectLockonTarget(float direction) => OnSelectLockonTarget?.Invoke(direction); public void WalkPress() => OnWalkPress?.Invoke(); diff --git a/Assets/Scripts/MainGame/Characters/Player/View/CameraFovSubmodule.cs b/Assets/Scripts/MainGame/Characters/Player/View/CameraFovSubmodule.cs new file mode 100644 index 000000000..fcd0020b8 --- /dev/null +++ b/Assets/Scripts/MainGame/Characters/Player/View/CameraFovSubmodule.cs @@ -0,0 +1,134 @@ +using Cielonos.MainGame.Effects.Feedback; +using DG.Tweening; +using Unity.Cinemachine; +using UnityEngine; + +namespace Cielonos.MainGame.Characters +{ + public class CameraFovSubmodule : SubmoduleBase + { + private Player player => owner.player; + private PlayerViewSubcontroller viewSc => owner; + + [Header("基础FOV配置")] [Tooltip("静止时的基础FOV")] + public float baseFov = 45f; + + [Tooltip("FOV最小值")] public float minFov = 40f; + + [Tooltip("FOV最大值（疾奔时）")] public float maxFov = 55f; + + [Header("速度阈值")] [Tooltip("开始FOV变化的最小速度")] + public float speedThreshold = 3f; + + [Tooltip("达到最大FOV的速度")] public float maxSpeedThreshold = 15f; + + [Header("过渡设置")] [Tooltip("FOV变化的速度")] public float fovChangeSpeed = 5f; + + [Tooltip("是否平滑过渡FOV")] public bool useSmoothTransition = true; + + private float currentFov; + private float targetFov; + private CinemachineCamera currentCamera => viewSc.currentCamera; + + public CameraFovSubmodule(PlayerViewSubcontroller owner, float baseFov, float minFov, + float maxFov, float speedThreshold, float maxSpeedThreshold, float fovChangeSpeed, bool useSmoothTransition) : base(owner) + { + this.baseFov = baseFov; + this.minFov = minFov; + this.maxFov = maxFov; + this.speedThreshold = speedThreshold; + this.maxSpeedThreshold = maxSpeedThreshold; + this.fovChangeSpeed = fovChangeSpeed; + this.useSmoothTransition = useSmoothTransition; + this.currentFov = baseFov; + this.targetFov = baseFov; + } + + /// + /// 根据水平速度更新FOV + /// + /// 水平速度（单位/秒） + /// 帧时间 + public void UpdateFovBySpeed(float horizontalSpeed, float deltaTime) + { + // 计算目标FOV + targetFov = CalculateTargetFov(horizontalSpeed); + + // 平滑过渡 + if (useSmoothTransition) + { + currentFov = Mathf.Lerp(currentFov, targetFov, deltaTime * fovChangeSpeed); + } + else + { + currentFov = targetFov; + } + + // 应用FOV + ApplyFov(currentFov); + } + + /// + /// 根据速度计算目标FOV + /// + private float CalculateTargetFov(float speed) + { + if (speed < speedThreshold) + { + return baseFov; + } + + // 使用InverseLerp将速度映射到0-1范围 + float t = Mathf.InverseLerp(speedThreshold, maxSpeedThreshold, speed); + // 使用SmoothStep使过渡更平滑 + t = Mathf.SmoothStep(0f, 1f, t); + + return Mathf.Lerp(baseFov, maxFov, t); + } + + /// + /// 应用FOV到相机 + /// + private void ApplyFov(float fov) + { + fov = Mathf.Clamp(fov, minFov, maxFov); + + LensSettings lens = currentCamera.Lens; + lens.FieldOfView = fov; + currentCamera.Lens = lens; + } + + /// + /// 立即设置FOV（不使用平滑过渡） + /// + public void SetFovImmediate(float fov) + { + currentFov = fov; + targetFov = fov; + ApplyFov(fov); + } + + /// + /// 平滑过渡到指定FOV + /// + public void SetFovSmooth(float targetFovValue, float duration) + { + DOTween.To(() => currentFov, x => + { + currentFov = x; + ApplyFov(x); + }, targetFovValue, duration) + .SetEase(Ease.OutQuad); + + targetFov = targetFovValue; + } + + /// + /// 重置为默认FOV + /// + public void ResetToBaseFov() + { + targetFov = baseFov; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Characters/Player/View/CameraFovSubmodule.cs.meta b/Assets/Scripts/MainGame/Characters/Player/View/CameraFovSubmodule.cs.meta new file mode 100644 index 000000000..1e1fd3b4b --- /dev/null +++ b/Assets/Scripts/MainGame/Characters/Player/View/CameraFovSubmodule.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 1a007afcee9fd864cb29a8405fdc4d71 \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Characters/Player/View/LockTargetSubmodule.cs b/Assets/Scripts/MainGame/Characters/Player/View/LockTargetSubmodule.cs index af337e6b6..3c07db525 100644 --- a/Assets/Scripts/MainGame/Characters/Player/View/LockTargetSubmodule.cs +++ b/Assets/Scripts/MainGame/Characters/Player/View/LockTargetSubmodule.cs @@ -1,4 +1,5 @@ using System; +using System.Collections.Generic; using DG.Tweening; using SickscoreGames.HUDNavigationSystem; using UniRx; @@ -31,8 +32,13 @@ namespace Cielonos.MainGame.Characters /// 是否正在使用锁定目标摄像机 /// public bool isUsingLockTargetCamera => isLocking && isAutoRotate; - public bool isDuringSwitch; + + public bool isDuringCameraSwitch; + private const float CameraSwitchCooldown = 0.25f; + public CharacterBase lockTarget; + private float lastTargetSwitchTime; + private const float TargetSwitchCooldown = 0.25f; public Transform targetPoint; private Tweener iconTween; @@ -40,20 +46,27 @@ namespace Cielonos.MainGame.Characters { isLocking = false; isAutoRotate = false; - isDuringSwitch = false; + isDuringCameraSwitch = false; lockTarget = null; targetPoint = null; } public void Update() { - if (isUsingLockTargetCamera && !isDuringSwitch) + if (isUsingLockTargetCamera && !isDuringCameraSwitch) { - viewSc.cameraRoot.LookAt(targetPoint); - float distance = (targetPoint.position - viewSc.cameraRoot.transform.position).Flatten().magnitude; - if (isUsingLockTargetCamera && distance < 1f) + if (targetPoint != null) { - UnlockTarget(); + // 平滑跟随目标 + Vector3 currentRotation = viewSc.cameraRoot.eulerAngles; + Vector3 targetDirection = targetPoint.position - viewSc.cameraRoot.position; + Quaternion targetRotation = Quaternion.LookRotation(targetDirection); + + viewSc.cameraRoot.rotation = Quaternion.Slerp( + viewSc.cameraRoot.rotation, + targetRotation, + 1f - Mathf.Exp(-10f * Time.deltaTime) + ); } } } @@ -75,7 +88,7 @@ namespace Cielonos.MainGame.Characters public void LockTarget(bool isAutoRotate) { - if(isDuringSwitch) return; + if(isDuringCameraSwitch) return; CharacterBase target = BattleManager.EnemySm.GetNearestEnemy(50f); @@ -84,7 +97,7 @@ namespace Cielonos.MainGame.Characters this.isLocking = true; this.isAutoRotate = isAutoRotate; this.lockTarget = target; - this.isDuringSwitch = true; + this.isDuringCameraSwitch = true; if (isAutoRotate) { @@ -94,14 +107,14 @@ namespace Cielonos.MainGame.Characters viewSc.stateDrivenCamera.GetComponent().SetBool("isLockTarget", true); viewSc.cameraRoot.DOLookAt(targetPoint.position, 0.5f) .SetEase(Ease.InOutSine) - .OnComplete(() => { isDuringSwitch = false; }) + .OnComplete(() => { isDuringCameraSwitch = false; }) .Play(); } else { Observable.Timer(TimeSpan.FromSeconds(0.5f)).First().Subscribe(_ => { - isDuringSwitch = false; + isDuringCameraSwitch = false; }); } @@ -114,7 +127,7 @@ namespace Cielonos.MainGame.Characters public void UnlockTarget() { - if(isDuringSwitch) return; + if(isDuringCameraSwitch) return; Vector3 currentEuler = viewSc.playerCamera.transform.rotation.eulerAngles; @@ -134,12 +147,76 @@ namespace Cielonos.MainGame.Characters orbitalFollow.HorizontalAxis.Value = newYaw; orbitalFollow.VerticalAxis.Value = newPitch; + if (lockTarget != null) + { + lockTarget.navigationElement.showIndicator = false; + } + this.isLocking = false; this.isAutoRotate = false; - this.lockTarget.navigationElement.showIndicator = false; this.lockTarget = null; this.targetPoint = null; viewSc.stateDrivenCamera.GetComponent().SetBool("isLockTarget", false); } + + /// + /// 切换锁定目标 + /// + public void SwitchTarget(float direction) + { + if (!isLocking || isDuringCameraSwitch) return; + + if (Time.time - lastTargetSwitchTime < TargetSwitchCooldown) return; + + List sortedEnemies = BattleManager.EnemySm.GetVisibleEnemiesSortedByScreenX(); + if (sortedEnemies.Count <= 1) return; + + int currentIndex = sortedEnemies.IndexOf(lockTarget); + if (currentIndex < 0) + { + currentIndex = 0; + } + + int dir = direction > 0 ? -1 : 1; + int newIndex = currentIndex + dir; + + // 边界检查（无循环） + if (newIndex < 0 || newIndex >= sortedEnemies.Count) + { + return; + } + + CharacterBase newTarget = sortedEnemies[newIndex]; + + // 目标相同检查 + if (newTarget == lockTarget) + { + return; + } + + lastTargetSwitchTime = Time.time; + SetNewTarget(sortedEnemies[newIndex]); + } + + private void SetNewTarget(CharacterBase newTarget) + { + if (lockTarget != null) + { + lockTarget.navigationElement.showIndicator = false; + } + + lockTarget = newTarget; + targetPoint = newTarget.bodyPartsSc.cameraLockingPoint ?? newTarget.bodyPartsSc.staticCenterPoint; + + if (isUsingLockTargetCamera) + { + viewSc.lockingTargetCamera.LookAt = targetPoint; + } + + lockTarget.navigationElement.showIndicator = true; + Image icon = lockTarget.navigationElement.Indicator.OnscreenIcon; + iconTween?.Kill(true); + iconTween = icon.GetComponent().DOScale(1f, 0.3f).From(0.5f).SetEase(Ease.OutQuart).Play(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Characters/Player/View/PlayerViewSubcontroller.cs b/Assets/Scripts/MainGame/Characters/Player/View/PlayerViewSubcontroller.cs index 036080b63..823fbda8c 100644 --- a/Assets/Scripts/MainGame/Characters/Player/View/PlayerViewSubcontroller.cs +++ b/Assets/Scripts/MainGame/Characters/Player/View/PlayerViewSubcontroller.cs @@ -21,6 +21,7 @@ namespace Cielonos.MainGame.Characters public CinemachineCamera lockingTargetCamera; public CharacterBase testEnemy; + public CameraFovSubmodule cameraFovSm; public CameraRotationSubmodule cameraRotationSm; public OcclusionFadeSubmodule occlusionFadeSm; public LockTargetSubmodule lockTargetModule; @@ -30,10 +31,14 @@ namespace Cielonos.MainGame.Characters public override void Initialize() { base.Initialize(); + cameraFovSm = new CameraFovSubmodule(this, 30f, 30f, 40f, 0.1f, 10f, 5f, true); cameraRotationSm = new CameraRotationSubmodule(this, player.transform.eulerAngles.y); occlusionFadeSm = new OcclusionFadeSubmodule(this); lockTargetModule = new LockTargetSubmodule(this); cameraFOV = new LerpFloat(30f, 2f); + + player.operationSc.OnLockonTarget += lockTargetModule.SwitchLockState; + player.operationSc.OnSelectLockonTarget += lockTargetModule.SwitchTarget; } private void Start() @@ -43,11 +48,6 @@ namespace Cielonos.MainGame.Characters private void Update() { - if (Keyboard.current.tabKey.wasPressedThisFrame) - { - lockTargetModule.SwitchLockState(); - } - /*cameraFOV.targetValue = owner.landMovementSc.isSprinting ? 40f : 30f; cameraFOV.Update(owner.selfTimeSm.DeltaTime); freeLookCamera.Lens.FieldOfView = cameraFOV.currentValue;*/ diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Base/CurveChannel.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Base/CurveChannel.cs index 1815f180a..cd8f8ce66 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Base/CurveChannel.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Base/CurveChannel.cs @@ -12,29 +12,21 @@ namespace Cielonos.MainGame.Effects.Feedback [Serializable] public struct FloatCurveChannel { - /// - /// 是否启用此通道。 - /// - public bool active; - /// /// 震动曲线，X轴为归一化时间[0,1]，Y轴为强度[0,1]。 /// - [ShowIf("active")] [ShakeCurvePreset] public AnimationCurve curve; /// /// 曲线值0对应的实际数值。 /// - [ShowIf("active")] [LabelText("Remap Min")] public float remapMin; /// /// 曲线值1对应的实际数值。 /// - [ShowIf("active")] [LabelText("Remap Max")] public float remapMax; @@ -47,11 +39,10 @@ namespace Cielonos.MainGame.Effects.Feedback /// /// 创建默认的曲线通道。 /// - public static FloatCurveChannel CreateDefault(bool active = true, float remapMin = 0f, float remapMax = 1f, bool relativeToInitial = true) + public static FloatCurveChannel CreateDefault(float remapMin = 0f, float remapMax = 1f, bool relativeToInitial = true) { return new FloatCurveChannel { - active = active, curve = new AnimationCurve( new Keyframe(0f, 0f), new Keyframe(0.5f, 1f), @@ -68,7 +59,7 @@ namespace Cielonos.MainGame.Effects.Feedback /// public readonly float Evaluate(float normalizedTime) { - if (!active || curve == null) return 0f; + if (curve == null) return 0f; float t = Mathf.Clamp01(normalizedTime); float curveValue = curve.Evaluate(t); return Mathf.LerpUnclamped(remapMin, remapMax, curveValue); @@ -81,15 +72,9 @@ namespace Cielonos.MainGame.Effects.Feedback [Serializable] public struct ColorCurveChannel { - /// - /// 是否启用此通道。 - /// - public bool active; - /// /// 颜色渐变。 /// - [ShowIf("active")] [LabelText("颜色渐变")] public Gradient gradient; @@ -100,7 +85,6 @@ namespace Cielonos.MainGame.Effects.Feedback { return new ColorCurveChannel { - active = true, gradient = new Gradient() }; } @@ -110,7 +94,7 @@ namespace Cielonos.MainGame.Effects.Feedback /// public Color Evaluate(float normalizedTime) { - if (!active || gradient == null) return Color.white; + if (gradient == null) return Color.white; return gradient.Evaluate(Mathf.Clamp01(normalizedTime)); } } @@ -121,23 +105,17 @@ namespace Cielonos.MainGame.Effects.Feedback [Serializable] public struct Vector2CurveChannel { - public bool active; - - [ShowIf("active")] [LabelText("曲线 X")] [ShakeCurvePreset] public AnimationCurve curveX; - - [ShowIf("active")] + [LabelText("曲线 Y")] [ShakeCurvePreset] public AnimationCurve curveY; - - [ShowIf("active")] + [LabelText("Remap Min")] public Vector2 remapMin; - - [ShowIf("active")] + [LabelText("Remap Max")] public Vector2 remapMax; @@ -153,7 +131,6 @@ namespace Cielonos.MainGame.Effects.Feedback { return new Vector2CurveChannel { - active = true, curveX = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(1f, 1f)), curveY = new AnimationCurve(new Keyframe(0f, 0f), new Keyframe(1f, 1f)), remapMin = Vector2.zero, @@ -164,9 +141,8 @@ namespace Cielonos.MainGame.Effects.Feedback /// /// 根据归一化时间计算Vector2值。 /// - public Vector2 Evaluate(float normalizedTime, Vector2 initialValue) + public readonly Vector2 Evaluate(float normalizedTime, Vector2 initialValue) { - if (!active) return Vector2.zero; float t = Mathf.Clamp01(normalizedTime); float x = curveX?.Evaluate(t) ?? 0f; float y = curveY?.Evaluate(t) ?? 0f; diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraDirectionSettings.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraDirectionSettings.cs index 749821da9..12c9aafef 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraDirectionSettings.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraDirectionSettings.cs @@ -39,26 +39,19 @@ namespace Cielonos.MainGame.Effects.Feedback /// 将给定的本地空间向量根据当前设置转换到世界空间。 /// 如果两个方向都开启，角色方向优先。 /// - /// 本地空间下的振幅向量 + /// 在摄像机和角色相同朝向时，屏幕空间的振幅向量 /// 角色 Transform（可能为 null） /// 经方向变换后的振幅向量 - public Vector3 TransformAmplitude(Vector3 localAmplitude, Transform ownerTransform) + public Vector3 TransformAmplitude(Vector3 standardScreenVector, Transform ownerTransform) { - if (affectedByCharacterDirection && ownerTransform != null) - { - return ownerTransform.TransformDirection(localAmplitude); - } + Camera mainCamera = MainGameManager.Instance?.player?.viewSc?.playerCamera; + if (mainCamera == null) return standardScreenVector; - if (affectedByCameraDirection) - { - Camera mainCamera = MainGameManager.Instance.player.viewSc.playerCamera; - if (mainCamera != null) - { - return mainCamera.transform.TransformDirection(localAmplitude); - } - } + Quaternion characterRotation = ownerTransform?.rotation ?? Quaternion.identity; + Quaternion cameraRotation = mainCamera.transform.rotation; - return localAmplitude; + Quaternion deltaRotation = Quaternion.Inverse(cameraRotation) * characterRotation; + return deltaRotation * standardScreenVector; } } } diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraFieldOfViewAction.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraFieldOfViewAction.cs index 1632a76ec..e3a6d76e6 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraFieldOfViewAction.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraFieldOfViewAction.cs @@ -16,7 +16,7 @@ namespace Cielonos.MainGame.Effects.Feedback [TitleGroup("FOV设置")] [LabelText("FOV曲线")] - public FloatCurveChannel fovCurve = FloatCurveChannel.CreateDefault(remapMax: 10f); + public FloatCurveChannel fovCurve = FloatCurveChannel.CreateDefault(); protected override void TriggerEvent(FeedbackContext context) { @@ -30,11 +30,6 @@ namespace Cielonos.MainGame.Effects.Feedback public override bool Validate(out string error) { - if (!fovCurve.active) - { - error = "FOV curve is not enabled."; - return false; - } error = null; return true; } diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraPositionShakeAction.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraPositionShakeAction.cs index 110a42760..1204d56f1 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraPositionShakeAction.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraPositionShakeAction.cs @@ -44,7 +44,7 @@ namespace Cielonos.MainGame.Effects.Feedback { Vector3 finalAmplitude = directionSettings.TransformAmplitude(amplitude, context.owner); float intensityMultiplier = ComputeAttenuation(context); - CameraRotationShakeEvent.Trigger(context, intensityCurve, finalAmplitude * intensityMultiplier); + CameraPositionShakeEvent.Trigger(context, intensityCurve, finalAmplitude * intensityMultiplier); } protected override void StopEvent(FeedbackContext context) @@ -66,11 +66,6 @@ namespace Cielonos.MainGame.Effects.Feedback public override bool Validate(out string error) { - if (!intensityCurve.active) - { - error = "Intensity curve is not enabled."; - return false; - } error = null; return true; } diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraRotationShakeAction.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraRotationShakeAction.cs index 0ce0f3543..7dfb60a5d 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraRotationShakeAction.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Cinemachine/CameraRotationShakeAction.cs @@ -17,8 +17,7 @@ namespace Cielonos.MainGame.Effects.Feedback public Vector3 amplitude; - [LabelText("X轴曲线")] - public FloatCurveChannel intensityCurve = FloatCurveChannel.CreateDefault(remapMax: 5f); + public FloatCurveChannel intensityCurve = FloatCurveChannel.CreateDefault(); public CameraDirectionSettings directionSettings = new CameraDirectionSettings(); @@ -40,8 +39,8 @@ namespace Cielonos.MainGame.Effects.Feedback protected override void TriggerEvent(FeedbackContext context) { Vector3 finalAmplitude = directionSettings.TransformAmplitude(amplitude, context.owner); - float intensityMultiplier = ComputeAttenuation(context); - CameraRotationShakeEvent.Trigger(context, intensityCurve, finalAmplitude * intensityMultiplier); + float attenuation = ComputeAttenuation(context); + CameraRotationShakeEvent.Trigger(context, intensityCurve, finalAmplitude * attenuation); } protected override void StopEvent(FeedbackContext context) diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/ACESAction.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/ACESAction.cs index ed2e81154..3a207883b 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/ACESAction.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/ACESAction.cs @@ -58,11 +58,11 @@ namespace Cielonos.MainGame.Effects.Feedback { AnimeACESShakeEvent.Trigger( context, - exposureChannel, - contrastChannel, - saturationChannel, - hueChannel, - colorFilterChannel + modifyExposure, exposureChannel, + modifyContrast, contrastChannel, + modifySaturation, saturationChannel, + modifyHue, hueChannel, + modifyColorFilter, colorFilterChannel ); } diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/BloomAction.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/BloomAction.cs index 8ace70e40..3bf2fd9db 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/BloomAction.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/BloomAction.cs @@ -3,8 +3,16 @@ using UnityEngine; namespace Cielonos.MainGame.Effects.Feedback { - public class BloomAction : CurveShakeAction + public class BloomAction : PostprocessingActionBase { - + protected override void TriggerEvent(FeedbackContext context) + { + throw new System.NotImplementedException(); + } + + protected override void StopEvent(FeedbackContext context) + { + throw new System.NotImplementedException(); + } } } \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/RGBSplitGlitchAction.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/RGBSplitGlitchAction.cs new file mode 100644 index 000000000..837fdd4a2 --- /dev/null +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/RGBSplitGlitchAction.cs @@ -0,0 +1,60 @@ +using System; +using Sirenix.OdinInspector; +using SLSUtilities.Feedback; +using UnityEngine; + +namespace Cielonos.MainGame.Effects.Feedback +{ + /// + /// RGB分离故障反馈动作，通过 RGBSplitGlitchShakeEvent 触发 RGBSplitGlitchShaker。 + /// + [Serializable] + [FeedbackActionColor(1f, 0.3f, 0.8f)] + public class RGBSplitGlitchAction : PostprocessingActionBase + { + public override string DisplayName => "RGB Split Glitch"; + + [LabelText("强度曲线")] + public FloatCurveChannel intensityCurve = FloatCurveChannel.CreateDefault(remapMax: 1f); + + [LabelText("修改速度")] + public bool modifySpeed; + + [ShowIf("modifySpeed")] + [LabelText("速度曲线")] + public FloatCurveChannel speedCurve = FloatCurveChannel.CreateDefault(remapMax: 50f); + + [HideIf("modifySpeed")] + [LabelText("速度")] + [Range(0f, 100f)] + public float speed = 30f; + + protected override void TriggerEvent(FeedbackContext context) + { + FloatCurveChannel finalSpeedCurve = modifySpeed + ? speedCurve + : new FloatCurveChannel + { + curve = AnimationCurve.Constant(0f, 1f, speed), + relativeToInitial = false + }; + + RGBSplitGlitchShakeEvent.Trigger( + context, + intensityCurve, + finalSpeedCurve + ); + } + + protected override void StopEvent(FeedbackContext context) + { + RGBSplitGlitchShakeEvent.Trigger(context, intensityCurve, stop: true); + } + + public override bool Validate(out string error) + { + error = null; + return true; + } + } +} diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/RGBSplitGlitchAction.cs.meta b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/RGBSplitGlitchAction.cs.meta new file mode 100644 index 000000000..f991b264a --- /dev/null +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/RGBSplitGlitchAction.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: dc20b82d80b720247a0ef6db8513af02 \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/VignetteAction.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/VignetteAction.cs index c66beb710..afaef04cc 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/VignetteAction.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Actions/Postprocessing/VignetteAction.cs @@ -14,73 +14,53 @@ namespace Cielonos.MainGame.Effects.Feedback { public override string DisplayName => "Vignette"; - public FloatCurveChannel intensityCurve = FloatCurveChannel.CreateDefault(remapMax: 1f); - /// - /// 是否修改暗角中心点。 - /// [LabelText("修改中心点")] public bool modifyCenter; - /// - /// 模糊中心的屏幕坐标 (0-1)。(0.5, 0.5) 为屏幕正中心。 - /// [HideIf("modifyCenter")] [LabelText("中心点")] public Vector2 center = new Vector2(0.5f, 0.5f); [ShowIf("modifyCenter")] + [LabelText("中心点曲线")] public Vector2CurveChannel centerCurve = Vector2CurveChannel.CreateDefault(); - /// - /// 是否修改颜色。 - /// [LabelText("修改颜色")] public bool modifyColors; [HideIf("modifyColors")] - public Color outColor; - - [HideIf("modifyColors")] - public Color innerColor; - - /// - /// 外圈颜色。 - /// - [ShowIf("modifyColors")] [LabelText("外圈颜色")] + public Color outColor = Color.black; + + [HideIf("modifyColors")] + [LabelText("内圈颜色")] + public Color innerColor = Color.black; + + [ShowIf("modifyColors")] + [LabelText("外圈颜色曲线")] public ColorCurveChannel outerColorCurve = ColorCurveChannel.CreateDefault(); - /// - /// 内圈颜色。 - /// [ShowIf("modifyColors")] - [LabelText("内圈颜色")] + [LabelText("内圈颜色曲线")] public ColorCurveChannel innerColorCurve = ColorCurveChannel.CreateDefault(); - /// - /// 是否修改形状。 - /// [LabelText("修改形状")] public bool modifyShape; [HideIf("modifyShape")] - public float smoothness; + [LabelText("柔和度")] + public float smoothness = 0.5f; [HideIf("modifyShape")] - public float roundness; + [LabelText("圆度")] + public float roundness = 1f; - /// - /// 柔和度曲线。 - /// [ShowIf("modifyShape")] [LabelText("柔和度曲线")] public FloatCurveChannel smoothnessCurve = FloatCurveChannel.CreateDefault(remapMax: 0.5f); - /// - /// 圆度曲线。 - /// [ShowIf("modifyShape")] [LabelText("圆度曲线")] public FloatCurveChannel roundnessCurve = FloatCurveChannel.CreateDefault(remapMax: 1f); @@ -91,13 +71,18 @@ namespace Cielonos.MainGame.Effects.Feedback context, intensityCurve, modifyCenter, - center, + modifyCenter ? centerCurve : default, + modifyCenter ? center : default(Vector2), modifyColors, - outerColorCurve, - innerColorCurve, + modifyColors ? outerColorCurve : default, + modifyColors ? innerColorCurve : default, + modifyColors ? outColor : default, + modifyColors ? innerColor : default, modifyShape, - smoothnessCurve, - roundnessCurve + modifyShape ? smoothnessCurve : default, + modifyShape ? roundnessCurve : default, + modifyShape ? smoothness : 0f, + modifyShape ? roundness : 0f ); } diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/AnimeACESShaker.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/AnimeACESShaker.cs index 6fa396119..3942c8876 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/AnimeACESShaker.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/AnimeACESShaker.cs @@ -17,10 +17,15 @@ namespace Cielonos.MainGame.Effects.Feedback public delegate void ShakeDelegate( FeedbackContext feedbackContext, + bool modifyExposure, FloatCurveChannel exposureCurve, + bool modifyContrast, FloatCurveChannel contrastCurve, + bool modifySaturation, FloatCurveChannel saturationCurve, + bool modifyHue, FloatCurveChannel hueCurve, + bool modifyColorFilter, ColorCurveChannel colorFilterCurve, bool stop ); @@ -30,14 +35,32 @@ namespace Cielonos.MainGame.Effects.Feedback public static void Trigger( FeedbackContext feedbackContext, + bool modifyExposure = false, FloatCurveChannel exposureCurve = default, + bool modifyContrast = false, FloatCurveChannel contrastCurve = default, + bool modifySaturation = false, FloatCurveChannel saturationCurve = default, + bool modifyHue = false, FloatCurveChannel hueCurve = default, + bool modifyColorFilter = false, ColorCurveChannel colorFilterCurve = default, bool stop = false) { - OnEvent?.Invoke(feedbackContext, exposureCurve, contrastCurve, saturationCurve, hueCurve, colorFilterCurve, stop); + OnEvent?.Invoke( + feedbackContext, + modifyExposure, + exposureCurve, + modifyContrast, + contrastCurve, + modifySaturation, + saturationCurve, + modifyHue, + hueCurve, + modifyColorFilter, + colorFilterCurve, + stop + ); } } @@ -46,26 +69,45 @@ namespace Cielonos.MainGame.Effects.Feedback /// public class AnimeACESShakeInstance : ShakeInstanceBase { - public readonly FloatCurveChannel ExposureCurve; - public readonly FloatCurveChannel ContrastCurve; - public readonly FloatCurveChannel SaturationCurve; - public readonly FloatCurveChannel HueCurve; - public readonly ColorCurveChannel ColorFilterCurve; + public readonly bool modifyExposure; + public readonly FloatCurveChannel exposureCurve; + + public readonly bool modifyContrast; + public readonly FloatCurveChannel contrastCurve; + + public readonly bool modifySaturation; + public readonly FloatCurveChannel saturationCurve; + + public readonly bool modifyHue; + public readonly FloatCurveChannel hueCurve; + + public readonly bool modifyColorFilter; + public readonly ColorCurveChannel colorFilterCurve; public AnimeACESShakeInstance( FeedbackContext feedbackContext, + bool modifyExposure, FloatCurveChannel exposureCurve, + bool modifyContrast, FloatCurveChannel contrastCurve, + bool modifySaturation, FloatCurveChannel saturationCurve, + bool modifyHue, FloatCurveChannel hueCurve, + bool modifyColorFilter, ColorCurveChannel colorFilterCurve) : base(feedbackContext.timeSettings, feedbackContext.player.TimeProvider, feedbackContext.duration) { - ExposureCurve = exposureCurve; - ContrastCurve = contrastCurve; - SaturationCurve = saturationCurve; - HueCurve = hueCurve; - ColorFilterCurve = colorFilterCurve; + this.modifyExposure = modifyExposure; + this.modifyContrast = modifyContrast; + this.modifySaturation = modifySaturation; + this.modifyHue = modifyHue; + this.modifyColorFilter = modifyColorFilter; + this.exposureCurve = exposureCurve; + this.contrastCurve = contrastCurve; + this.saturationCurve = saturationCurve; + this.hueCurve = hueCurve; + this.colorFilterCurve = colorFilterCurve; } } @@ -115,38 +157,39 @@ namespace Cielonos.MainGame.Effects.Feedback for (int i = _activeShakes.Count - 1; i >= 0; i--) { AnimeACESShakeInstance shake = _activeShakes[i]; - shake.timer += shake.timeProvider.GetDeltaTime(shake.timeSettings); + shake.Tick(); float normalizedTime = shake.timer / shake.duration; // Exposure - if (shake.ExposureCurve.active) + if (shake.modifyExposure) { - additiveExposure += shake.ExposureCurve.Evaluate(normalizedTime); + additiveExposure += shake.exposureCurve.Evaluate(normalizedTime); + Debug.Log($"Exposure shake: {additiveExposure}"); } // Contrast - if (shake.ContrastCurve.active) + if (shake.modifyContrast) { - additiveContrast += shake.ContrastCurve.Evaluate(normalizedTime); + additiveContrast += shake.contrastCurve.Evaluate(normalizedTime); } // Saturation - if (shake.SaturationCurve.active) + if (shake.modifySaturation) { - additiveSaturation += shake.SaturationCurve.Evaluate(normalizedTime); + additiveSaturation += shake.saturationCurve.Evaluate(normalizedTime); } // Hue - if (shake.HueCurve.active) + if (shake.modifyHue) { - additiveHue += shake.HueCurve.Evaluate(normalizedTime); + additiveHue += shake.hueCurve.Evaluate(normalizedTime); } // Color Filter - if (shake.ColorFilterCurve.active) + if (shake.modifyColorFilter) { - colorFilterAccum = shake.ColorFilterCurve.Evaluate(normalizedTime); + colorFilterAccum = shake.colorFilterCurve.Evaluate(normalizedTime); hasColorFilter = true; } @@ -171,10 +214,15 @@ namespace Cielonos.MainGame.Effects.Feedback private void OnShakeEvent( FeedbackContext feedbackContext, + bool modifyExposure, FloatCurveChannel exposureCurve, + bool modifyContrast, FloatCurveChannel contrastCurve, + bool modifySaturation, FloatCurveChannel saturationCurve, + bool modifyHue, FloatCurveChannel hueCurve, + bool modifyColorFilter, ColorCurveChannel colorFilterCurve, bool stop) { @@ -184,12 +232,11 @@ namespace Cielonos.MainGame.Effects.Feedback var instance = new AnimeACESShakeInstance( feedbackContext, - exposureCurve, - contrastCurve, - saturationCurve, - hueCurve, - colorFilterCurve - ); + modifyExposure, exposureCurve, + modifyContrast, contrastCurve, + modifySaturation, saturationCurve, + modifyHue, hueCurve, + modifyColorFilter, colorFilterCurve); _activeShakes.Add(instance); } diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/ChromaticAberrationShaker.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/ChromaticAberrationShaker.cs index d9e5a66f6..195ae665b 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/ChromaticAberrationShaker.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/ChromaticAberrationShaker.cs @@ -118,21 +118,18 @@ namespace Cielonos.MainGame.Effects.Feedback float normalizedTime = shake.timer / shake.duration; - if (shake.intensityCurve.active) + float curveValue = shake.intensityCurve.Evaluate(normalizedTime); + if (shake.intensityCurve.relativeToInitial) { - float curveValue = shake.intensityCurve.Evaluate(normalizedTime); - if (shake.intensityCurve.relativeToInitial) - { - additiveIntensity += curveValue; - } - else - { - absoluteIntensity = curveValue; - hasAbsolute = true; - } + additiveIntensity += curveValue; + } + else + { + absoluteIntensity = curveValue; + hasAbsolute = true; } - if (shake.modifyJitter && shake.jitterCurve.active) + if (shake.modifyJitter) { additiveJitter += shake.jitterCurve.Evaluate(normalizedTime); } diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/Cinemachine/CameraFovShaker.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/Cinemachine/CameraFovShaker.cs index 5a378ab03..e39af2a5e 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/Cinemachine/CameraFovShaker.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/Cinemachine/CameraFovShaker.cs @@ -56,13 +56,13 @@ namespace Cielonos.MainGame.Effects.Feedback public class CameraFovShaker : MonoBehaviour { private CinemachineCamera _camera; - private float _initialFov; + public float initialFov; private readonly List _activeShakes = new List(); private void Awake() { _camera = GetComponent(); - _initialFov = _camera.Lens.FieldOfView; + initialFov = _camera.Lens.FieldOfView; } private void OnEnable() @@ -82,7 +82,7 @@ namespace Cielonos.MainGame.Effects.Feedback if (_activeShakes.Count == 0) { - SetFov(_initialFov); + SetFov(initialFov); return; } @@ -112,7 +112,7 @@ namespace Cielonos.MainGame.Effects.Feedback } } - float finalFov = hasAbsolute ? absoluteFov : _initialFov + additiveFov; + float finalFov = hasAbsolute ? absoluteFov : initialFov + additiveFov; SetFov(finalFov); } @@ -144,7 +144,7 @@ namespace Cielonos.MainGame.Effects.Feedback _activeShakes.Clear(); if (_camera != null) { - SetFov(_initialFov); + SetFov(initialFov); } } } diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/Cinemachine/CinemachineRotationShaker.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/Cinemachine/CinemachineRotationShaker.cs index e487941e0..78af30db3 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/Cinemachine/CinemachineRotationShaker.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/Cinemachine/CinemachineRotationShaker.cs @@ -109,7 +109,6 @@ namespace Cielonos.MainGame.Effects.Feedback } Vector3 totalOffset = Vector3.zero; - for (int i = _activeShakes.Count - 1; i >= 0; i--) { CameraRotationShakeInstance shake = _activeShakes[i]; @@ -121,7 +120,6 @@ namespace Cielonos.MainGame.Effects.Feedback _activeShakes.RemoveAt(i); } } - _rotationOffset.rotationOffset = _initialRotation + totalOffset; } diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/RGBSplitGlitchShaker.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/RGBSplitGlitchShaker.cs new file mode 100644 index 000000000..5514dec8c --- /dev/null +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/RGBSplitGlitchShaker.cs @@ -0,0 +1,173 @@ +using System.Collections.Generic; +using SLSUtilities.Feedback; +using SLSUtilities.Rendering.PostProcessing; +using UnityEngine; + +namespace Cielonos.MainGame.Effects.Feedback +{ + /// + /// RGB分离故障震动事件。 + /// + public struct RGBSplitGlitchShakeEvent + { + private static event ShakeDelegate OnEvent; + + [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)] + private static void RuntimeInitialization() { OnEvent = null; } + + public delegate void ShakeDelegate( + FeedbackContext feedbackContext, + FloatCurveChannel intensityCurve, + FloatCurveChannel speedCurve, + bool stop + ); + + public static void Register(ShakeDelegate callback) { OnEvent += callback; } + public static void Unregister(ShakeDelegate callback) { OnEvent -= callback; } + + public static void Trigger( + FeedbackContext feedbackContext, + FloatCurveChannel intensityCurve, + FloatCurveChannel speedCurve = default, + bool stop = false) + { + OnEvent?.Invoke(feedbackContext, intensityCurve, speedCurve, stop); + } + } + + /// + /// RGB分离故障震动实例。 + /// + public class RGBSplitGlitchShakeInstance : ShakeInstanceBase + { + public readonly FloatCurveChannel intensityCurve; + public readonly FloatCurveChannel speedCurve; + + public RGBSplitGlitchShakeInstance( + FeedbackContext feedbackContext, + FloatCurveChannel intensityCurve, + FloatCurveChannel speedCurve) + : base(feedbackContext.timeSettings, feedbackContext.player.TimeProvider, feedbackContext.duration) + { + this.intensityCurve = intensityCurve; + this.speedCurve = speedCurve; + } + } + + /// + /// RGBSplitGlitch 的震动聚合器。 + /// + [AddComponentMenu("SLS Utilities/Feedback Shakers/RGB Split Glitch Shaker")] + public class RGBSplitGlitchShaker : MonoBehaviour + { + private RGBSplitGlitch _component; + private float _initialIntensity; + private float _initialSpeed; + private bool _resolved; + + private readonly List _activeShakes = new List(); + + private void Awake() + { + _resolved = TryResolve(); + } + + private void OnEnable() + { + RGBSplitGlitchShakeEvent.Register(OnShakeEvent); + } + + private void OnDisable() + { + RGBSplitGlitchShakeEvent.Unregister(OnShakeEvent); + StopAll(); + } + + private void Update() + { + if (!_resolved || _activeShakes.Count == 0) return; + + float additiveIntensity = 0f; + float absoluteIntensity = 0f; + bool hasAbsolute = false; + float additiveSpeed = 0f; + + for (int i = _activeShakes.Count - 1; i >= 0; i--) + { + RGBSplitGlitchShakeInstance shake = _activeShakes[i]; + shake.timer += shake.timeProvider.GetDeltaTime(shake.timeSettings); + + float normalizedTime = shake.timer / shake.duration; + + float intensityValue = shake.intensityCurve.Evaluate(normalizedTime); + if (shake.intensityCurve.relativeToInitial) + { + additiveIntensity += intensityValue; + } + else + { + absoluteIntensity = intensityValue; + hasAbsolute = true; + } + + additiveSpeed += shake.speedCurve.Evaluate(normalizedTime); + + if (shake.IsFinished) + { + _activeShakes.RemoveAt(i); + } + } + + float finalIntensity = hasAbsolute ? absoluteIntensity : _initialIntensity + additiveIntensity; + _component.intensity.value = finalIntensity; + _component.speed.value = _initialSpeed + additiveSpeed; + + if (_activeShakes.Count == 0) + { + Restore(); + } + } + + private void OnShakeEvent( + FeedbackContext feedbackContext, + FloatCurveChannel intensityCurve, + FloatCurveChannel speedCurve, + bool stop) + { + if (stop) { StopAll(); return; } + if (!_resolved) _resolved = TryResolve(); + if (!_resolved) return; + + var instance = new RGBSplitGlitchShakeInstance( + feedbackContext, + intensityCurve, + speedCurve + ); + _activeShakes.Add(instance); + } + + private bool TryResolve() + { + if (_component != null) return true; + if (PostProcessingManager.Instance == null) return false; + if (!PostProcessingManager.Instance.GetVolumeComponent(out _component)) return false; + + _initialIntensity = _component.intensity.value; + _initialSpeed = _component.speed.value; + return true; + } + + private void Restore() + { + if (!_resolved) return; + _component.intensity.value = _initialIntensity; + _component.speed.value = _initialSpeed; + } + + private void StopAll() + { + _activeShakes.Clear(); + Restore(); + } + } +} diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/RGBSplitGlitchShaker.cs.meta b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/RGBSplitGlitchShaker.cs.meta new file mode 100644 index 000000000..bac6350d6 --- /dev/null +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/RGBSplitGlitchShaker.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: e720e1219abdd234b8c87ce75d5815cb \ No newline at end of file diff --git a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/VignetteShaker.cs b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/VignetteShaker.cs index d6a049bcd..028704ddc 100644 --- a/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/VignetteShaker.cs +++ b/Assets/Scripts/MainGame/Effects/Feedbacks/Shakers/VignetteShaker.cs @@ -19,13 +19,18 @@ namespace Cielonos.MainGame.Effects.Feedback FeedbackContext feedbackContext, FloatCurveChannel intensityCurve, bool modifyCenter, + Vector2CurveChannel centerCurve, Vector2 center, bool modifyColors, ColorCurveChannel colorOuter, ColorCurveChannel colorInner, + Color outColor, + Color innerColor, bool modifyShape, FloatCurveChannel smoothnessCurve, FloatCurveChannel roundnessCurve, + float smoothness, + float roundness, bool stop ); @@ -36,18 +41,23 @@ namespace Cielonos.MainGame.Effects.Feedback FeedbackContext feedbackContext, FloatCurveChannel intensityCurve, bool modifyCenter = false, + Vector2CurveChannel centerCurve = default, Vector2 center = default, bool modifyColors = false, ColorCurveChannel colorOuter = default, ColorCurveChannel colorInner = default, + Color outColor = default, + Color innerColor = default, bool modifyShape = false, FloatCurveChannel smoothnessCurve = default, FloatCurveChannel roundnessCurve = default, + float smoothness = 0f, + float roundness = 0f, bool stop = false) { - OnEvent?.Invoke(feedbackContext, intensityCurve, modifyCenter, center, - modifyColors, colorOuter, colorInner, modifyShape, - smoothnessCurve, roundnessCurve, stop); + OnEvent?.Invoke(feedbackContext, intensityCurve, modifyCenter, centerCurve, center, + modifyColors, colorOuter, colorInner, outColor, innerColor, modifyShape, + smoothnessCurve, roundnessCurve, smoothness, roundness, stop); } } @@ -58,36 +68,51 @@ namespace Cielonos.MainGame.Effects.Feedback { public readonly FloatCurveChannel intensityCurve; public readonly bool modifyCenter; + public readonly Vector2CurveChannel centerCurve; public readonly Vector2 center; public readonly bool modifyColors; public readonly ColorCurveChannel colorOuter; public readonly ColorCurveChannel colorInner; + public readonly Color outColor; + public readonly Color innerColor; public readonly bool modifyShape; public readonly FloatCurveChannel smoothnessCurve; public readonly FloatCurveChannel roundnessCurve; + public readonly float smoothness; + public readonly float roundness; public VignetteShakeInstance( FeedbackContext feedbackContext, FloatCurveChannel intensityCurve, bool modifyCenter, + Vector2CurveChannel centerCurve, Vector2 center, bool modifyColors, ColorCurveChannel colorOuter, ColorCurveChannel colorInner, + Color outColor, + Color innerColor, bool modifyShape, FloatCurveChannel smoothnessCurve, - FloatCurveChannel roundnessCurve) + FloatCurveChannel roundnessCurve, + float smoothness, + float roundness) : base(feedbackContext.timeSettings, feedbackContext.player.TimeProvider, feedbackContext.duration) { this.intensityCurve = intensityCurve; this.modifyCenter = modifyCenter; + this.centerCurve = centerCurve; this.center = center; this.modifyColors = modifyColors; this.colorOuter = colorOuter; this.colorInner = colorInner; + this.outColor = outColor; + this.innerColor = innerColor; this.modifyShape = modifyShape; this.smoothnessCurve = smoothnessCurve; this.roundnessCurve = roundnessCurve; + this.smoothness = smoothness; + this.roundness = roundness; } } @@ -148,37 +173,44 @@ namespace Cielonos.MainGame.Effects.Feedback float normalizedTime = shake.timer / shake.duration; - if (shake.intensityCurve.active) + float curveValue = shake.intensityCurve.Evaluate(normalizedTime); + if (shake.intensityCurve.relativeToInitial) { - float curveValue = shake.intensityCurve.Evaluate(normalizedTime); - if (shake.intensityCurve.relativeToInitial) - { - additiveIntensity += curveValue; - } - else - { - absoluteIntensity = curveValue; - hasAbsolute = true; - } + additiveIntensity += curveValue; + } + else + { + absoluteIntensity = curveValue; + hasAbsolute = true; } if (shake.modifyCenter) { - latestCenter = shake.center; + latestCenter = shake.modifyCenter + ? shake.centerCurve.Evaluate(normalizedTime, _initialCenter) + : shake.center; hasCenter = true; } if (shake.modifyColors) { - latestColorOuter = shake.colorOuter.Evaluate(normalizedTime); - latestColorInner = shake.colorInner.Evaluate(normalizedTime); + latestColorOuter = shake.modifyColors + ? shake.colorOuter.Evaluate(normalizedTime) + : shake.outColor; + latestColorInner = shake.modifyColors + ? shake.colorInner.Evaluate(normalizedTime) + : shake.innerColor; hasColors = true; } if (shake.modifyShape) { - latestSmoothness = shake.smoothnessCurve.Evaluate(normalizedTime); - latestRoundness = shake.roundnessCurve.Evaluate(normalizedTime); + latestSmoothness = shake.modifyShape + ? shake.smoothnessCurve.Evaluate(normalizedTime) + : shake.smoothness; + latestRoundness = shake.modifyShape + ? shake.roundnessCurve.Evaluate(normalizedTime) + : shake.roundness; hasShape = true; } @@ -213,13 +245,18 @@ namespace Cielonos.MainGame.Effects.Feedback FeedbackContext feedbackContext, FloatCurveChannel intensityCurve, bool modifyCenter, + Vector2CurveChannel centerCurve, Vector2 center, bool modifyColors, ColorCurveChannel colorOuter, ColorCurveChannel colorInner, + Color outColor, + Color innerColor, bool modifyShape, FloatCurveChannel smoothnessCurve, FloatCurveChannel roundnessCurve, + float smoothness, + float roundness, bool stop) { if (stop) { StopAll(); return; } @@ -227,9 +264,21 @@ namespace Cielonos.MainGame.Effects.Feedback if (!_resolved) return; var instance = new VignetteShakeInstance( - feedbackContext, intensityCurve, modifyCenter, center, - modifyColors, colorOuter, colorInner, modifyShape, - smoothnessCurve, roundnessCurve + feedbackContext, + intensityCurve, + modifyCenter, + centerCurve, + center, + modifyColors, + colorOuter, + colorInner, + outColor, + innerColor, + modifyShape, + smoothnessCurve, + roundnessCurve, + smoothness, + roundness ); _activeShakes.Add(instance); } diff --git a/Assets/Scripts/MainGame/Managers/BattleManager/EnemySubmodule/EnemySubmodule.cs b/Assets/Scripts/MainGame/Managers/BattleManager/EnemySubmodule/EnemySubmodule.cs index 9178d0ba1..5ae1b0f30 100644 --- a/Assets/Scripts/MainGame/Managers/BattleManager/EnemySubmodule/EnemySubmodule.cs +++ b/Assets/Scripts/MainGame/Managers/BattleManager/EnemySubmodule/EnemySubmodule.cs @@ -79,6 +79,49 @@ namespace Cielonos.MainGame return enemiesInRadius; } + + /// + /// 获取所有可见敌人 + /// + public List GetVisibleEnemies(float radius = 50f) + { + List result = new List(); + List enemies = GetEnemiesInRadius(Player.transform.position, radius); + + foreach (CharacterBase enemy in enemies) + { + if (enemy == null || enemy.statusSm.isDead) continue; + + Vector3 screenPos = Player.viewSc.playerCamera.WorldToScreenPoint(enemy.centerPoint.position); + bool isInScreen = screenPos.z > 0 && + screenPos.x > 0 && screenPos.x < Screen.width && + screenPos.y > 0 && screenPos.y < Screen.height; + + if (isInScreen) + { + result.Add(enemy); + } + } + + return result; + } + + /// + /// 获取按屏幕X坐标从左到右排序的可见敌人列表 + /// + public List GetVisibleEnemiesSortedByScreenX(float radius = 50f) + { + List visibleEnemies = GetVisibleEnemies(radius); + + visibleEnemies.Sort((a, b) => + { + Vector3 screenA = Player.viewSc.playerCamera.WorldToScreenPoint(a.centerPoint.position); + Vector3 screenB = Player.viewSc.playerCamera.WorldToScreenPoint(b.centerPoint.position); + return screenA.x.CompareTo(screenB.x); + }); + + return visibleEnemies; + } } } } diff --git a/Assets/Scripts/SLSUtilities/Feedback/Base/CurveShakeAction.cs b/Assets/Scripts/SLSUtilities/Feedback/Base/CurveShakeAction.cs deleted file mode 100644 index c8148848a..000000000 --- a/Assets/Scripts/SLSUtilities/Feedback/Base/CurveShakeAction.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System; -using Sirenix.OdinInspector; -using UnityEngine; - -namespace SLSUtilities.Feedback -{ - /// - /// 通用的"按曲线震动数值"基类，提供曲线采样、初始值记录/复位等通用逻辑。 - /// RadialBlur、ChromaticAberration、Vignette 等后处理效果均继承此类。 - /// - [Serializable] - public abstract class CurveShakeAction : FeedbackActionBase - { - /// - /// 震动曲线，X 轴为归一化时间 [0,1]，Y 轴为震动强度 [0,1]。 - /// - [Title("Curve Shake")] - [LabelText("Shake Curve")] - [ShakeCurvePreset] - public AnimationCurve shakeCurve = new AnimationCurve( - new Keyframe(0f, 0f), - new Keyframe(0.5f, 1f), - new Keyframe(1f, 0f) - ); - - /// - /// 曲线值 0 对应的实际数值。 - /// - [LabelText("Remap Min")] - public float remapMin; - - /// - /// 曲线值 1 对应的实际数值。 - /// - [LabelText("Remap Max")] - public float remapMax = 1f; - - /// - /// 是否在初始值上叠加（而非替换）。 - /// - [LabelText("Relative to Initial")] - public bool relativeToInitial; - - - protected virtual float EvaluateShake(float normalizedTime, float initialValue) - { - return base.EvaluateShake(shakeCurve, remapMin, remapMax, relativeToInitial, normalizedTime, initialValue); - } - } -} diff --git a/Assets/Scripts/SLSUtilities/Feedback/Base/CurveShakeAction.cs.meta b/Assets/Scripts/SLSUtilities/Feedback/Base/CurveShakeAction.cs.meta deleted file mode 100644 index 53e926589..000000000 --- a/Assets/Scripts/SLSUtilities/Feedback/Base/CurveShakeAction.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 26b145321a43fe44d899db3f2178cb0e \ No newline at end of file diff --git a/Packages/com.bezi.sidekick/Editor/Plugins/BeziSidekickInternal.dll b/Packages/com.bezi.sidekick/Editor/Plugins/BeziSidekickInternal.dll index 863846f25..fb23843db 100644 Binary files a/Packages/com.bezi.sidekick/Editor/Plugins/BeziSidekickInternal.dll and b/Packages/com.bezi.sidekick/Editor/Plugins/BeziSidekickInternal.dll differ diff --git a/Packages/com.bezi.sidekick/package.json b/Packages/com.bezi.sidekick/package.json index 65c361939..701548f11 100644 --- a/Packages/com.bezi.sidekick/package.json +++ b/Packages/com.bezi.sidekick/package.json @@ -14,7 +14,7 @@ "bezi3d" ], "unity": "2018.3", - "version": "0.82.2", + "version": "0.84.5", "type": "library", "hideInEditor": false, "dependencies": { diff --git a/docs/Cielonos_3C任务清单.md b/docs/Cielonos_3C任务清单.md index b50cd8202..47e8570bd 100644 --- a/docs/Cielonos_3C任务清单.md +++ b/docs/Cielonos_3C任务清单.md @@ -43,24 +43,24 @@ #### P0 - 必须完成 -- [ ] **完善冲刺系统细节** +- [x] **完善冲刺系统细节** - [x] 冲刺时的角色朝向控制（朝向移动方向 vs 朝向相机方向） - [x] 冲刺速度曲线（启动快 → 维持 → 减速停止） - [x] 冲刺时是否允许视角旋转？ - [x] 冲刺动画根运动配置 -- [ ] **完善闪避系统细节** - - [ ] 闪避无敌帧的可视化表现（是否有特效？） - - [ ] 闪避时相机行为（锁定目标时闪避，相机如何处理？） +- [x] **完善闪避系统细节** + - [x] 闪避无敌帧的可视化表现（是否有特效？） + - [x] 闪避时相机行为（锁定目标时闪避，相机如何处理？） - [x] 闪避距离与动画的匹配 - [x] 空中闪避的特殊处理（空中冲刺？） #### P1 - 重要 -- [ ] **完善跳跃细节** - - [ ] 跳跃高度配置是否合理？ - - [ ] 跳跃时是否可以攻击/格挡？ - - [ ] 二段跳是否需要？（建议暂不加） - - [ ] 跳跃落地动画和过渡 +- [x] **完善跳跃细节** + - [x] 跳跃高度配置是否合理？ + - [x] 跳跃时是否可以攻击/格挡？ + - [x] 二段跳是否需要？（建议暂不加） + - [x] 跳跃落地动画和过渡 - [ ] **完善转身动画** - [ ] 快速转身动画（180度转身） - [ ] 移动方向变化时的转身过渡