From fd78573ed892045dbe898b054ecd86a3f8ef616a Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 21:23:25 +0100 Subject: [PATCH] Revert "tweak camera, shorten blink cooldown" This reverts commit e39736c1e3c1f78e766184325e5649b4d9e37de2. --- game/Assets/Prefabs/Cameras.prefab | 88 +++++++++---------- .../Assets/Settings/Player/Powers/Blink.asset | 2 +- 2 files changed, 45 insertions(+), 45 deletions(-) diff --git a/game/Assets/Prefabs/Cameras.prefab b/game/Assets/Prefabs/Cameras.prefab index 9e30a28..67e4828 100644 --- a/game/Assets/Prefabs/Cameras.prefab +++ b/game/Assets/Prefabs/Cameras.prefab @@ -26,8 +26,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2832368838255871049} - m_LocalRotation: {x: -0.09905015, y: -0.84005195, z: -0.5075706, w: 0.16393241} - m_LocalPosition: {x: 0.06260109, y: -1.2571499, z: 0.0135195255} + m_LocalRotation: {x: -0.0981706, y: -0.8403349, z: -0.5077412, w: 0.16247682} + m_LocalPosition: {x: 0.06260109, y: -1.2571502, z: 0.0135195255} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5661344206969957946} @@ -169,8 +169,8 @@ GameObject: - component: {fileID: 5661344207112327338} - component: {fileID: 8137033370021049976} - component: {fileID: 8846952043387883595} - - component: {fileID: 1175171454053561621} - - component: {fileID: 2998986937065705781} + - component: {fileID: 5707948940269573497} + - component: {fileID: 7424358461934634355} m_Layer: 0 m_Name: Main_Camera m_TagString: MainCamera @@ -185,8 +185,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5661344207112327339} - m_LocalRotation: {x: -0.09905015, y: -0.84005195, z: -0.5075706, w: 0.16393241} - m_LocalPosition: {x: 0.06260109, y: -1.2571499, z: 0.0135195255} + m_LocalRotation: {x: -0.0981706, y: -0.8403349, z: -0.5077412, w: 0.16247682} + m_LocalPosition: {x: 0.06260109, y: -1.2571502, z: 0.0135195255} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5661344206969957946} @@ -336,35 +336,7 @@ MonoBehaviour: m_EditorClassIdentifier: attenuationObject: {fileID: 0} ListenerNumber: -1 ---- !u!114 &1175171454053561621 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5661344207112327339} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3} - m_Name: - m_EditorClassIdentifier: - _event: {fileID: 11400000, guid: 0fc36e00903fc7047b48bb1844e6f12b, type: 2} - _response: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 8137033370021049976} - m_TargetAssemblyTypeName: HideandLockCursor, Assembly-CSharp - m_MethodName: ShowCursor - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &2998986937065705781 +--- !u!114 &5707948940269573497 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -392,6 +364,34 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!114 &7424358461934634355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5661344207112327339} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3} + m_Name: + m_EditorClassIdentifier: + _event: {fileID: 11400000, guid: 0fc36e00903fc7047b48bb1844e6f12b, type: 2} + _response: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 8137033370021049976} + m_TargetAssemblyTypeName: HideandLockCursor, Assembly-CSharp + m_MethodName: ShowCursor + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1 &5661344207311831626 GameObject: m_ObjectHideFlags: 0 @@ -600,7 +600,7 @@ MonoBehaviour: m_BindingMode: 4 m_FollowOffset: {x: 0, y: 0.5, z: -0.8} m_XDamping: 0.1 - m_YDamping: 0.2 + m_YDamping: 0.1 m_ZDamping: 0.1 m_AngularDampingMode: 0 m_PitchDamping: 0 @@ -726,7 +726,7 @@ MonoBehaviour: m_BindingMode: 4 m_FollowOffset: {x: 0, y: 0.5, z: -0.8} m_XDamping: 0.25 - m_YDamping: 1 + m_YDamping: 0.5 m_ZDamping: 0.25 m_AngularDampingMode: 0 m_PitchDamping: 0 @@ -821,8 +821,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5661344207789115490} - m_LocalRotation: {x: 0.09905011, y: 0.8400521, z: 0.50757045, w: -0.16393244} - m_LocalPosition: {x: 0.06260109, y: -1.2571499, z: 0.0135195255} + m_LocalRotation: {x: 0.0981706, y: 0.8403349, z: 0.5077412, w: -0.16247682} + m_LocalPosition: {x: 0.06260109, y: -1.2571502, z: 0.0135195255} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5661344207439169721} @@ -1180,9 +1180,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_BindingMode: 4 m_FollowOffset: {x: 0, y: 0.5, z: -0.8} - m_XDamping: 0.1 - m_YDamping: 1 - m_ZDamping: 0.1 + m_XDamping: 0.5 + m_YDamping: 0.5 + m_ZDamping: 0.5 m_AngularDampingMode: 0 m_PitchDamping: 0 m_YawDamping: 0 @@ -1236,8 +1236,8 @@ MonoBehaviour: m_LookaheadTime: 0 m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 1 - m_HorizontalDamping: 0 - m_VerticalDamping: 2 + m_HorizontalDamping: 0.5 + m_VerticalDamping: 0.5 m_ScreenX: 0.5 m_ScreenY: 0.34 m_DeadZoneWidth: 0 diff --git a/game/Assets/Settings/Player/Powers/Blink.asset b/game/Assets/Settings/Player/Powers/Blink.asset index bb293bb..971fb98 100644 --- a/game/Assets/Settings/Player/Powers/Blink.asset +++ b/game/Assets/Settings/Player/Powers/Blink.asset @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: _regenerateOnGround: 1 _regenerateInAir: 0 - _regenerateTime: 0.5 + _regenerateTime: 1.5 _timeSinceConsume: 0 _onUnlock: m_PersistentCalls: