From 120e7574d0491fa5acd0240aabdd830d9b96e275 Mon Sep 17 00:00:00 2001 From: Cat Flynn Date: Fri, 16 Apr 2021 19:30:49 +0100 Subject: [PATCH] add gloves lol --- .../ArtefactObjects/Power/PA_Blink.asset | 1 + game/Assets/Data/Events/Found Blink.asset | 15 + .../Assets/Data/Events/Found Blink.asset.meta | 8 + game/Assets/Data/Events/Player Blink.asset | 15 + .../Data/Events/Player Blink.asset.meta | 8 + game/Assets/Data/Events/Player Boost.asset | 15 + .../Data/Events/Player Boost.asset.meta | 8 + game/Assets/Data/Events/Player Freeze.asset | 15 + .../Data/Events/Player Freeze.asset.meta | 8 + game/Assets/Materials/Trail_Mat.mat | 125 +++ game/Assets/Materials/Trail_Mat.mat.meta | 8 + game/Assets/Prefabs/Character.meta | 8 + game/Assets/Prefabs/Character/Gauntlet.prefab | 858 ++++++++++++++++++ .../Prefabs/Character/Gauntlet.prefab.meta | 7 + .../Prefabs/Character/Left Gauntlet.prefab | 59 ++ .../Character/Left Gauntlet.prefab.meta | 7 + .../Prefabs/Character/Right Gauntlet.prefab | 59 ++ .../Character/Right Gauntlet.prefab.meta | 7 + game/Assets/Prefabs/Player.prefab | 21 +- game/Assets/Prefabs/PlayerObjects.prefab | 262 +++++- game/Assets/Scenes/Main.unity | 50 +- game/Assets/Scripts/Artefacts/Artefact.cs | 4 + .../Scripts/Artefacts/ArtefactSystem.cs | 7 +- game/Assets/Scripts/Character.meta | 8 + game/Assets/Scripts/Character/Glove.cs | 62 ++ game/Assets/Scripts/Character/Glove.cs.meta | 11 + .../Assets/Scripts/Player/PlayerController.cs | 15 +- game/Assets/Scripts/Player/PlayerPower.cs | 8 +- .../Assets/Settings/Player/Powers/Blink.asset | 1 + .../Assets/Settings/Player/Powers/Boost.asset | 6 +- .../Settings/Player/Powers/Freeze.asset | 1 + 31 files changed, 1627 insertions(+), 60 deletions(-) create mode 100644 game/Assets/Data/Events/Found Blink.asset create mode 100644 game/Assets/Data/Events/Found Blink.asset.meta create mode 100644 game/Assets/Data/Events/Player Blink.asset create mode 100644 game/Assets/Data/Events/Player Blink.asset.meta create mode 100644 game/Assets/Data/Events/Player Boost.asset create mode 100644 game/Assets/Data/Events/Player Boost.asset.meta create mode 100644 game/Assets/Data/Events/Player Freeze.asset create mode 100644 game/Assets/Data/Events/Player Freeze.asset.meta create mode 100644 game/Assets/Materials/Trail_Mat.mat create mode 100644 game/Assets/Materials/Trail_Mat.mat.meta create mode 100644 game/Assets/Prefabs/Character.meta create mode 100644 game/Assets/Prefabs/Character/Gauntlet.prefab create mode 100644 game/Assets/Prefabs/Character/Gauntlet.prefab.meta create mode 100644 game/Assets/Prefabs/Character/Left Gauntlet.prefab create mode 100644 game/Assets/Prefabs/Character/Left Gauntlet.prefab.meta create mode 100644 game/Assets/Prefabs/Character/Right Gauntlet.prefab create mode 100644 game/Assets/Prefabs/Character/Right Gauntlet.prefab.meta create mode 100644 game/Assets/Scripts/Character.meta create mode 100644 game/Assets/Scripts/Character/Glove.cs create mode 100644 game/Assets/Scripts/Character/Glove.cs.meta diff --git a/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Blink.asset b/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Blink.asset index 57dd6b6..c51ee97 100644 --- a/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Blink.asset +++ b/game/Assets/Data/Artefacts/ArtefactObjects/Power/PA_Blink.asset @@ -17,4 +17,5 @@ MonoBehaviour: _descriptionKey: DESC_DASH _name: Blink _prefab: {fileID: 3799998566341120319, guid: e48f46564bce92e4aa707fd447afd68e, type: 3} + _onFound: {fileID: 11400000, guid: 252aca827f1c327478a5860598e5e3b3, type: 2} _power: {fileID: 11400000, guid: b47ea197a7cc2ed4eb15271cef672997, type: 2} diff --git a/game/Assets/Data/Events/Found Blink.asset b/game/Assets/Data/Events/Found Blink.asset new file mode 100644 index 0000000..a5841fe --- /dev/null +++ b/game/Assets/Data/Events/Found Blink.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 Blink + m_EditorClassIdentifier: + _logRaised: 0 diff --git a/game/Assets/Data/Events/Found Blink.asset.meta b/game/Assets/Data/Events/Found Blink.asset.meta new file mode 100644 index 0000000..f98fb78 --- /dev/null +++ b/game/Assets/Data/Events/Found Blink.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 252aca827f1c327478a5860598e5e3b3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Data/Events/Player Blink.asset b/game/Assets/Data/Events/Player Blink.asset new file mode 100644 index 0000000..8208ad2 --- /dev/null +++ b/game/Assets/Data/Events/Player Blink.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: Player Blink + m_EditorClassIdentifier: + _logRaised: 0 diff --git a/game/Assets/Data/Events/Player Blink.asset.meta b/game/Assets/Data/Events/Player Blink.asset.meta new file mode 100644 index 0000000..b84e6aa --- /dev/null +++ b/game/Assets/Data/Events/Player Blink.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5c6ce6fa194cce44180b50e30fda2fb7 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Data/Events/Player Boost.asset b/game/Assets/Data/Events/Player Boost.asset new file mode 100644 index 0000000..a8eaec8 --- /dev/null +++ b/game/Assets/Data/Events/Player Boost.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: Player Boost + m_EditorClassIdentifier: + _logRaised: 0 diff --git a/game/Assets/Data/Events/Player Boost.asset.meta b/game/Assets/Data/Events/Player Boost.asset.meta new file mode 100644 index 0000000..c209eb2 --- /dev/null +++ b/game/Assets/Data/Events/Player Boost.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 827596241b0a09040a751e15f1ea2505 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Data/Events/Player Freeze.asset b/game/Assets/Data/Events/Player Freeze.asset new file mode 100644 index 0000000..913f746 --- /dev/null +++ b/game/Assets/Data/Events/Player 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: Player Freeze + m_EditorClassIdentifier: + _logRaised: 0 diff --git a/game/Assets/Data/Events/Player Freeze.asset.meta b/game/Assets/Data/Events/Player Freeze.asset.meta new file mode 100644 index 0000000..4d17570 --- /dev/null +++ b/game/Assets/Data/Events/Player Freeze.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 59d69c62286018b4ca2d89fa75d4c68a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Materials/Trail_Mat.mat b/game/Assets/Materials/Trail_Mat.mat new file mode 100644 index 0000000..a292aea --- /dev/null +++ b/game/Assets/Materials/Trail_Mat.mat @@ -0,0 +1,125 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7541231776105923181 +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 +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Trail_Mat + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_ShaderKeywords: _EMISSION + m_LightmapFlags: 2 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: 2000 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + 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} + - _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} + - _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: + - _AlphaClip: 0 + - _Blend: 0 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _SampleGI: 0 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0.3160377, g: 0.8247926, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 2.297496, g: 1.91458, b: 1.3350315, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] diff --git a/game/Assets/Materials/Trail_Mat.mat.meta b/game/Assets/Materials/Trail_Mat.mat.meta new file mode 100644 index 0000000..838e127 --- /dev/null +++ b/game/Assets/Materials/Trail_Mat.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: a8667389c069f2644993fb7ee70b2323 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Character.meta b/game/Assets/Prefabs/Character.meta new file mode 100644 index 0000000..e41c8e6 --- /dev/null +++ b/game/Assets/Prefabs/Character.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: abd86e62e65d84a45b0ed996c514e963 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Character/Gauntlet.prefab b/game/Assets/Prefabs/Character/Gauntlet.prefab new file mode 100644 index 0000000..8301c92 --- /dev/null +++ b/game/Assets/Prefabs/Character/Gauntlet.prefab @@ -0,0 +1,858 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &960467832449231985 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8247244653362830090} + m_Layer: 0 + m_Name: Graphics + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8247244653362830090 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 960467832449231985} + 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: 5067301821623896547} + - {fileID: 3693105673816541005} + - {fileID: 8265753883645492107} + - {fileID: 8151955929027432223} + m_Father: {fileID: 2207546215893829416} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2107647899858447059 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3693105673816541005} + - component: {fileID: 9149161017774705606} + - component: {fileID: 2181970049369439321} + - component: {fileID: 4268100033894442180} + - component: {fileID: 2657311647892531251} + m_Layer: 0 + m_Name: Cylinder (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3693105673816541005 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + 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_Children: [] + m_Father: {fileID: 8247244653362830090} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: 0} +--- !u!33 &9149161017774705606 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107647899858447059} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2181970049369439321 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107647899858447059} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &4268100033894442180 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107647899858447059} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + m_Radius: 0.5000007 + m_Height: 2.0000007 + m_Direction: 1 + m_Center: {x: 0.000015318403, y: -0.0000010728836, z: -0.000022977603} +--- !u!96 &2657311647892531251 +TrailRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107647899858447059} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Time: 0.1 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_Autodestruct: 0 + m_Emitting: 1 +--- !u!1 &3185822280257012079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5067301821623896547} + - component: {fileID: 3007871140999451516} + - component: {fileID: 1876617401669176614} + - component: {fileID: 6665124798178824048} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &5067301821623896547 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + 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_Children: [] + m_Father: {fileID: 8247244653362830090} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3007871140999451516 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3185822280257012079} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &1876617401669176614 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3185822280257012079} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &6665124798178824048 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3185822280257012079} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + m_Radius: 0.5000007 + m_Height: 2.0000007 + m_Direction: 1 + m_Center: {x: 0.000015318403, y: -0.0000010728836, z: -0.000022977603} +--- !u!1 &3723072566711940830 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8265753883645492107} + - component: {fileID: 7505306022685131981} + - component: {fileID: 5227582081312772685} + - component: {fileID: 1727545191915507244} + - component: {fileID: 6766952637409606850} + m_Layer: 0 + m_Name: Cylinder (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8265753883645492107 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + 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_Children: [] + m_Father: {fileID: 8247244653362830090} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: 0} +--- !u!33 &7505306022685131981 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3723072566711940830} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5227582081312772685 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3723072566711940830} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &1727545191915507244 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3723072566711940830} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + m_Radius: 0.5000007 + m_Height: 2.0000007 + m_Direction: 1 + m_Center: {x: 0.000015318403, y: -0.0000010728836, z: -0.000022977603} +--- !u!96 &6766952637409606850 +TrailRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3723072566711940830} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Time: 0.1 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_Autodestruct: 0 + m_Emitting: 1 +--- !u!1 &5907375344130546907 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8151955929027432223} + - component: {fileID: 8509043419303805045} + - component: {fileID: 5486363646940048647} + - component: {fileID: 8909388975034620984} + - component: {fileID: 407237992747256252} + m_Layer: 0 + m_Name: Cylinder (3) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8151955929027432223 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + 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_Children: [] + m_Father: {fileID: 8247244653362830090} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 15.723, z: 0} +--- !u!33 &8509043419303805045 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5907375344130546907} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5486363646940048647 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5907375344130546907} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!136 &8909388975034620984 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5907375344130546907} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + m_Radius: 0.5000007 + m_Height: 2.0000007 + m_Direction: 1 + m_Center: {x: 0.000015318403, y: -0.0000010728836, z: -0.000022977603} +--- !u!96 &407237992747256252 +TrailRenderer: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5907375344130546907} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 0 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Time: 0.1 + m_Parameters: + serializedVersion: 3 + widthMultiplier: 0.1 + widthCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + colorGradient: + serializedVersion: 2 + key0: {r: 1, g: 1, b: 1, a: 1} + key1: {r: 1, g: 1, b: 1, a: 1} + key2: {r: 0, g: 0, b: 0, a: 0} + key3: {r: 0, g: 0, b: 0, a: 0} + key4: {r: 0, g: 0, b: 0, a: 0} + key5: {r: 0, g: 0, b: 0, a: 0} + key6: {r: 0, g: 0, b: 0, a: 0} + key7: {r: 0, g: 0, b: 0, a: 0} + ctime0: 0 + ctime1: 65535 + ctime2: 0 + ctime3: 0 + ctime4: 0 + ctime5: 0 + ctime6: 0 + ctime7: 0 + atime0: 0 + atime1: 65535 + atime2: 0 + atime3: 0 + atime4: 0 + atime5: 0 + atime6: 0 + atime7: 0 + m_Mode: 0 + m_NumColorKeys: 2 + m_NumAlphaKeys: 2 + numCornerVertices: 0 + numCapVertices: 0 + alignment: 0 + textureMode: 0 + shadowBias: 0.5 + generateLightingData: 0 + m_MinVertexDistance: 0.1 + m_Autodestruct: 0 + m_Emitting: 1 +--- !u!1 &7732353603692170826 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2207546215893829416} + - component: {fileID: 2738204769564019577} + - component: {fileID: 8600842803555490644} + - component: {fileID: 2330770998186251278} + m_Layer: 0 + m_Name: Gauntlet + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2207546215893829416 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7732353603692170826} + 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: 8247244653362830090} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &2738204769564019577 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7732353603692170826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 46543b5de3ffc3a448cb11dc2d3737af, type: 3} + m_Name: + m_EditorClassIdentifier: + _cylinders: + - {fileID: 2107647899858447059} + - {fileID: 3723072566711940830} + - {fileID: 5907375344130546907} + _graphics: {fileID: 8247244653362830090} + _baseTrailTime: 0.01 + _blinkTrailTime: 0.5 + _pulseTime: 0.5 + _trailMat: {fileID: 2100000, guid: a8667389c069f2644993fb7ee70b2323, type: 2} + _emissionScale: 1.7 + _rotationSpeed: 10 + _scaleFactor: 2 +--- !u!114 &8600842803555490644 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7732353603692170826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3} + m_Name: + m_EditorClassIdentifier: + _event: {fileID: 11400000, guid: 5c6ce6fa194cce44180b50e30fda2fb7, type: 2} + _response: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2738204769564019577} + m_TargetAssemblyTypeName: Glove, Assembly-CSharp + m_MethodName: Pulse + 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 &2330770998186251278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7732353603692170826} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0a5de09a27d949d4db67034f55c57e6b, type: 3} + m_Name: + m_EditorClassIdentifier: + _event: {fileID: 11400000, guid: 827596241b0a09040a751e15f1ea2505, type: 2} + _response: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 2738204769564019577} + m_TargetAssemblyTypeName: Glove, Assembly-CSharp + m_MethodName: Pulse + 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 diff --git a/game/Assets/Prefabs/Character/Gauntlet.prefab.meta b/game/Assets/Prefabs/Character/Gauntlet.prefab.meta new file mode 100644 index 0000000..8665477 --- /dev/null +++ b/game/Assets/Prefabs/Character/Gauntlet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 04c6b99008017d1499c540ae835a7d44 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Character/Left Gauntlet.prefab b/game/Assets/Prefabs/Character/Left Gauntlet.prefab new file mode 100644 index 0000000..556d63e --- /dev/null +++ b/game/Assets/Prefabs/Character/Left Gauntlet.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7317673880413235044 +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: 7732353603692170826, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} + propertyPath: m_Name + value: Left Gauntlet + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} diff --git a/game/Assets/Prefabs/Character/Left Gauntlet.prefab.meta b/game/Assets/Prefabs/Character/Left Gauntlet.prefab.meta new file mode 100644 index 0000000..23c2398 --- /dev/null +++ b/game/Assets/Prefabs/Character/Left Gauntlet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 58b8ba8df78b9ef41b76a0de13e24f81 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Character/Right Gauntlet.prefab b/game/Assets/Prefabs/Character/Right Gauntlet.prefab new file mode 100644 index 0000000..b62f6bf --- /dev/null +++ b/game/Assets/Prefabs/Character/Right Gauntlet.prefab @@ -0,0 +1,59 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &7317673880413235044 +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: 7732353603692170826, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} + propertyPath: m_Name + value: Gauntlet + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 04c6b99008017d1499c540ae835a7d44, type: 3} diff --git a/game/Assets/Prefabs/Character/Right Gauntlet.prefab.meta b/game/Assets/Prefabs/Character/Right Gauntlet.prefab.meta new file mode 100644 index 0000000..971cb58 --- /dev/null +++ b/game/Assets/Prefabs/Character/Right Gauntlet.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a9c8794e9c88400488714f588a740912 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Prefabs/Player.prefab b/game/Assets/Prefabs/Player.prefab index 48d5e2a..bb9c9fb 100644 --- a/game/Assets/Prefabs/Player.prefab +++ b/game/Assets/Prefabs/Player.prefab @@ -173,6 +173,8 @@ MonoBehaviour: _freezeFirstUseDialogueKey: SD_FREEZE_0 _freezeVfx: {fileID: 0} _freezeSfx: event:/Character/Freeze + _blinkSfx: event:/Character/Dash + _boostSfx: event:/Character/Jump --- !u!114 &13726836969441780 MonoBehaviour: m_ObjectHideFlags: 0 @@ -510,6 +512,7 @@ GameObject: - component: {fileID: 13726837642651460} - component: {fileID: 13726837642651462} - component: {fileID: 13726837642651463} + - component: {fileID: 3386527785285682116} m_Layer: 0 m_Name: Graphics m_TagString: Untagged @@ -526,7 +529,7 @@ Transform: m_GameObject: {fileID: 13726837642651461} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.7, y: 0.75, z: 0.7} + m_LocalScale: {x: 0.75, y: 0.75, z: 0.75} m_Children: - {fileID: 3910566560202895193} - {fileID: 13726836532781129} @@ -584,6 +587,22 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!114 &3386527785285682116 +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: 252aca827f1c327478a5860598e5e3b3, type: 2} + _response: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1703779518772407877 GameObject: m_ObjectHideFlags: 0 diff --git a/game/Assets/Prefabs/PlayerObjects.prefab b/game/Assets/Prefabs/PlayerObjects.prefab index 961d413..f0bda21 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: -1.1306057 + value: -1.610508 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.y - value: 0.25224686 + value: 0.2522471 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.z - value: 0.92976403 + value: 0.4658587 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.24930546 + value: 0.40279487 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.058853067 + value: 0.09508699 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.9407765 + value: 0.8859853 objectReference: {fileID: 0} - target: {fileID: 5661344207112327334, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: -0.22208735 + value: -0.20915283 objectReference: {fileID: 0} - target: {fileID: 5661344207112327337, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_RenderPostProcessing @@ -231,19 +231,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.99914503 + value: 0.03465778 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: -0.0000000018626449 + value: 0.0019043759 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: -0.036978554 + value: -0.9170633 objectReference: {fileID: 0} - target: {fileID: 5661344207311831624, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: 0.01848928 + value: 0.39722794 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.x @@ -259,23 +259,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.9991451 + value: 0.03465778 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: -0.000000014901161 + value: 0.0019043754 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: -0.036978528 + value: -0.9170634 objectReference: {fileID: 0} - target: {fileID: 5661344207439169721, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: 0.018489283 + value: 0.3972279 objectReference: {fileID: 0} - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_XAxis.Value - value: 145.57664 + value: 1.1270909 objectReference: {fileID: 0} - target: {fileID: 5661344207544240914, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.y @@ -299,7 +299,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_XAxis.Value - value: 145.57664 + value: 1.1270909 objectReference: {fileID: 0} - target: {fileID: 5661344207738413437, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.y @@ -323,31 +323,31 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.x - value: -1.1306057 + value: -0.039340973 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.y - value: 0.25224686 + value: 0.2522471 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalPosition.z - value: 0.92976403 + value: -2.719612 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 0.24930546 + value: 0.024490217 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: 0.058853067 + value: 0.0043788725 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: 0.9407765 + value: 0.98408383 objectReference: {fileID: 0} - target: {fileID: 5661344207789115488, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: -0.22208735 + value: -0.17595507 objectReference: {fileID: 0} - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_Follow @@ -359,7 +359,7 @@ PrefabInstance: objectReference: {fileID: 3150647428828152554} - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_XAxis.Value - value: 145.57664 + value: 1.1270909 objectReference: {fileID: 0} - target: {fileID: 5661344207789115489, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_YAxis.Value @@ -387,23 +387,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0.07588427 objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.x - value: -0.0000000018626449 + value: 0.004169687 objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: -0.91496253 objectReference: {fileID: 0} - target: {fileID: 5661344207849762652, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_LocalRotation.z - value: -0.0000000074505797 + value: 0.39631793 objectReference: {fileID: 0} - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_XAxis.Value - value: 145.57664 + value: 1.1270909 objectReference: {fileID: 0} - target: {fileID: 5661344208280186838, guid: dfbecbd9a563dba43be2d6139d9b3f90, type: 3} propertyPath: m_FollowOffset.y @@ -564,6 +564,66 @@ PrefabInstance: propertyPath: _cheatFreeze value: 1 objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_Target + value: + objectReference: {fileID: 7693506703464935808} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 7990277636321612895} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: SetActive + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[1].m_TargetAssemblyTypeName + value: UnityEngine.GameObject, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_BoolArgument + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} + - target: {fileID: 3386527785285682116, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + propertyPath: _response.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} --- !u!4 &4676633831945762709 stripped @@ -587,3 +647,145 @@ Transform: m_CorrespondingSourceObject: {fileID: 7741442472643640439, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} m_PrefabInstance: {fileID: 4672055586710847133} m_PrefabAsset: {fileID: 0} +--- !u!4 &7921934176054619142 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3253328343583707803, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + m_PrefabInstance: {fileID: 4672055586710847133} + m_PrefabAsset: {fileID: 0} +--- !u!4 &5538864848476004169 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 867077028833665492, guid: 5efe0b059275dbe48a4108d03ad03fd9, type: 3} + m_PrefabInstance: {fileID: 4672055586710847133} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6926646247454768497 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5538864848476004169} + m_Modifications: + - target: {fileID: 1063781060970015022, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_Name + value: Right Gauntlet + objectReference: {fileID: 0} + - target: {fileID: 1063781060970015022, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: a9c8794e9c88400488714f588a740912, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a9c8794e9c88400488714f588a740912, type: 3} +--- !u!1 &7990277636321612895 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1063781060970015022, guid: a9c8794e9c88400488714f588a740912, type: 3} + m_PrefabInstance: {fileID: 6926646247454768497} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7207901976564783278 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7921934176054619142} + m_Modifications: + - target: {fileID: 1063781060970015022, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_Name + value: Left Gauntlet + objectReference: {fileID: 0} + - target: {fileID: 1063781060970015022, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8876416787473981516, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + 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!1 &7693506703464935808 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 1063781060970015022, guid: 58b8ba8df78b9ef41b76a0de13e24f81, type: 3} + m_PrefabInstance: {fileID: 7207901976564783278} + m_PrefabAsset: {fileID: 0} diff --git a/game/Assets/Scenes/Main.unity b/game/Assets/Scenes/Main.unity index 3b08e00..aac0077 100644 --- a/game/Assets/Scenes/Main.unity +++ b/game/Assets/Scenes/Main.unity @@ -1329,23 +1329,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.70098007 + value: 0.9830573 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.17819461 + value: 0.17282492 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.6747036 + value: -0.05852907 objectReference: {fileID: 0} - target: {fileID: 4676633831318799747, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.14713539 + value: 0.017441768 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 1.3710289 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.y @@ -1353,23 +1353,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.z - value: -2.720001 + value: -2.1761167 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: 0.97241694 + value: 0.9187295 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.22955646 + value: 0.21688277 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.04023727 + value: -0.3211693 objectReference: {fileID: 0} - target: {fileID: 4676633831388223341, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: -0.009498729 + value: 0.07581783 objectReference: {fileID: 0} - target: {fileID: 4676633831414007564, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Name @@ -1445,19 +1445,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.70098007 + value: 0.9830573 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.17819461 + value: 0.1728249 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.6747036 + value: -0.05852904 objectReference: {fileID: 0} - target: {fileID: 4676633832789495666, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.14713539 + value: 0.017441774 + objectReference: {fileID: 0} + - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} + propertyPath: m_LocalPosition.x + value: 1.3710289 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.y @@ -1465,23 +1469,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.z - value: -2.720001 + value: -2.1761167 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.72316885 + value: 0.94872975 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: 0.012375506 + value: 0.05489656 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: 0.6904594 + value: -0.31076506 objectReference: {fileID: 0} - target: {fileID: 4676633832858914731, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.011815751 + value: 0.017981866 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalPosition.x @@ -1497,19 +1501,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.w - value: -0.6727108 + value: 0.98470366 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.x - value: -0.17100832 + value: 0.17311433 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.y - value: -0.70334256 + value: -0.018931627 objectReference: {fileID: 0} - target: {fileID: 4676633832928372887, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_LocalRotation.z - value: 0.15338081 + value: 0.0056416653 objectReference: {fileID: 0} - target: {fileID: 9122906920607805875, guid: 8a918f60d084fbe468bf3b2c0a14fb52, type: 3} propertyPath: m_Enabled diff --git a/game/Assets/Scripts/Artefacts/Artefact.cs b/game/Assets/Scripts/Artefacts/Artefact.cs index 07619c0..86ce0d0 100644 --- a/game/Assets/Scripts/Artefacts/Artefact.cs +++ b/game/Assets/Scripts/Artefacts/Artefact.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using Ktyl.Util; using UnityEngine; public class Artefact : ScriptableObject @@ -19,6 +20,9 @@ public class Artefact : ScriptableObject public GameObject Prefab => _prefab; [SerializeField] private GameObject _prefab; + public GameEvent OnFound => _onFound; + [SerializeField] private GameEvent _onFound; + public bool show => _show; private bool _show = false; public bool canInteract => _canInteract; diff --git a/game/Assets/Scripts/Artefacts/ArtefactSystem.cs b/game/Assets/Scripts/Artefacts/ArtefactSystem.cs index c30cae2..58be637 100644 --- a/game/Assets/Scripts/Artefacts/ArtefactSystem.cs +++ b/game/Assets/Scripts/Artefacts/ArtefactSystem.cs @@ -44,8 +44,11 @@ public class ArtefactSystem : ScriptableObject public void FindArtefact(Artefact artefact) { _inventory.addA(artefact); - - // _dialogue.PlayLine(artefact.dialogueKey); + + if (artefact.OnFound) + { + artefact.OnFound.Raise(); + } } private void OnDisable() diff --git a/game/Assets/Scripts/Character.meta b/game/Assets/Scripts/Character.meta new file mode 100644 index 0000000..dd3ff5d --- /dev/null +++ b/game/Assets/Scripts/Character.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7d3cea5f54be70e4daff082adc660eac +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Character/Glove.cs b/game/Assets/Scripts/Character/Glove.cs new file mode 100644 index 0000000..54a636a --- /dev/null +++ b/game/Assets/Scripts/Character/Glove.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using DG.Tweening; +using NaughtyAttributes.Test; +using UnityEngine; + +public class Glove : MonoBehaviour +{ + [SerializeField] private GameObject[] _cylinders; + [SerializeField] private Transform _graphics; + + private TrailRenderer[] _trails; + private Renderer[] _renderers; + + // TODO: refactor to settings object + [SerializeField] private float _baseTrailTime; + [SerializeField] private float _blinkTrailTime; + [SerializeField] private float _pulseTime; + [SerializeField] private Material _trailMat; + [SerializeField] private float _emissionScale; + [SerializeField] private float _rotationSpeed; + [SerializeField] private float _scaleFactor; + + private const string EMISSION_COLOR = "_EmissionColor"; + + private void Start() + { + _trails = GetComponentsInChildren(); + _renderers = GetComponentsInChildren(); + + foreach (var trail in _trails) + { + trail.time = _baseTrailTime; + } + } + + private void LateUpdate() + { + _graphics.Rotate(Vector3.up * (Time.deltaTime * _rotationSpeed)); + } + + public void Pulse() + { + _graphics.transform.localScale = Vector3.one * _scaleFactor; + _graphics.DOScale(Vector3.one, _pulseTime); + + foreach (var trail in _trails) + { + trail.time = _blinkTrailTime; + 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); + } + } +} diff --git a/game/Assets/Scripts/Character/Glove.cs.meta b/game/Assets/Scripts/Character/Glove.cs.meta new file mode 100644 index 0000000..94e17cb --- /dev/null +++ b/game/Assets/Scripts/Character/Glove.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 46543b5de3ffc3a448cb11dc2d3737af +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/game/Assets/Scripts/Player/PlayerController.cs b/game/Assets/Scripts/Player/PlayerController.cs index 5fa1792..b224a0c 100644 --- a/game/Assets/Scripts/Player/PlayerController.cs +++ b/game/Assets/Scripts/Player/PlayerController.cs @@ -3,6 +3,7 @@ using UnityEngine; using NaughtyAttributes; using Ktyl.Util; using System.Collections; +using FMODUnity; using UnityEngine.UI; public class PlayerController : MonoBehaviour @@ -96,6 +97,14 @@ public class PlayerController : MonoBehaviour [FMODUnity.EventRef] private string _freezeSfx; + [SerializeField] + [FMODUnity.EventRef] + private string _blinkSfx; + + [SerializeField] + [FMODUnity.EventRef] + private string _boostSfx; + private enum JumpState { None, @@ -175,6 +184,7 @@ public class PlayerController : MonoBehaviour Vector2 blinkDirection = Vector2.up.Rotate( -_lookAngle ); _overrideDelta += blinkDirection * _movementSettings.BlinkDistance; _surfVelocity += blinkDirection * _movementSettings.BlinkVelocity; + FMODUnity.RuntimeManager.PlayOneShot( _blinkSfx ); } } @@ -187,7 +197,6 @@ public class PlayerController : MonoBehaviour objectTimeScale.Value = 0f; _freezeVfx.SetActive( true ); FMODUnity.RuntimeManager.PlayOneShot( _freezeSfx ); - Debug.Log( "[PlayerController] time frozen" ); } if ( _powers.Freeze.timeSinceConsume > frozenTime && TimeIsFrozen ) @@ -195,7 +204,7 @@ public class PlayerController : MonoBehaviour UnfreezeTime(); _dialogueSystem.PlayLine( _freezeFirstUseDialogueKey, true ); _freezeVfx.SetActive( false ); - Debug.Log( "[PlayerController] time unfrozen" ); + // TODO: unfreeze sfx? } } @@ -249,6 +258,8 @@ public class PlayerController : MonoBehaviour { _yVelocity = _movementSettings.MinBoostVelocity; } + + RuntimeManager.PlayOneShot(_boostSfx); } break; diff --git a/game/Assets/Scripts/Player/PlayerPower.cs b/game/Assets/Scripts/Player/PlayerPower.cs index 3235e51..e83a5bc 100644 --- a/game/Assets/Scripts/Player/PlayerPower.cs +++ b/game/Assets/Scripts/Player/PlayerPower.cs @@ -1,6 +1,7 @@ using System; using System.Collections; using System.Collections.Generic; +using Ktyl.Util; using UnityEngine; using UnityEngine.Events; @@ -32,6 +33,8 @@ public class PlayerPower : ScriptableObject private UnityEvent _onUnlock = new UnityEvent(); public UnityEvent OnUnlock => _onUnlock; + [SerializeField] private GameEvent _onConsume; + public void UpdatePower( float deltaTime, bool cheat, bool grounded) { @@ -56,7 +59,10 @@ public class PlayerPower : ScriptableObject public bool CanConsume => IsUnlocked && !_consumed; public void Consume() - => _consumed = true; + { + _onConsume.Raise(); + _consumed = true; + } public void Reset() { diff --git a/game/Assets/Settings/Player/Powers/Blink.asset b/game/Assets/Settings/Player/Powers/Blink.asset index 5cd77ba..4b5e498 100644 --- a/game/Assets/Settings/Player/Powers/Blink.asset +++ b/game/Assets/Settings/Player/Powers/Blink.asset @@ -16,3 +16,4 @@ MonoBehaviour: _regenerateInAir: 0 _regenerateTime: 1.5 _timeSinceConsume: 0 + _onConsume: {fileID: 11400000, guid: 5c6ce6fa194cce44180b50e30fda2fb7, type: 2} diff --git a/game/Assets/Settings/Player/Powers/Boost.asset b/game/Assets/Settings/Player/Powers/Boost.asset index 0d97a68..5739776 100644 --- a/game/Assets/Settings/Player/Powers/Boost.asset +++ b/game/Assets/Settings/Player/Powers/Boost.asset @@ -12,4 +12,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 24d28ac60e22b5547b2beb8679625039, type: 3} m_Name: Boost m_EditorClassIdentifier: - _name: + _regenerateOnGround: 0 + _regenerateInAir: 0 + _regenerateTime: 0 + _timeSinceConsume: 0 + _onConsume: {fileID: 11400000, guid: 827596241b0a09040a751e15f1ea2505, type: 2} diff --git a/game/Assets/Settings/Player/Powers/Freeze.asset b/game/Assets/Settings/Player/Powers/Freeze.asset index ae6e1f5..0c2ffb9 100644 --- a/game/Assets/Settings/Player/Powers/Freeze.asset +++ b/game/Assets/Settings/Player/Powers/Freeze.asset @@ -16,3 +16,4 @@ MonoBehaviour: _regenerateInAir: 1 _regenerateTime: 7 _timeSinceConsume: 0 + _onConsume: {fileID: 11400000, guid: 59d69c62286018b4ca2d89fa75d4c68a, type: 2}