From 8cdbf48e53fcb6ecfc42cc1e2ee301bcb443a88b Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 17:09:56 +0100 Subject: [PATCH] reset freeze on respawn --- game/Assets/Prefabs/Player.prefab | 24 ++++++ game/Assets/Prefabs/PlayerObjects.prefab | 100 ++++++++++++++--------- 2 files changed, 84 insertions(+), 40 deletions(-) diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index e01856c..6c7bc7b 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -433,6 +433,30 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 + - m_Target: {fileID: 11400000, guid: 0cd9cf6494bb6f54d9b97631010d780e, type: 2} + m_TargetAssemblyTypeName: PlayerPower, Assembly-CSharp + m_MethodName: Reset + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 + - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + 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 &6606601648879830728 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/game/Assets/Prefabs/PlayerObjects.prefab b/game/Assets/Prefabs/PlayerObjects.prefab index 9c96da0..e237911 100644 --- a/game/Assets/Prefabs/PlayerObjects.prefab +++ b/game/Assets/Prefabs/PlayerObjects.prefab @@ -187,31 +187,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.x - value: 0.062641144 + value: 0.06260109 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.y - value: -1.2534504 + value: -2.557003 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.z - value: 0.014015436 + value: 0.0135195255 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: -0.16371952 + value: -0.14791036 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.098551676 + value: 0.12168522 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.8409651 + value: 0.7579489 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: 0.5062226 + value: 0.6235613 objectReference: {fileID: 0} - target: {fileID: 5661344207112327335, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: field of view @@ -231,19 +231,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: -0.07540581 + value: 0.9996923 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.01673803 + value: -0.016887024 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.60173976 + value: 0.003218867 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: 0.7949485 + value: 0.017884634 objectReference: {fileID: 0} - target: {fileID: 5661344207311831625, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Lens.FieldOfView @@ -263,19 +263,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.09022605 + value: 0.9743811 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.006206983 + value: 0.16833284 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.8013336 + value: -0.053382833 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: 0.59134185 + value: -0.13926911 objectReference: {fileID: 0} - target: {fileID: 5661344207439169722, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Lens.FieldOfView @@ -287,11 +287,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.y - value: -0.28594744 + value: -0.2896469 objectReference: {fileID: 0} - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.z - value: -0.7366835 + value: -0.73619026 objectReference: {fileID: 0} - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Heading.m_Definition @@ -307,11 +307,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.y - value: -0.28594744 + value: -0.2896469 objectReference: {fileID: 0} - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.z - value: -0.7366835 + value: -0.73619026 objectReference: {fileID: 0} - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Heading.m_Definition @@ -327,31 +327,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.x - value: 0.062641144 + value: 0.06260109 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.y - value: -1.2534505 + value: -1.2571499 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.z - value: 0.014015436 + value: 0.0135195255 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.9303057 + value: -0.14763373 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: -0.34192413 + value: 0.12133121 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.12458855 + value: 0.75833344 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: 0.04579122 + value: 0.62322825 objectReference: {fileID: 0} - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Follow @@ -367,7 +367,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_YAxis.Value - value: 0.10505016 + value: 0.10246912 objectReference: {fileID: 0} - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_YAxis.m_InvertInput @@ -391,19 +391,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.009159439 + value: 0.9954871 objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: -0.00057255855 + value: 0.06591591 objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.7200644 + value: -0.017622106 objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: 0.69384664 + value: -0.0659559 objectReference: {fileID: 0} - target: {fileID: 5661344207849762653, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Lens.FieldOfView @@ -415,11 +415,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.y - value: -0.28594744 + value: -0.2896469 objectReference: {fileID: 0} - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.z - value: -0.7366835 + value: -0.73619026 objectReference: {fileID: 0} - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Heading.m_Definition @@ -431,31 +431,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5935629646798842311, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.x - value: 0.062641144 + value: 0.06260109 objectReference: {fileID: 0} - target: {fileID: 5935629646798842311, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.y - value: -1.2534504 + value: -2.557003 objectReference: {fileID: 0} - target: {fileID: 5935629646798842311, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.z - value: 0.014015436 + value: 0.0135195255 objectReference: {fileID: 0} - target: {fileID: 5935629646798842311, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: -0.16371952 + value: -0.14791036 objectReference: {fileID: 0} - target: {fileID: 5935629646798842311, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.098551676 + value: 0.12168522 objectReference: {fileID: 0} - target: {fileID: 5935629646798842311, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.8409651 + value: 0.7579489 objectReference: {fileID: 0} - target: {fileID: 5935629646798842311, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: 0.5062226 + value: 0.6235613 objectReference: {fileID: 0} - target: {fileID: 8137033370021049976, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Enabled @@ -604,6 +604,26 @@ PrefabInstance: propertyPath: _cheatFreeze value: 1 objectReference: {fileID: 0} + - target: {fileID: 2167937473989734407, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[2].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2167937473989734407, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[2].m_Target + value: + objectReference: {fileID: 7557098150896029248} + - target: {fileID: 2167937473989734407, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 2167937473989734407, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[2].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 2167937473989734407, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[2].m_Arguments.m_BoolArgument + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8430385344820284919, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} propertyPath: m_IsActive value: 0