diff --git a/game/Assets/GlobalPostFX.asset b/game/Assets/GlobalPostFX.asset new file mode 100644 index 0000000..32325d8 --- /dev/null +++ b/game/Assets/GlobalPostFX.asset @@ -0,0 +1,68 @@ +%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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: GlobalPostFX + m_EditorClassIdentifier: + components: + - {fileID: 3326040430117172722} +--- !u!114 &3326040430117172722 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 0b2db86121404754db890f4c8dfe81b2, type: 3} + m_Name: Bloom + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + threshold: + m_OverrideState: 1 + m_Value: 0.75 + min: 0 + intensity: + m_OverrideState: 1 + m_Value: 3 + min: 0 + scatter: + m_OverrideState: 0 + m_Value: 0.7 + min: 0 + max: 1 + clamp: + m_OverrideState: 0 + m_Value: 65472 + min: 0 + tint: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 0 + showAlpha: 0 + showEyeDropper: 1 + highQualityFiltering: + m_OverrideState: 0 + m_Value: 0 + skipIterations: + m_OverrideState: 0 + m_Value: 1 + min: 0 + max: 16 + dirtTexture: + m_OverrideState: 0 + m_Value: {fileID: 0} + dirtIntensity: + m_OverrideState: 0 + m_Value: 0 + min: 0 diff --git a/game/Assets/GlobalPostFX.asset.meta b/game/Assets/GlobalPostFX.asset.meta new file mode 100644 index 0000000..e239b73 --- /dev/null +++ b/game/Assets/GlobalPostFX.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1976f7f13f43a94ba645571327fd2a3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 896671c..48d5e2a 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -171,6 +171,8 @@ MonoBehaviour: frozenTime: {fileID: 11400000, guid: 19273ba4ac237ab4381926cfb195dda8, type: 2} _dialogueSystem: {fileID: 11400000, guid: 56369c4e83cc59e44bf55cd16fafc4e8, type: 2} _freezeFirstUseDialogueKey: SD_FREEZE_0 + _freezeVfx: {fileID: 0} + _freezeSfx: event:/Character/Freeze --- !u!114 &13726836969441780 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/game/Assets/Prefabs/PlayerObjects.prefab b/game/Assets/Prefabs/PlayerObjects.prefab index 4358313..961d413 100644 --- a/game/Assets/Prefabs/PlayerObjects.prefab +++ b/game/Assets/Prefabs/PlayerObjects.prefab @@ -1,5 +1,53 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &4143110979634702384 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1522223120797861211} + - component: {fileID: 4862929439482961144} + m_Layer: 0 + m_Name: GlobalPostFXProfile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1522223120797861211 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4143110979634702384} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4676633831414007565} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4862929439482961144 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4143110979634702384} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: 0 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: c1976f7f13f43a94ba645571327fd2a3, type: 2} --- !u!1 &4676633831414007564 GameObject: m_ObjectHideFlags: 0 @@ -29,9 +77,59 @@ Transform: m_Children: - {fileID: 4676633831945762709} - {fileID: 4676633831245457905} + - {fileID: 4125728165250223436} + - {fileID: 1522223120797861211} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &7557098150896029248 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4125728165250223436} + - component: {fileID: 2935471886766650937} + m_Layer: 0 + m_Name: TimeFreezePostFXProfile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &4125728165250223436 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7557098150896029248} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4676633831414007565} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2935471886766650937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7557098150896029248} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 172515602e62fb746b5d573b38a5fe58, type: 3} + m_Name: + m_EditorClassIdentifier: + isGlobal: 1 + priority: 1 + blendDistance: 0 + weight: 1 + sharedProfile: {fileID: 11400000, guid: b51a1959f8b8dd24d988111ac94ee301, type: 2} --- !u!1001 &1042476930221033419 PrefabInstance: m_ObjectHideFlags: 0 @@ -89,7 +187,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -1.1306057 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.y @@ -97,23 +195,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.z - value: -2.720001 + value: 0.92976403 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.9724168 + value: 0.24930546 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.2295565 + value: 0.058853067 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.040237267 + value: 0.9407765 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: -0.009498731 + value: -0.22208735 + objectReference: {fileID: 0} + - target: {fileID: 5661344207112327337, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} + propertyPath: m_RenderPostProcessing + value: 1 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.x @@ -129,19 +231,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.56752455 + value: 0.99914503 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.06285194 + value: -0.0000000018626449 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.7702346 + value: -0.036978554 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: -0.28408483 + value: 0.01848928 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.x @@ -157,23 +259,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.5675246 + value: 0.9991451 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.06285195 + value: -0.000000014901161 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.7702346 + value: -0.036978528 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: -0.28408486 + value: 0.018489283 objectReference: {fileID: 0} - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_XAxis.Value - value: 0 + value: 145.57664 + objectReference: {fileID: 0} + - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} + propertyPath: m_FollowOffset.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.z @@ -193,7 +299,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_XAxis.Value - value: 0 + value: 145.57664 + objectReference: {fileID: 0} + - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} + propertyPath: m_FollowOffset.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.z @@ -213,7 +323,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -1.1306057 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.y @@ -221,23 +331,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.z - value: -2.720001 + value: 0.92976403 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.5667831 + value: 0.24930546 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.06921981 + value: 0.058853067 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: -0.8148993 + value: 0.9407765 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: 0.099521644 + value: -0.22208735 objectReference: {fileID: 0} - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Follow @@ -247,6 +357,14 @@ PrefabInstance: propertyPath: m_LookAt value: objectReference: {fileID: 3150647428828152554} + - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} + propertyPath: m_XAxis.Value + value: 145.57664 + objectReference: {fileID: 0} + - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} + propertyPath: m_YAxis.Value + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_YAxis.m_InvertInput value: 1 @@ -269,23 +387,27 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.5333047 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.059062183 + value: -0.0000000018626449 objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.7917243 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: -0.29201087 + value: -0.0000000074505797 objectReference: {fileID: 0} - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_XAxis.Value - value: 0 + value: 145.57664 + objectReference: {fileID: 0} + - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} + propertyPath: m_FollowOffset.y + value: 1 objectReference: {fileID: 0} - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.z @@ -422,6 +544,10 @@ PrefabInstance: propertyPath: _camera value: objectReference: {fileID: 4676633831388223340} + - target: {fileID: 13726836969441783, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _freezeVfx + value: + objectReference: {fileID: 7557098150896029248} - target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} propertyPath: _freeze value: diff --git a/game/Assets/Scripts/Player/PlayerController.cs b/game/Assets/Scripts/Player/PlayerController.cs index 35621d4..5fa1792 100644 --- a/game/Assets/Scripts/Player/PlayerController.cs +++ b/game/Assets/Scripts/Player/PlayerController.cs @@ -89,6 +89,13 @@ public class PlayerController : MonoBehaviour [SerializeField] private string _freezeFirstUseDialogueKey; + [SerializeField] + private GameObject _freezeVfx; + + [SerializeField] + [FMODUnity.EventRef] + private string _freezeSfx; + private enum JumpState { None, @@ -103,6 +110,7 @@ public class PlayerController : MonoBehaviour private void Start() { + _freezeVfx.SetActive( false ); } private Color GetDebugColor() @@ -177,6 +185,8 @@ public class PlayerController : MonoBehaviour { _powers.Freeze.Consume(); objectTimeScale.Value = 0f; + _freezeVfx.SetActive( true ); + FMODUnity.RuntimeManager.PlayOneShot( _freezeSfx ); Debug.Log( "[PlayerController] time frozen" ); } @@ -184,6 +194,7 @@ public class PlayerController : MonoBehaviour { UnfreezeTime(); _dialogueSystem.PlayLine( _freezeFirstUseDialogueKey, true ); + _freezeVfx.SetActive( false ); Debug.Log( "[PlayerController] time unfrozen" ); } diff --git a/game/Assets/TimeFreezePostFXProfile.asset b/game/Assets/TimeFreezePostFXProfile.asset new file mode 100644 index 0000000..198990d --- /dev/null +++ b/game/Assets/TimeFreezePostFXProfile.asset @@ -0,0 +1,85 @@ +%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: d7fd9488000d3734a9e00ee676215985, type: 3} + m_Name: TimeFreezePostFXProfile + m_EditorClassIdentifier: + components: + - {fileID: 8601412692070546073} + - {fileID: 3711531227829446701} +--- !u!114 &3711531227829446701 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 66f335fb1ffd8684294ad653bf1c7564, type: 3} + m_Name: ColorAdjustments + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + postExposure: + m_OverrideState: 0 + m_Value: 0 + contrast: + m_OverrideState: 0 + m_Value: 0 + min: -100 + max: 100 + colorFilter: + m_OverrideState: 0 + m_Value: {r: 1, g: 1, b: 1, a: 1} + hdr: 1 + showAlpha: 0 + showEyeDropper: 1 + hueShift: + m_OverrideState: 0 + m_Value: 0 + min: -180 + max: 180 + saturation: + m_OverrideState: 1 + m_Value: -100 + min: -100 + max: 100 +--- !u!114 &8601412692070546073 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 29fa0085f50d5e54f8144f766051a691, type: 3} + m_Name: FilmGrain + m_EditorClassIdentifier: + active: 1 + m_AdvancedMode: 0 + type: + m_OverrideState: 1 + m_Value: 0 + intensity: + m_OverrideState: 1 + m_Value: 1 + min: 0 + max: 1 + response: + m_OverrideState: 0 + m_Value: 0.8 + min: 0 + max: 1 + texture: + m_OverrideState: 0 + m_Value: {fileID: 0} diff --git a/game/Assets/TimeFreezePostFXProfile.asset.meta b/game/Assets/TimeFreezePostFXProfile.asset.meta new file mode 100644 index 0000000..ba50c0f --- /dev/null +++ b/game/Assets/TimeFreezePostFXProfile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b51a1959f8b8dd24d988111ac94ee301 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: