minor bugfixes

2021-03-09 14:24:31 +00:00 · 2021-03-09 14:24:31 +00:00 · 4c689e0561
parent 660569601d
commit 4c689e0561
5 changed files with 113 additions and 11 deletions
--- a/game/Assets/Prefabs/Player.prefab
+++ b/game/Assets/Prefabs/Player.prefab
@ -163,6 +163,7 @@ MonoBehaviour:
  _jumpColor: {r: 1, g: 0.95084643, b: 0, a: 0}
  _boostColor: {r: 1, g: 0, b: 0.9173207, a: 0}
  _exhaustedColor: {r: 1, g: 0, b: 0, a: 0}
+  playerTimeScale: {fileID: 0}
 --- !u!114 &13726836969441780
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -268,6 +269,22 @@ MonoBehaviour:
        m_CallState: 2
    m_ActionId: 0eb55067-1328-4b0a-9494-b427befe049a
    m_ActionName: CoreMap/New action
+  - m_PersistentCalls:
+      m_Calls:
+      - m_Target: {fileID: 13726836969441782}
+        m_TargetAssemblyTypeName: PlayerInputHandler, Assembly-CSharp
+        m_MethodName: Freeze
+        m_Mode: 0
+        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
+    m_ActionId: 29f1599e-fe43-47df-ad25-8e712263d0ab
+    m_ActionName: CoreMap/Freeze[/Keyboard/g]
  m_NeverAutoSwitchControlSchemes: 1
  m_DefaultControlScheme: Gamepad
  m_DefaultActionMap: CoreMap
@ -288,6 +305,7 @@ MonoBehaviour:
  _nearbyArtefactID: {fileID: 11400000, guid: caba70196fbb1c549a934f7566f7a247, type: 2}
  _inputSettings: {fileID: 11400000, guid: 09b165d6ce14f86459be7213da9688a7, type: 2}
  _camera: {fileID: 0}
+  playerTimeScale: {fileID: 0}
 --- !u!114 &13726837176080779
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -302,8 +320,10 @@ MonoBehaviour:
  m_EditorClassIdentifier: 
  _cheatBlink: 1
  _cheatBoost: 1
+  _cheatFreeze: 0
  _blink: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2}
  _boost: {fileID: 11400000, guid: d5ed942937d8cca478f3ec97f6b9c8a2, type: 2}
+  _freeze: {fileID: 0}
 --- !u!114 &3320306143821152633
 MonoBehaviour:
  m_ObjectHideFlags: 0
--- a/game/Assets/Prefabs/PlayerObjects.prefab
+++ b/game/Assets/Prefabs/PlayerObjects.prefab
@ -242,6 +242,18 @@ PrefabInstance:
      propertyPath: m_Camera
      value: 
      objectReference: {fileID: 4676633831388223340}
+    - target: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_ActionId
+      value: 0eb55067-1328-4b0a-9494-b427befe049a
+      objectReference: {fileID: 0}
+    - target: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_ActionName
+      value: CoreMap/New action
+      objectReference: {fileID: 0}
+    - target: {fileID: 13726836969441780, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: Blink
+      objectReference: {fileID: 0}
    - target: {fileID: 13726836969441781, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
      propertyPath: m_Name
      value: Player
@ -250,6 +262,10 @@ PrefabInstance:
      propertyPath: _camera
      value: 
      objectReference: {fileID: 4676633831388223340}
+    - target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
+      propertyPath: _freeze
+      value: 
+      objectReference: {fileID: 11400000, guid: 0cd9cf6494bb6f54d9b97631010d780e, type: 2}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3}
 --- !u!4 &4676633831945762709 stripped
--- a/game/Assets/Scenes/Main.unity
+++ b/game/Assets/Scenes/Main.unity
@ -2544,6 +2544,10 @@ PrefabInstance:
      propertyPath: m_LocalRotation.z
      value: 0.009297717
      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831388223329, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_IgnoreTimeScale
+      value: 1
+      objectReference: {fileID: 0}
    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalPosition.x
      value: 0
@ -2558,19 +2562,19 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.9663801
+      value: 0.9680315
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.24613053
+      value: 0.24655113
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.07205816
+      value: 0.044697873
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.018352732
+      value: -0.011384248
      objectReference: {fileID: 0}
    - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_Name
@ -2644,6 +2648,46 @@ PrefabInstance:
      propertyPath: m_DefaultControlScheme
      value: PCMR
      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.size
+      value: 6
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_ActionId
+      value: 29f1599e-fe43-47df-ad25-8e712263d0ab
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_ActionName
+      value: CoreMap/Freeze[/Keyboard/g]
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Target
+      value: 
+      objectReference: {fileID: 1239556280}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
+      value: Freeze
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
+      value: PlayerInputHandler, Assembly-CSharp
+      objectReference: {fileID: 0}
+    - target: {fileID: 4676633831945762665, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+      propertyPath: m_ActionEvents.Array.data[5].m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
+      value: UnityEngine.Object, UnityEngine
+      objectReference: {fileID: 0}
    - target: {fileID: 4676633831945762666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: playerTimeScale
      value: 
@ -2682,11 +2726,11 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0.017264389
+      value: -0.017264403
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.z
-      value: 0.009297717
+      value: 0.009297725
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832858914730, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_XAxis.m_InvertInput
@ -2722,19 +2766,19 @@ PrefabInstance:
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.w
-      value: 0.9984866
+      value: 0.9996367
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.x
-      value: 0.0047656302
+      value: 0.0047710985
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.y
-      value: 0.048239034
+      value: 0.023356276
      objectReference: {fileID: 0}
    - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0.02597908
+      value: -0.012578499
      objectReference: {fileID: 0}
    m_RemovedComponents: []
  m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
@ -4426,6 +4470,17 @@ GameObject:
  m_CorrespondingSourceObject: {fileID: 4676633831945762664, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
  m_PrefabInstance: {fileID: 782933553}
  m_PrefabAsset: {fileID: 0}
+--- !u!114 &1239556280 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 4676633831945762667, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3}
+  m_PrefabInstance: {fileID: 782933553}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1239556274}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e12816fc78a8ca3429be019aa4e51fdd, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &1241011629 stripped
 GameObject:
  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 803c82d4ce9f809448a55cba1adec183, type: 3}
--- a/game/Assets/Scripts/Player/PlayerPowers.cs
+++ b/game/Assets/Scripts/Player/PlayerPowers.cs
@ -33,6 +33,6 @@ public class PlayerPowers : MonoBehaviour
    {
        _blink.UpdatePower( dt, _cheatBlink, grounded );
        _boost.UpdatePower( dt, _cheatBoost, grounded );
-        _boost.UpdatePower(dt, _cheatFreeze, grounded);
+        _freeze.UpdatePower(dt, _cheatFreeze, grounded);
    }
 }
--- a/game/Assets/Settings/Input/PlayerControls.inputactions
+++ b/game/Assets/Settings/Input/PlayerControls.inputactions
@ -219,6 +219,17 @@
                    "action": "Freeze",
                    "isComposite": false,
                    "isPartOfComposite": false
+                },
+                {
+                    "name": "",
+                    "id": "6774e0ae-b8a1-4146-b779-01bbab6de14b",
+                    "path": "<Gamepad>/buttonEast",
+                    "interactions": "",
+                    "processors": "",
+                    "groups": "Gamepad",
+                    "action": "Freeze",
+                    "isComposite": false,
+                    "isPartOfComposite": false
                }
            ]
        }