From c10c5e1f4f1d7751cb2d2ca40f1f6054259ae42d Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 15:28:41 +0100 Subject: [PATCH 1/6] glove wip --- game/Assets/Materials/Glitch/Gauntlet_Mat.mat | 166 ++++++++++++++++++ .../Materials/Glitch/Gauntlet_Mat.mat.meta | 8 + game/Assets/Prefabs/Character/Gauntlet.prefab | 127 +++++++++++--- game/Assets/Prefabs/Player.prefab | 4 +- game/Assets/Scripts/Character/Glove.cs | 21 ++- 5 files changed, 297 insertions(+), 29 deletions(-) create mode 100644 game/Assets/Materials/Glitch/Gauntlet_Mat.mat create mode 100644 game/Assets/Materials/Glitch/Gauntlet_Mat.mat.meta diff --git a/game/Assets/Materials/Glitch/Gauntlet_Mat.mat b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat new file mode 100644 index 0000000..41ef5cc --- /dev/null +++ b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat @@ -0,0 +1,166 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Gauntler_Mat + m_Shader: {fileID: 4800000, guid: 91517451bf5416c44a73fd65d42c122a, type: 3} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 9790e688a544b39469364dfdde573e23, type: 3} + m_Scale: {x: 0.1, y: 0.05} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlitchMap: + m_Texture: {fileID: 8400000, guid: 643f93434e571d744a700fb58c7fd2c2, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _GlitchTex: + m_Texture: {fileID: 8400000, guid: 36a2435496603f54cb0ed075dccd1146, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NoiseMap: + m_Texture: {fileID: 2800000, guid: 3ec50f13c4e07da41b9ad1784c4c36a7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NoiseMap1: + m_Texture: {fileID: 2800000, guid: 3b377918b96ea6846ba47ed9f551c386, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NoiseMap2: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NoiseMap3: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _Alpha: 1 + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _C: 0 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _Distortion: 4.41 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _HorizontalScale: 0.1 + - _Intensity: 0.1 + - _M: 0.5 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _PulseIntensity: 1 + - _QueueOffset: 0 + - _RadiusWithDistance: 0.003 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SpeedMultiplier: 2 + - _SrcBlend: 1 + - _Surface: 0 + - _TrackWidth: 20 + - _TrailScatter: 0.1 + - _VertFloat: 0 + - _VertShake: 0.005 + - _VerticalScale: 10 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1.0556064, g: 1.0556064, b: 1.0556064, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color1: {r: 1, g: 1, b: 1, a: 1} + - _Color2: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _FarColor: {r: 1, g: 1, b: 1, a: 1} + - _GlitchColor: {r: 3.685864, g: 3.685864, b: 3.685864, a: 1} + - _NoiseColor: {r: 0.8861179, g: 1.2256676, b: 1.7270256, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] +--- !u!114 &3508380654290378483 +MonoBehaviour: + m_ObjectHideFlags: 11 + 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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 4 diff --git a/game/Assets/Materials/Glitch/Gauntlet_Mat.mat.meta b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat.meta new file mode 100644 index 0000000..0683e14 --- /dev/null +++ b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bf03fd6edc7ad60479bd07675e34fc18 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Character/Gauntlet.prefab b/game/Assets/Prefabs/Character/Gauntlet.prefab index 8301c92..9f8d105 100644 --- a/game/Assets/Prefabs/Character/Gauntlet.prefab +++ b/game/Assets/Prefabs/Character/Gauntlet.prefab @@ -31,6 +31,7 @@ Transform: - {fileID: 3693105673816541005} - {fileID: 8265753883645492107} - {fileID: 8151955929027432223} + - {fileID: 5095892781068191346} m_Father: {fileID: 2207546215893829416} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -61,13 +62,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2107647899858447059} - m_LocalRotation: {x: -0.000000029802319, y: 0.136777, z: -0.000000059604638, w: 0.99060184} - m_LocalPosition: {x: 0.070109, y: 0.22814, z: -0.019955} - m_LocalScale: {x: 0.03, y: 0.03, z: 0.03} + m_LocalRotation: {x: -0.01785308, y: 0.13560684, z: -0.1293001, w: 0.98212713} + m_LocalPosition: {x: 0.048407983, y: 0.1391711, z: -0.013962097} + m_LocalScale: {x: 0.0211272, y: 0.07702745, z: 0.0211272} m_Children: [] m_Father: {fileID: 8247244653362830090} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: -15} --- !u!33 &9149161017774705606 MeshFilter: m_ObjectHideFlags: 0 @@ -95,7 +96,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + - {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -256,7 +257,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &5067301821623896547 Transform: m_ObjectHideFlags: 0 @@ -265,8 +266,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3185822280257012079} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.1848982, z: 0} - m_LocalScale: {x: 0.11265, y: 0.11265, z: 0.11265} + m_LocalPosition: {x: 0, y: 0.027, z: -0} + m_LocalScale: {x: 0.094819754, y: 0.051408164, z: 0.094819754} m_Children: [] m_Father: {fileID: 8247244653362830090} m_RootOrder: 0 @@ -298,7 +299,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: 5d5260a94884a404ca29f832ae73dc0f, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -361,13 +362,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3723072566711940830} - m_LocalRotation: {x: -0.000000029802319, y: 0.136777, z: -0.000000059604638, w: 0.99060184} - m_LocalPosition: {x: -0.04747, y: 0.22814, z: -0.05863} - m_LocalScale: {x: 0.03, y: 0.03, z: 0.03} + m_LocalRotation: {x: -0.12929936, y: 0.1356068, z: 0.017852873, w: 0.98212725} + m_LocalPosition: {x: -0.034398675, y: 0.13916875, z: -0.041199625} + m_LocalScale: {x: 0.0211272, y: 0.07702745, z: 0.0211272} m_Children: [] m_Father: {fileID: 8247244653362830090} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: 0} + m_LocalEulerAnglesHint: {x: -15, y: 15.723, z: 0} --- !u!33 &7505306022685131981 MeshFilter: m_ObjectHideFlags: 0 @@ -395,7 +396,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + - {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -565,13 +566,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5907375344130546907} - m_LocalRotation: {x: -0.000000029802319, y: 0.136777, z: -0.000000059604638, w: 0.99060184} - m_LocalPosition: {x: -0.024515, y: 0.22814, z: 0.071295} - m_LocalScale: {x: 0.03, y: 0.03, z: 0.03} + m_LocalRotation: {x: 0.14589304, y: 0.11756973, z: 0.11049293, w: 0.9760553} + m_LocalPosition: {x: -0.018238256, y: 0.13920811, z: 0.050300192} + m_LocalScale: {x: 0.0211272, y: 0.07702745, z: 0.0211272} m_Children: [] m_Father: {fileID: 8247244653362830090} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: 0} + m_LocalEulerAnglesHint: {x: 15, y: 15.723, z: 15} --- !u!33 &8509043419303805045 MeshFilter: m_ObjectHideFlags: 0 @@ -599,7 +600,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + - {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -796,7 +797,7 @@ MonoBehaviour: _baseTrailTime: 0.01 _blinkTrailTime: 0.5 _pulseTime: 0.5 - _trailMat: {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + _trailMat: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} _emissionScale: 1.7 _rotationSpeed: 10 _scaleFactor: 2 @@ -856,3 +857,89 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1001 &5095892781068066034 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8247244653362830090} + m_Modifications: + - target: {fileID: 100000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_Name + value: Whiskey + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalScale.x + value: 5.8992977 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalScale.y + value: 5.8992977 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalScale.z + value: 3.8111777 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalPosition.y + value: 0.086 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalPosition.z + value: 0.007 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071066 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalRotation.x + value: 0.70710707 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalRotation.y + value: 0.0000000037252903 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalRotation.z + value: -0.00000023841858 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5d5260a94884a404ca29f832ae73dc0f, type: 2} + - target: {fileID: 2300000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} + - target: {fileID: 2300000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} +--- !u!4 &5095892781068191346 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 2076c098b5a774d40a4044023de8ff03, type: 3} + m_PrefabInstance: {fileID: 5095892781068066034} + m_PrefabAsset: {fileID: 0} diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 79dad97..d025d18 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -2970,7 +2970,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1063781060970015022, guid: a9c8794e9c88400488714f588a740912, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} propertyPath: m_RootOrder @@ -3098,7 +3098,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1063781060970015022, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} propertyPath: m_RootOrder diff --git a/game/Assets/Scripts/Character/Glove.cs b/game/Assets/Scripts/Character/Glove.cs index 402f98b..8517779 100644 --- a/game/Assets/Scripts/Character/Glove.cs +++ b/game/Assets/Scripts/Character/Glove.cs @@ -22,6 +22,9 @@ public class Glove : MonoBehaviour [SerializeField] private float _emissionScale; [SerializeField] private float _rotationSpeed; [SerializeField] private float _scaleFactor; + + [SerializeField] private Light _light; + [SerializeField] private float _lightIntensity; private const string EMISSION_COLOR = "_EmissionColor"; @@ -34,6 +37,8 @@ public class Glove : MonoBehaviour { trail.time = _baseTrailTime; } + + _lightIntensity = 0; } private void LateUpdate() @@ -52,12 +57,14 @@ public class Glove : MonoBehaviour trail.DOTime(_baseTrailTime, _pulseTime); } - var baseEmission = _trailMat.GetColor(EMISSION_COLOR); - var pulseEmission = baseEmission * _emissionScale; - foreach (var renderer in _renderers) - { - renderer.material.SetColor(EMISSION_COLOR, pulseEmission); - renderer.material.DOColor(baseEmission, _pulseTime); - } + _light.intensity = + + // var baseEmission = _trailMat.GetColor(EMISSION_COLOR); + // var pulseEmission = baseEmission * _emissionScale; + // foreach (var renderer in _renderers) + // { + // renderer.material.SetColor(EMISSION_COLOR, pulseEmission); + // renderer.material.DOColor(baseEmission, _pulseTime); + // } } } From 361f42cf8573658ccd37daa0649ce67ab17b8a92 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 17:00:10 +0100 Subject: [PATCH 2/6] gauntlet graphics --- game/Assets/Materials/Glitch/Gauntlet_Mat.mat | 8 +- .../Artefacts/Interactable Artefact.prefab | 129 ++++++++++- .../RotatableModels/Rotatable Gauntlet.prefab | 94 -------- .../Rotatable Gauntlets.prefab | 214 ++++++++++++++++++ ...b.meta => Rotatable Gauntlets.prefab.meta} | 0 game/Assets/Prefabs/Character/Gauntlet.prefab | 102 ++++++++- .../Environment/Entrance Courtyard.prefab | 93 ++++---- game/Assets/Prefabs/Player.prefab | 4 +- game/Assets/Scripts/Character/Glove.cs | 36 ++- game/Assets/Scripts/Character/Jetpack.cs | 4 - 10 files changed, 523 insertions(+), 161 deletions(-) delete mode 100644 game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlet.prefab create mode 100644 game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlets.prefab rename game/Assets/Prefabs/Artefacts/RotatableModels/{Rotatable Gauntlet.prefab.meta => Rotatable Gauntlets.prefab.meta} (100%) diff --git a/game/Assets/Materials/Glitch/Gauntlet_Mat.mat b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat index 41ef5cc..33502f1 100644 --- a/game/Assets/Materials/Glitch/Gauntlet_Mat.mat +++ b/game/Assets/Materials/Glitch/Gauntlet_Mat.mat @@ -7,7 +7,7 @@ Material: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Gauntler_Mat + m_Name: Gauntlet_Mat m_Shader: {fileID: 4800000, guid: 91517451bf5416c44a73fd65d42c122a, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 @@ -141,14 +141,14 @@ Material: - _WorkflowMode: 1 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1.0556064, g: 1.0556064, b: 1.0556064, a: 1} + - _BaseColor: {r: 0.5105276, g: 3.6995833, b: 3.732132, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1} - _Color1: {r: 1, g: 1, b: 1, a: 1} - _Color2: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FarColor: {r: 1, g: 1, b: 1, a: 1} - - _GlitchColor: {r: 3.685864, g: 3.685864, b: 3.685864, a: 1} - - _NoiseColor: {r: 0.8861179, g: 1.2256676, b: 1.7270256, a: 1} + - _GlitchColor: {r: 0.50964856, g: 0.50964856, b: 1.4716102, a: 1} + - _NoiseColor: {r: 2.1319108, g: 0.7347848, b: 2.5458739, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] --- !u!114 &3508380654290378483 diff --git a/game/Assets/Prefabs/Artefacts/Interactable Artefact.prefab b/game/Assets/Prefabs/Artefacts/Interactable Artefact.prefab index 0d5622b..b98c134 100644 --- a/game/Assets/Prefabs/Artefacts/Interactable Artefact.prefab +++ b/game/Assets/Prefabs/Artefacts/Interactable Artefact.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 2663749718261374877} - component: {fileID: 2205831332405259923} - component: {fileID: 8272008737841710381} + - component: {fileID: 3137964500676855713} + - component: {fileID: 5861567927629203306} m_Layer: 0 m_Name: Graphics m_TagString: Untagged @@ -27,7 +29,7 @@ Transform: m_GameObject: {fileID: 1085328826835407779} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.05, z: 0} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 8781564213167799764} m_RootOrder: 0 @@ -47,7 +49,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1085328826835407779} - m_Enabled: 1 + m_Enabled: 0 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -81,6 +83,35 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &3137964500676855713 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085328826835407779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a9f664d4cd388fb438941ca151bbc622, type: 3} + m_Name: + m_EditorClassIdentifier: + _amplitude: 0.1 + _period: 3 + _objectTimeScale: {fileID: 11400000, guid: 9b68e167db44c0c42837e9a679da964e, type: 2} +--- !u!114 &5861567927629203306 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1085328826835407779} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe9fcff09bb6ea845baf5463f932bdfc, type: 3} + m_Name: + m_EditorClassIdentifier: + _speed: 30 + _objectTimeScale: {fileID: 11400000, guid: 9b68e167db44c0c42837e9a679da964e, type: 2} --- !u!1 &3281773580780034656 GameObject: m_ObjectHideFlags: 0 @@ -343,6 +374,99 @@ MonoBehaviour: m_EditorClassIdentifier: _text: {fileID: 2658148745440365952} _settings: {fileID: 11400000, guid: 67880aab3a7f5124999fcef662a147f9, type: 2} +--- !u!1 &4910270315357509007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2712857469052559968} + - component: {fileID: 5450672671660040956} + m_Layer: 0 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2712857469052559968 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4910270315357509007} + 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: 8781564213167799764} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &5450672671660040956 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4910270315357509007} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 0.4575472, g: 1, b: 0.72054595, a: 1} + m_Intensity: 2 + m_Range: 2.068932 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.02 + m_NormalBias: 0.1 + m_NearPlane: 0.1 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!1 &8781564213167799763 GameObject: m_ObjectHideFlags: 0 @@ -376,6 +500,7 @@ Transform: m_Children: - {fileID: 2663749718261374877} - {fileID: 7585491580055765505} + - {fileID: 2712857469052559968} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlet.prefab b/game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlet.prefab deleted file mode 100644 index 9500e29..0000000 --- a/game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlet.prefab +++ /dev/null @@ -1,94 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &8373699106484481101 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2207546215893829416, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2330770998186251278, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - - target: {fileID: 3693105673816541005, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7732353603692170826, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_Name - value: Rotatable Gauntlet - objectReference: {fileID: 0} - - target: {fileID: 8151955929027432223, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8247244653362830090, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalScale.x - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8247244653362830090, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalScale.y - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8247244653362830090, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalScale.z - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 8265753883645492107, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8600842803555490644, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 2738204769564019577, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - - {fileID: 8600842803555490644, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - - {fileID: 2330770998186251278, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} - m_SourcePrefab: {fileID: 100100000, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} diff --git a/game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlets.prefab b/game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlets.prefab new file mode 100644 index 0000000..c856163 --- /dev/null +++ b/game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlets.prefab @@ -0,0 +1,214 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2268561156489339399 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7680780789262281573} + m_Layer: 0 + m_Name: Rotatable Gauntlets + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7680780789262281573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2268561156489339399} + 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: + - {fileID: 3212582501503551403} + - {fileID: 4400258493510484257} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &5061911569058095469 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7680780789262281573} + m_Modifications: + - target: {fileID: 1063781060970015022, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_Name + value: Right Gauntlet + objectReference: {fileID: 0} + - target: {fileID: 1356090819220159536, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4867712958837009437, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5031952623184638826, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6213226812257896476, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalPosition.x + value: -0.14649 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalPosition.y + value: -0.24192 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalPosition.z + value: -0.12336 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalRotation.w + value: 0.68301374 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalRotation.x + value: 0.6967876 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalRotation.y + value: -0.18301271 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalRotation.z + value: -0.12035638 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 65.2 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -95.2 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a9c8794e9c88400488714f588a740912, type: 3} +--- !u!4 &4400258493510484257 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + m_PrefabInstance: {fileID: 5061911569058095469} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6321431867034839015 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7680780789262281573} + m_Modifications: + - target: {fileID: 1063781060970015022, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_Name + value: Left Gauntlet + objectReference: {fileID: 0} + - target: {fileID: 1356090819220159536, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4867712958837009437, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5031952623184638826, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6213226812257896476, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalScale.x + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalScale.y + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalScale.z + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalPosition.x + value: 0.044589 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalPosition.y + value: 0.14612 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalPosition.z + value: -0.073391 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalRotation.w + value: 0.2053355 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalRotation.x + value: 0.766321 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalRotation.y + value: 0.15755932 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalRotation.z + value: -0.5880174 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 75 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} +--- !u!4 &3212582501503551403 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + m_PrefabInstance: {fileID: 6321431867034839015} + m_PrefabAsset: {fileID: 0} diff --git a/game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlet.prefab.meta b/game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlets.prefab.meta similarity index 100% rename from game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlet.prefab.meta rename to game/Assets/Prefabs/Artefacts/RotatableModels/Rotatable Gauntlets.prefab.meta diff --git a/game/Assets/Prefabs/Character/Gauntlet.prefab b/game/Assets/Prefabs/Character/Gauntlet.prefab index 9f8d105..4534f1b 100644 --- a/game/Assets/Prefabs/Character/Gauntlet.prefab +++ b/game/Assets/Prefabs/Character/Gauntlet.prefab @@ -152,7 +152,7 @@ TrailRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + - {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -452,7 +452,7 @@ TrailRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + - {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -539,6 +539,99 @@ TrailRenderer: m_MinVertexDistance: 0.1 m_Autodestruct: 0 m_Emitting: 1 +--- !u!1 &3725683341668642680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 503842861913541342} + - component: {fileID: 5122482949640438959} + m_Layer: 0 + m_Name: Point Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &503842861913541342 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3725683341668642680} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.254, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2207546215893829416} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!108 &5122482949640438959 +Light: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3725683341668642680} + m_Enabled: 1 + serializedVersion: 10 + m_Type: 2 + m_Shape: 0 + m_Color: {r: 0.7688679, g: 1, b: 0.99522805, a: 1} + m_Intensity: 10 + m_Range: 2.106225 + m_SpotAngle: 30 + m_InnerSpotAngle: 21.80208 + m_CookieSize: 10 + m_Shadows: + m_Type: 2 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.02 + m_NormalBias: 0.1 + m_NearPlane: 0.1 + m_CullingMatrixOverride: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_UseCullingMatrixOverride: 0 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingLayerMask: 1 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} + m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 + m_ShadowRadius: 0 + m_ShadowAngle: 0 --- !u!1 &5907375344130546907 GameObject: m_ObjectHideFlags: 0 @@ -656,7 +749,7 @@ TrailRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + - {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -774,6 +867,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 8247244653362830090} + - {fileID: 503842861913541342} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -801,6 +895,8 @@ MonoBehaviour: _emissionScale: 1.7 _rotationSpeed: 10 _scaleFactor: 2 + _light: {fileID: 5122482949640438959} + _lightIntensity: 2 --- !u!114 &8600842803555490644 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/game/Assets/Prefabs/Environment/Entrance Courtyard.prefab b/game/Assets/Prefabs/Environment/Entrance Courtyard.prefab index 196c523..1ca928b 100644 --- a/game/Assets/Prefabs/Environment/Entrance Courtyard.prefab +++ b/game/Assets/Prefabs/Environment/Entrance Courtyard.prefab @@ -9113,12 +9113,16 @@ PrefabInstance: m_Modifications: - target: {fileID: 1085328826835407779, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2663749718261374877, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} + - target: {fileID: 2712857469052559968, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} - target: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} propertyPath: _data value: @@ -9202,6 +9206,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 8781564213167799764, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} m_PrefabInstance: {fileID: 1200286581105989137} m_PrefabAsset: {fileID: 0} +--- !u!4 &3773959348850100620 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2663749718261374877, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} + m_PrefabInstance: {fileID: 1200286581105989137} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1218471747711341872 PrefabInstance: m_ObjectHideFlags: 0 @@ -21934,16 +21943,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} ---- !u!4 &4901695053869987412 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} - m_PrefabInstance: {fileID: 4867521290711912895} - m_PrefabAsset: {fileID: 0} --- !u!1 &5714365351979248878 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} m_PrefabInstance: {fileID: 4867521290711912895} m_PrefabAsset: {fileID: 0} +--- !u!4 &4901695053869987412 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} + m_PrefabInstance: {fileID: 4867521290711912895} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4868418979495535460 PrefabInstance: m_ObjectHideFlags: 0 @@ -23501,16 +23510,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} ---- !u!1 &4950793421291281714 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} - m_PrefabInstance: {fileID: 5221265929343950947} - m_PrefabAsset: {fileID: 0} --- !u!4 &5764344527067809672 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} m_PrefabInstance: {fileID: 5221265929343950947} m_PrefabAsset: {fileID: 0} +--- !u!1 &4950793421291281714 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} + m_PrefabInstance: {fileID: 5221265929343950947} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5277264246241915136 PrefabInstance: m_ObjectHideFlags: 0 @@ -23954,16 +23963,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} ---- !u!1 &5096583817215107330 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} - m_PrefabInstance: {fileID: 5367123261258816595} - m_PrefabAsset: {fileID: 0} --- !u!4 &5616379431387675576 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} m_PrefabInstance: {fileID: 5367123261258816595} m_PrefabAsset: {fileID: 0} +--- !u!1 &5096583817215107330 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} + m_PrefabInstance: {fileID: 5367123261258816595} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5416036975102281645 PrefabInstance: m_ObjectHideFlags: 0 @@ -27118,16 +27127,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} ---- !u!4 &6749182711502180107 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} - m_PrefabInstance: {fileID: 6495123699853093088} - m_PrefabAsset: {fileID: 0} --- !u!1 &6260629405915927985 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} m_PrefabInstance: {fileID: 6495123699853093088} m_PrefabAsset: {fileID: 0} +--- !u!4 &6749182711502180107 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 506f92c064b9c494f981ac4216e033a8, type: 3} + m_PrefabInstance: {fileID: 6495123699853093088} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6550963875953948711 PrefabInstance: m_ObjectHideFlags: 0 @@ -30311,16 +30320,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} ---- !u!4 &7114633281017947917 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} - m_PrefabInstance: {fileID: 7293289580210569446} - m_PrefabAsset: {fileID: 0} --- !u!1 &5374444887580352796 stripped GameObject: m_CorrespondingSourceObject: {fileID: -5790743888752385542, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} m_PrefabInstance: {fileID: 7293289580210569446} m_PrefabAsset: {fileID: 0} +--- !u!4 &7114633281017947917 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: a3cc3b952ba63484cbf7efb18af70b0f, type: 3} + m_PrefabInstance: {fileID: 7293289580210569446} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7315280040181829129 PrefabInstance: m_ObjectHideFlags: 0 @@ -31065,16 +31074,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} ---- !u!4 &6967373734275264301 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} - m_PrefabInstance: {fileID: 7438728335705786566} - m_PrefabAsset: {fileID: 0} --- !u!1 &7780748819392460183 stripped GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} m_PrefabInstance: {fileID: 7438728335705786566} m_PrefabAsset: {fileID: 0} +--- !u!4 &6967373734275264301 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} + m_PrefabInstance: {fileID: 7438728335705786566} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7450746473259321608 PrefabInstance: m_ObjectHideFlags: 0 @@ -32342,7 +32351,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7599301455519656901} + m_TransformParent: {fileID: 3773959348850100620} m_Modifications: - target: {fileID: 2268561156489339399, guid: c7ae319391a4a79449636a0cb3e70b3c, type: 3} propertyPath: m_Name @@ -32350,7 +32359,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7680780789262281573, guid: c7ae319391a4a79449636a0cb3e70b3c, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7680780789262281573, guid: c7ae319391a4a79449636a0cb3e70b3c, type: 3} propertyPath: m_LocalPosition.x @@ -32358,7 +32367,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7680780789262281573, guid: c7ae319391a4a79449636a0cb3e70b3c, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.171 objectReference: {fileID: 0} - target: {fileID: 7680780789262281573, guid: c7ae319391a4a79449636a0cb3e70b3c, type: 3} propertyPath: m_LocalPosition.z @@ -32370,15 +32379,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7680780789262281573, guid: c7ae319391a4a79449636a0cb3e70b3c, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7680780789262281573, guid: c7ae319391a4a79449636a0cb3e70b3c, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7680780789262281573, guid: c7ae319391a4a79449636a0cb3e70b3c, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7680780789262281573, guid: c7ae319391a4a79449636a0cb3e70b3c, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -36102,16 +36111,16 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} ---- !u!1 &8434256948172923267 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} - m_PrefabInstance: {fileID: 8776928328783928530} - m_PrefabAsset: {fileID: 0} --- !u!4 &9099330277805128505 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} m_PrefabInstance: {fileID: 8776928328783928530} m_PrefabAsset: {fileID: 0} +--- !u!1 &8434256948172923267 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: e73358a549de9664fa0a48ccdea07e1c, type: 3} + m_PrefabInstance: {fileID: 8776928328783928530} + m_PrefabAsset: {fileID: 0} --- !u!1001 &8830013183368797629 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 515edfe..e01856c 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -2971,7 +2971,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1063781060970015022, guid: a9c8794e9c88400488714f588a740912, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} propertyPath: m_RootOrder @@ -3099,7 +3099,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1063781060970015022, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} propertyPath: m_RootOrder diff --git a/game/Assets/Scripts/Character/Glove.cs b/game/Assets/Scripts/Character/Glove.cs index 8517779..cc5e4a8 100644 --- a/game/Assets/Scripts/Character/Glove.cs +++ b/game/Assets/Scripts/Character/Glove.cs @@ -5,6 +5,7 @@ using DG.Tweening; using NaughtyAttributes.Test; using TMPro; using UnityEngine; +using UnityEngine.Animations.Rigging; public class Glove : MonoBehaviour { @@ -38,7 +39,7 @@ public class Glove : MonoBehaviour trail.time = _baseTrailTime; } - _lightIntensity = 0; + _light.intensity = 0; } private void LateUpdate() @@ -48,6 +49,8 @@ public class Glove : MonoBehaviour public void Pulse() { + EnableTrails(); + _graphics.transform.localScale = Vector3.one * _scaleFactor; _graphics.DOScale(Vector3.one, _pulseTime); @@ -57,14 +60,27 @@ public class Glove : MonoBehaviour trail.DOTime(_baseTrailTime, _pulseTime); } - _light.intensity = - - // var baseEmission = _trailMat.GetColor(EMISSION_COLOR); - // var pulseEmission = baseEmission * _emissionScale; - // foreach (var renderer in _renderers) - // { - // renderer.material.SetColor(EMISSION_COLOR, pulseEmission); - // renderer.material.DOColor(baseEmission, _pulseTime); - // } + var t = 0f; + DOTween.To( + () => t, + _ => { }, + 1.0f, + _pulseTime) + .OnComplete(DisableTrails); + + _light.intensity = _lightIntensity; + _light.DOIntensity(0, _pulseTime); + } + + private void EnableTrails() => SetTrails(true); + private void DisableTrails() => SetTrails(false); + + private void SetTrails(bool state) + { + for (int i = 0; i < _trails.Length; i++) + { + _trails[i].Clear(); + _trails[i].enabled = state; + } } } diff --git a/game/Assets/Scripts/Character/Jetpack.cs b/game/Assets/Scripts/Character/Jetpack.cs index 8692f4c..5b88680 100644 --- a/game/Assets/Scripts/Character/Jetpack.cs +++ b/game/Assets/Scripts/Character/Jetpack.cs @@ -64,7 +64,6 @@ public class Jetpack : MonoBehaviour _trails[i].time = _baseTrailTimes[i]; _trails[i] .DOTime(0, _settings.pulseTime); - // .SetEase(_settings.trailTimeCurve); } var t = 0f; @@ -77,8 +76,5 @@ public class Jetpack : MonoBehaviour _light.intensity = _settings.lightIntensity; _light.DOIntensity(0, _settings.pulseTime); - - // var baseEmission = _settings.trailMat.GetColor(EMISSION_COLOR); - // var pulseEmission = baseEmission * _settings.emissionScale; } } \ No newline at end of file From 23e859fdc28c1f07ea33e38a68057ffe49cea849 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 17:02:49 +0100 Subject: [PATCH 3/6] add big killbox --- game/Assets/Scenes/Main.unity | 129 ++++++++++++++++++++++++++++------ 1 file changed, 109 insertions(+), 20 deletions(-) diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index cc03d02..7ad2b3b 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -435,7 +435,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2663749718261374877, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} propertyPath: m_RootOrder - value: 1 + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2712857469052559968, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} + propertyPath: m_RootOrder + value: 3 objectReference: {fileID: 0} - target: {fileID: 3201523991801391447, guid: b3a3678d38e60164dbd4f343e28f69e1, type: 3} propertyPath: _data @@ -610,7 +614,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3799998566341123779, guid: 321b94f09a638c448a2044ad0fa292f1, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 3799998566341123779, guid: 321b94f09a638c448a2044ad0fa292f1, type: 3} propertyPath: m_LocalPosition.x @@ -1439,6 +1443,79 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1001 &1813050608 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1235410945164343452, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_Name + value: The Big Kill + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_RootOrder + value: 14 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalScale.x + value: 896.1771 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalScale.z + value: 1053.7773 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalPosition.x + value: -134 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalPosition.y + value: -140 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalPosition.z + value: 88 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2384540058465011589, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4394339977511682008, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: _instakill + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7503837629980950041, guid: 356b55083085cda4c9f881946368d5bc, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 356b55083085cda4c9f881946368d5bc, type: 3} --- !u!1001 &1854234302 PrefabInstance: m_ObjectHideFlags: 0 @@ -1878,19 +1955,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.651364 + value: 0.6512384 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.74512863 + value: -0.74498504 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.12156138 + value: 0.122675456 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.075704075 + value: 0.07639784 objectReference: {fileID: 0} - target: {fileID: 4676633831388223330, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_RendererIndex @@ -1914,19 +1991,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.14673053 + value: -0.14763375 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.12058892 + value: 0.121331245 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.75850874 + value: 0.7583334 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.6233724 + value: 0.6232283 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -2054,11 +2131,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.021313503 + value: -0.02131344 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.00824248 + value: -0.008242454 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -2106,19 +2183,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.7171143 + value: 0.71708584 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.6945532 + value: -0.69452566 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.05144466 + value: 0.052049845 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.026389401 + value: 0.026699835 objectReference: {fileID: 0} - target: {fileID: 4676633833077728950, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_XAxis.Value @@ -2162,19 +2239,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.14673065 + value: -0.14763373 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.120589025 + value: 0.12133121 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.75850856 + value: 0.75833344 objectReference: {fileID: 0} - target: {fileID: 6640567037475532300, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.6233723 + value: 0.62322825 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} @@ -3493,6 +3570,18 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1509348081} m_Modifications: + - target: {fileID: 121166930054843997, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 121166930054843997, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 121166930054843997, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5390718527995891586, guid: 9f22fb9df8d3f4e4e8f715d8a548ffa0, type: 3} propertyPath: m_RootOrder value: 3 From 8cdbf48e53fcb6ecfc42cc1e2ee301bcb443a88b Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 17:09:56 +0100 Subject: [PATCH 4/6] 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 From 7a64f890c5f6d031c76f62fd75a93da5a3d11245 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 17:40:00 +0100 Subject: [PATCH 5/6] add time hat --- .../ArtefactObjects/Power/PA_Freeze.asset | 2 +- game/Assets/Data/Events/Found Freeze.asset | 15 + .../Data/Events/Found Freeze.asset.meta | 8 + .../Materials/Simple/Simple Transparent.mat | 34 +- game/Assets/Prefabs/Character/Time Hat.prefab | 304 ++++++++++++++++++ .../Prefabs/Character/Time Hat.prefab.meta | 7 + game/Assets/Prefabs/Player.prefab | 120 ++++++- game/Assets/Scripts/Character/TimeHat.cs | 44 +++ game/Assets/Scripts/Character/TimeHat.cs.meta | 11 + 9 files changed, 514 insertions(+), 31 deletions(-) create mode 100644 game/Assets/Data/Events/Found Freeze.asset create mode 100644 game/Assets/Data/Events/Found Freeze.asset.meta create mode 100644 game/Assets/Prefabs/Character/Time Hat.prefab create mode 100644 game/Assets/Prefabs/Character/Time Hat.prefab.meta create mode 100644 game/Assets/Scripts/Character/TimeHat.cs create mode 100644 game/Assets/Scripts/Character/TimeHat.cs.meta diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Freeze.asset b/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Freeze.asset index 43a4469..fe2dbb4 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Freeze.asset +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Freeze.asset @@ -17,5 +17,5 @@ MonoBehaviour: _descriptionKey: DESC_FREEZE _name: Freeze _prefab: {fileID: 3799998566341120319, guid: 321b94f09a638c448a2044ad0fa292f1, type: 3} - _onFound: {fileID: 0} + _onFound: {fileID: 11400000, guid: 5624ba2a0409d8245b485dc3f4d8b807, type: 2} _power: {fileID: 11400000, guid: 0cd9cf6494bb6f54d9b97631010d780e, type: 2} diff --git a/game/Assets/Data/Events/Found Freeze.asset b/game/Assets/Data/Events/Found Freeze.asset new file mode 100644 index 0000000..b3582b1 --- /dev/null +++ b/game/Assets/Data/Events/Found Freeze.asset @@ -0,0 +1,15 @@ +%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: 3a977303773797047b37664649362484, type: 3} + m_Name: Found Freeze + m_EditorClassIdentifier: + _logRaised: 0 diff --git a/game/Assets/Data/Events/Found Freeze.asset.meta b/game/Assets/Data/Events/Found Freeze.asset.meta new file mode 100644 index 0000000..fae6742 --- /dev/null +++ b/game/Assets/Data/Events/Found Freeze.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5624ba2a0409d8245b485dc3f4d8b807 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Materials/Simple/Simple Transparent.mat b/game/Assets/Materials/Simple/Simple Transparent.mat index 5963d98..37cfefd 100644 --- a/game/Assets/Materials/Simple/Simple Transparent.mat +++ b/game/Assets/Materials/Simple/Simple Transparent.mat @@ -8,14 +8,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Simple Transparent - m_Shader: {fileID: 10750, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: + m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} + m_ShaderKeywords: _ALPHATEST_ON m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent + disabledShaderPasses: + - SHADOWCASTER m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -24,7 +26,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 2800000, guid: fab85e0cacda9644a99e5182a86b71f5, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -44,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: 56a34508c5d13bc41945c6961739dcc4, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -76,19 +78,20 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} m_Floats: - - _AlphaClip: 0 + - _AlphaClip: 1 - _Blend: 0 - _BumpScale: 1 - _ClearCoatMask: 0 - _ClearCoatSmoothness: 0 - _Cull: 2 - - _Cutoff: 0.5 + - _Cutoff: 0 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 0 + - _DstBlend: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 + - _GlossinessSource: 0 - _GlossyReflections: 0 - _Metallic: 0 - _OcclusionStrength: 1 @@ -96,15 +99,18 @@ Material: - _QueueOffset: 0 - _ReceiveShadows: 1 - _SampleGI: 0 + - _Shininess: 0 - _Smoothness: 1 + - _SmoothnessSource: 0 - _SmoothnessTextureChannel: 1 + - _SpecSource: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _Surface: 0 + - _SrcBlend: 5 + - _Surface: 1 - _WorkflowMode: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.9716981, g: 0.8034816, b: 0.28875935, a: 1} + - _BaseColor: {r: 1, g: 1, b: 1, a: 0} - _Color: {r: 1, g: 0.8987622, b: 0.19215685, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} diff --git a/game/Assets/Prefabs/Character/Time Hat.prefab b/game/Assets/Prefabs/Character/Time Hat.prefab new file mode 100644 index 0000000..73ed1ee --- /dev/null +++ b/game/Assets/Prefabs/Character/Time Hat.prefab @@ -0,0 +1,304 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!95 &5228246278496071712 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6964855357421070179} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: cb11e96596a26454ebfacc4d64d7fc68, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &7430955781813958996 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4102077886778076298} + - component: {fileID: 161271564574031698} + - component: {fileID: 7610159371063739632} + - component: {fileID: 5955468169986969314} + m_Layer: 7 + m_Name: Time Hat + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4102077886778076298 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7430955781813958996} + 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: + - {fileID: 9024041447285529929} + - {fileID: 7774325281593982425} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &161271564574031698 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7430955781813958996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2948b341d27a8504398f082f85df758b, type: 3} + m_Name: + m_EditorClassIdentifier: + _freezeDuration: {fileID: 11400000, guid: 19273ba4ac237ab4381926cfb195dda8, type: 2} + _orbGraphics: {fileID: 7774325281593982425} + _animDuration: 0.3 +--- !u!114 &7610159371063739632 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7430955781813958996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3} + m_Name: + m_EditorClassIdentifier: + _event: {fileID: 11400000, guid: 6e31084a96bb93a44a85563a6208d0da, type: 2} + _response: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 161271564574031698} + m_TargetAssemblyTypeName: UnityEngine.MonoBehaviour, UnityEngine + m_MethodName: CancelInvoke + 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 &5955468169986969314 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7430955781813958996} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3} + m_Name: + m_EditorClassIdentifier: + _event: {fileID: 11400000, guid: 59d69c62286018b4ca2d89fa75d4c68a, type: 2} + _response: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 161271564574031698} + m_TargetAssemblyTypeName: TimeHat, Assembly-CSharp + m_MethodName: Trigger + 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!1001 &7811857329737046578 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4102077886778076298} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalScale.x + value: 0.6985896 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalScale.y + value: 0.6985896 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalScale.z + value: 0.6985896 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalPosition.x + value: -0.002 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalPosition.y + value: 0.105 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalPosition.z + value: 0.021 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -5117141298263055781, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} + - target: {fileID: 919132149155446097, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_Name + value: ORB_Low + objectReference: {fileID: 0} + - target: {fileID: 3530763462396548657, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: b53bf65897c597c4eba9c8888f1cfc10, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} +--- !u!1 &6964855357421070179 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + m_PrefabInstance: {fileID: 7811857329737046578} + m_PrefabAsset: {fileID: 0} +--- !u!4 &7774325281593982425 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 199d2370a6266f64587a1a9b8d2c337d, type: 3} + m_PrefabInstance: {fileID: 7811857329737046578} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9024041447285655497 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4102077886778076298} + m_Modifications: + - target: {fileID: 100000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_Name + value: safetygoggles_low + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalScale.x + value: 0.741004 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalScale.y + value: 0.64707446 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalScale.z + value: 0.83083475 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalPosition.y + value: 0.07860012 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalPosition.z + value: 0.078503266 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalRotation.w + value: 0.9992464 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalRotation.x + value: 0.038620193 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalRotation.y + value: 0.0016385611 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalRotation.z + value: -0.0035240585 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 4.427 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.173 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -0.397 + objectReference: {fileID: 0} + - target: {fileID: 2300000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 5d5260a94884a404ca29f832ae73dc0f, type: 2} + - target: {fileID: 2300000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} + - target: {fileID: 2300000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_Materials.Array.data[2] + value: + objectReference: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} + - target: {fileID: 2300000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + propertyPath: m_Materials.Array.data[3] + value: + objectReference: {fileID: 2100000, guid: bf03fd6edc7ad60479bd07675e34fc18, type: 2} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} +--- !u!4 &9024041447285529929 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 6296e48663fd7ad46b1a2af507f871cf, type: 3} + m_PrefabInstance: {fileID: 9024041447285655497} + m_PrefabAsset: {fileID: 0} diff --git a/game/Assets/Prefabs/Character/Time Hat.prefab.meta b/game/Assets/Prefabs/Character/Time Hat.prefab.meta new file mode 100644 index 0000000..01b988a --- /dev/null +++ b/game/Assets/Prefabs/Character/Time Hat.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 04503cf3076df70418e556785dc3677c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 6c7bc7b..1033062 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -445,18 +445,6 @@ MonoBehaviour: 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 @@ -541,6 +529,7 @@ GameObject: - component: {fileID: 13726837642651463} - component: {fileID: 3386527785285682116} - component: {fileID: 1922822437564541245} + - component: {fileID: 7227967597265107354} - component: {fileID: 1386167010841057469} m_Layer: 7 m_Name: Graphics @@ -683,6 +672,34 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 1 m_CallState: 2 +--- !u!114 &7227967597265107354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 13726837642651461} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3} + m_Name: + m_EditorClassIdentifier: + _event: {fileID: 11400000, guid: 5624ba2a0409d8245b485dc3f4d8b807, type: 2} + _response: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 4861701825881359288} + 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: 1 + m_CallState: 2 --- !u!114 &1386167010841057469 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1088,6 +1105,72 @@ Light: m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!1001 &2618899142363134700 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 654446260661958228} + m_Modifications: + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4102077886778076298, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7430955781813958996, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_Name + value: Time Hat + objectReference: {fileID: 0} + - target: {fileID: 7430955781813958996, guid: 04503cf3076df70418e556785dc3677c, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 04503cf3076df70418e556785dc3677c, type: 3} +--- !u!1 &4861701825881359288 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7430955781813958996, guid: 04503cf3076df70418e556785dc3677c, type: 3} + m_PrefabInstance: {fileID: 2618899142363134700} + m_PrefabAsset: {fileID: 0} --- !u!1001 &3425477616327879296 PrefabInstance: m_ObjectHideFlags: 0 @@ -2957,6 +3040,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3} +--- !u!4 &2883153423186464107 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3} + m_PrefabInstance: {fileID: 3425477616327879296} + m_PrefabAsset: {fileID: 0} --- !u!4 &101233846360686744 stripped Transform: m_CorrespondingSourceObject: {fileID: -5841702960688190952, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3} @@ -2967,9 +3055,9 @@ Transform: m_CorrespondingSourceObject: {fileID: 193541922877487131, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3} m_PrefabInstance: {fileID: 3425477616327879296} m_PrefabAsset: {fileID: 0} ---- !u!4 &867077028833665492 stripped +--- !u!4 &654446260661958228 stripped Transform: - m_CorrespondingSourceObject: {fileID: 2558541879051176788, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3} + m_CorrespondingSourceObject: {fileID: 2782295302538845396, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3} m_PrefabInstance: {fileID: 3425477616327879296} m_PrefabAsset: {fileID: 0} --- !u!1 &2542515566603360209 stripped @@ -2977,9 +3065,9 @@ GameObject: m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3} m_PrefabInstance: {fileID: 3425477616327879296} m_PrefabAsset: {fileID: 0} ---- !u!4 &2883153423186464107 stripped +--- !u!4 &867077028833665492 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3} + m_CorrespondingSourceObject: {fileID: 2558541879051176788, guid: dc837b43c4e9cd44d8b86fefed7e0f0e, type: 3} m_PrefabInstance: {fileID: 3425477616327879296} m_PrefabAsset: {fileID: 0} --- !u!1001 &5562922103527413356 diff --git a/game/Assets/Scripts/Character/TimeHat.cs b/game/Assets/Scripts/Character/TimeHat.cs new file mode 100644 index 0000000..ce43267 --- /dev/null +++ b/game/Assets/Scripts/Character/TimeHat.cs @@ -0,0 +1,44 @@ +using System.Collections; +using System.Collections.Generic; +using DG.Tweening; +using DG.Tweening.Core; +using Ktyl.Util; +using UnityEngine; + +public class TimeHat : MonoBehaviour +{ + [SerializeField] private SerialFloat _freezeDuration; + [SerializeField] private Transform _orbGraphics; + [SerializeField] private float _animDuration = 0.3f; + + private Vector3 _activeScale; + + // Start is called before the first frame update + void Start() + { + _activeScale = _orbGraphics.localScale; + _orbGraphics.localScale = Vector3.zero; + } + + public void Trigger() + { + _orbGraphics + .DOScale(_activeScale, _animDuration) + .SetEase(Ease.OutCirc); + + var t = 0f; + DOTween.To( + () => t, + _ => { }, + 1f, + _freezeDuration) + .OnComplete(Reset); + } + + public void Reset() + { + _orbGraphics + .DOScale(Vector3.one * Mathf.Epsilon, _animDuration) + .SetEase(Ease.InCirc); + } +} diff --git a/game/Assets/Scripts/Character/TimeHat.cs.meta b/game/Assets/Scripts/Character/TimeHat.cs.meta new file mode 100644 index 0000000..6626293 --- /dev/null +++ b/game/Assets/Scripts/Character/TimeHat.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2948b341d27a8504398f082f85df758b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From e39736c1e3c1f78e766184325e5649b4d9e37de2 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 18:34:22 +0100 Subject: [PATCH 6/6] tweak camera, shorten blink cooldown --- game/Assets/Prefabs/Cameras.prefab | 26 +++++++++---------- game/Assets/Prefabs/Player.prefab | 2 +- game/Assets/Prefabs/PlayerObjects.prefab | 12 --------- .../Assets/Settings/Player/Powers/Blink.asset | 2 +- 4 files changed, 15 insertions(+), 27 deletions(-) diff --git a/game/Assets/Prefabs/Cameras.prefab b/game/Assets/Prefabs/Cameras.prefab index bab13f0..e6780b7 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.0981706, y: -0.8403349, z: -0.5077412, w: 0.16247682} - m_LocalPosition: {x: 0.06260109, y: -1.2571502, z: 0.0135195255} + m_LocalRotation: {x: 0.0990501, y: 0.8400521, z: 0.5075704, w: -0.16393244} + m_LocalPosition: {x: 0.06260109, y: -1.2571499, z: 0.0135195255} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5661344206969957946} @@ -183,8 +183,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5661344207112327339} - 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_LocalRotation: {x: 0.0990501, y: 0.8400521, z: 0.5075704, w: -0.16393244} + m_LocalPosition: {x: 0.06260109, y: -1.2571499, z: 0.0135195255} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 5661344206969957946} @@ -541,7 +541,7 @@ MonoBehaviour: m_BindingMode: 4 m_FollowOffset: {x: 0, y: 0.5, z: -0.8} m_XDamping: 0.1 - m_YDamping: 0.1 + m_YDamping: 0.2 m_ZDamping: 0.1 m_AngularDampingMode: 0 m_PitchDamping: 0 @@ -667,7 +667,7 @@ MonoBehaviour: m_BindingMode: 4 m_FollowOffset: {x: 0, y: 0.5, z: -0.8} m_XDamping: 0.25 - m_YDamping: 0.5 + m_YDamping: 1 m_ZDamping: 0.25 m_AngularDampingMode: 0 m_PitchDamping: 0 @@ -762,8 +762,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5661344207789115490} - 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_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_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 5661344207439169721} @@ -1121,9 +1121,9 @@ MonoBehaviour: m_EditorClassIdentifier: m_BindingMode: 4 m_FollowOffset: {x: 0, y: 0.5, z: -0.8} - m_XDamping: 0.5 - m_YDamping: 0.5 - m_ZDamping: 0.5 + m_XDamping: 0.1 + m_YDamping: 1 + m_ZDamping: 0.1 m_AngularDampingMode: 0 m_PitchDamping: 0 m_YawDamping: 0 @@ -1177,8 +1177,8 @@ MonoBehaviour: m_LookaheadTime: 0 m_LookaheadSmoothing: 0 m_LookaheadIgnoreY: 1 - m_HorizontalDamping: 0.5 - m_VerticalDamping: 0.5 + m_HorizontalDamping: 0 + m_VerticalDamping: 2 m_ScreenX: 0.5 m_ScreenY: 0.34 m_DeadZoneWidth: 0 diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 1033062..ceca5fb 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -769,7 +769,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703779518772407877} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.8325, z: 0} + m_LocalPosition: {x: 0, y: 1.019, z: 0} m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: - {fileID: 1976486458447128171} diff --git a/game/Assets/Prefabs/PlayerObjects.prefab b/game/Assets/Prefabs/PlayerObjects.prefab index e237911..b767c8c 100644 --- a/game/Assets/Prefabs/PlayerObjects.prefab +++ b/game/Assets/Prefabs/PlayerObjects.prefab @@ -592,18 +592,6 @@ PrefabInstance: propertyPath: _freeze value: objectReference: {fileID: 11400000, guid: 0cd9cf6494bb6f54d9b97631010d780e, type: 2} - - target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: _cheatBlink - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - propertyPath: _cheatBoost - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 13726837176080779, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} - 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 diff --git a/game/Assets/Settings/Player/Powers/Blink.asset b/game/Assets/Settings/Player/Powers/Blink.asset index 971fb98..bb293bb 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: 1.5 + _regenerateTime: 0.5 _timeSinceConsume: 0 _onUnlock: m_PersistentCalls: