From 361f42cf8573658ccd37daa0649ce67ab17b8a92 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Tue, 18 May 2021 17:00:10 +0100 Subject: [PATCH] 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