diff --git a/Assets/AudioResources/Sounds/Cast_01.wav b/Assets/AudioResources/Sounds/Cast_01.wav new file mode 100644 index 0000000..8199ded Binary files /dev/null and b/Assets/AudioResources/Sounds/Cast_01.wav differ diff --git a/Assets/AudioResources/Sounds/Cast_01.wav.meta b/Assets/AudioResources/Sounds/Cast_01.wav.meta new file mode 100644 index 0000000..374f48d --- /dev/null +++ b/Assets/AudioResources/Sounds/Cast_01.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: bb51447f4816c95409a0f2dd1a20e638 +AudioImporter: + externalObjects: {} + serializedVersion: 7 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Input System Settings/InputActionMaps.cs b/Assets/Input System Settings/InputActionMaps.cs index d50df3f..ad1bb17 100644 --- a/Assets/Input System Settings/InputActionMaps.cs +++ b/Assets/Input System Settings/InputActionMaps.cs @@ -53,6 +53,15 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""Shoot"", + ""type"": ""Button"", + ""id"": ""d2070b4c-2bfe-4b1a-9260-1cfbce317861"", + ""expectedControlType"": ""Button"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -396,6 +405,50 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable ""action"": ""Boost"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""f46691e1-e16e-4ca5-a94c-fa41f534d749"", + ""path"": ""/buttonNorth"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Controller"", + ""action"": ""Shoot"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""406fad1c-4e5c-47a1-86e1-db5d1b56bf73"", + ""path"": ""/rightShoulder"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Controller"", + ""action"": ""Shoot"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""c6f516d9-eedf-41d4-81a7-ac2f5d281d32"", + ""path"": ""/period"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Keyboard 1"", + ""action"": ""Shoot"", + ""isComposite"": false, + ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""97bcf6d3-3c3a-492a-b1d6-7ff65d6ebecc"", + ""path"": ""/space"", + ""interactions"": """", + ""processors"": """", + ""groups"": ""Keyboard 2"", + ""action"": ""Shoot"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] }, @@ -547,6 +600,7 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable m_Player_Thrust = m_Player.FindAction("Thrust", throwIfNotFound: true); m_Player_Steer = m_Player.FindAction("Steer", throwIfNotFound: true); m_Player_Boost = m_Player.FindAction("Boost", throwIfNotFound: true); + m_Player_Shoot = m_Player.FindAction("Shoot", throwIfNotFound: true); // Meta m_Meta = asset.FindActionMap("Meta", throwIfNotFound: true); m_Meta_Start = m_Meta.FindAction("Start", throwIfNotFound: true); @@ -616,6 +670,7 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable private readonly InputAction m_Player_Thrust; private readonly InputAction m_Player_Steer; private readonly InputAction m_Player_Boost; + private readonly InputAction m_Player_Shoot; public struct PlayerActions { private @InputActionMaps m_Wrapper; @@ -623,6 +678,7 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable public InputAction @Thrust => m_Wrapper.m_Player_Thrust; public InputAction @Steer => m_Wrapper.m_Player_Steer; public InputAction @Boost => m_Wrapper.m_Player_Boost; + public InputAction @Shoot => m_Wrapper.m_Player_Shoot; public InputActionMap Get() { return m_Wrapper.m_Player; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -641,6 +697,9 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable @Boost.started += instance.OnBoost; @Boost.performed += instance.OnBoost; @Boost.canceled += instance.OnBoost; + @Shoot.started += instance.OnShoot; + @Shoot.performed += instance.OnShoot; + @Shoot.canceled += instance.OnShoot; } private void UnregisterCallbacks(IPlayerActions instance) @@ -654,6 +713,9 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable @Boost.started -= instance.OnBoost; @Boost.performed -= instance.OnBoost; @Boost.canceled -= instance.OnBoost; + @Shoot.started -= instance.OnShoot; + @Shoot.performed -= instance.OnShoot; + @Shoot.canceled -= instance.OnShoot; } public void RemoveCallbacks(IPlayerActions instance) @@ -774,6 +836,7 @@ public partial class @InputActionMaps: IInputActionCollection2, IDisposable void OnThrust(InputAction.CallbackContext context); void OnSteer(InputAction.CallbackContext context); void OnBoost(InputAction.CallbackContext context); + void OnShoot(InputAction.CallbackContext context); } public interface IMetaActions { diff --git a/Assets/Input System Settings/InputActionMaps.inputactions b/Assets/Input System Settings/InputActionMaps.inputactions index 130959e..1316187 100644 --- a/Assets/Input System Settings/InputActionMaps.inputactions +++ b/Assets/Input System Settings/InputActionMaps.inputactions @@ -31,6 +31,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Shoot", + "type": "Button", + "id": "d2070b4c-2bfe-4b1a-9260-1cfbce317861", + "expectedControlType": "Button", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -374,6 +383,50 @@ "action": "Boost", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "f46691e1-e16e-4ca5-a94c-fa41f534d749", + "path": "/buttonNorth", + "interactions": "", + "processors": "", + "groups": "Controller", + "action": "Shoot", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "406fad1c-4e5c-47a1-86e1-db5d1b56bf73", + "path": "/rightShoulder", + "interactions": "", + "processors": "", + "groups": "Controller", + "action": "Shoot", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "c6f516d9-eedf-41d4-81a7-ac2f5d281d32", + "path": "/period", + "interactions": "", + "processors": "", + "groups": "Keyboard 1", + "action": "Shoot", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "97bcf6d3-3c3a-492a-b1d6-7ff65d6ebecc", + "path": "/space", + "interactions": "", + "processors": "", + "groups": "Keyboard 2", + "action": "Shoot", + "isComposite": false, + "isPartOfComposite": false } ] }, diff --git a/Assets/Prefabs/Audio/Target Hit.prefab b/Assets/Prefabs/Audio/Target Hit.prefab new file mode 100644 index 0000000..6517159 --- /dev/null +++ b/Assets/Prefabs/Audio/Target Hit.prefab @@ -0,0 +1,173 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4479628772504131522 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6423719894035945655} + - component: {fileID: 3310727599597512245} + - component: {fileID: 7696877450501702533} + - component: {fileID: 6298175476027011211} + m_Layer: 0 + m_Name: Target Hit + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6423719894035945655 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4479628772504131522} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3310727599597512245 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4479628772504131522} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 887650ff1f3850a43aa8d1281fc70528, type: 3} + m_Name: + m_EditorClassIdentifier: + id: 1 + audioTag: target_hit + pitchRange: 0.3 + volumeRange: 0.3 +--- !u!82 &7696877450501702533 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4479628772504131522} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: bb51447f4816c95409a0f2dd1a20e638, type: 3} + m_PlayOnAwake: 1 + m_Volume: 0.15 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 0 + MinDistance: 1 + MaxDistance: 100 + Pan2D: 0 + rolloffMode: 1 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + 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.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 +--- !u!169 &6298175476027011211 +AudioLowPassFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4479628772504131522} + m_Enabled: 0 + serializedVersion: 3 + m_LowpassResonanceQ: 1 + lowpassLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.13597089 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Prefabs/Audio/Target Hit.prefab.meta b/Assets/Prefabs/Audio/Target Hit.prefab.meta new file mode 100644 index 0000000..0611f2b --- /dev/null +++ b/Assets/Prefabs/Audio/Target Hit.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eac2d2f400d7c6c42b09a044b519b84d +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: audio + assetBundleVariant: diff --git a/Assets/Prefabs/Hit Feedback Test Object Variant.prefab b/Assets/Prefabs/Hit Feedback Test Object Variant.prefab deleted file mode 100644 index 6492d79..0000000 --- a/Assets/Prefabs/Hit Feedback Test Object Variant.prefab +++ /dev/null @@ -1,240 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &5484692676391379408 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7600027314975381803} - - component: {fileID: 97230820793114506} - m_Layer: 7 - m_Name: VulnerableZone - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7600027314975381803 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5484692676391379408} - serializedVersion: 2 - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 6531908346822305002} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &97230820793114506 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5484692676391379408} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 1 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.038 - m_Center: {x: 0, y: 0.035, z: 0} ---- !u!1001 &1315293531310461110 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalScale.x - value: 15 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalScale.y - value: 15 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalScale.z - value: 15 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalPosition.x - value: -5 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalPosition.y - value: -1 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalPosition.z - value: 30 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2107409826236812522, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - propertyPath: m_Name - value: HitFeedbackTestObject Variant - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - insertIndex: -1 - addedObject: {fileID: 7600027314975381803} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2107409826236812522, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - insertIndex: -1 - addedObject: {fileID: 3622646312819800268} - - targetCorrespondingSourceObject: {fileID: 2107409826236812522, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - insertIndex: -1 - addedObject: {fileID: 9008053342030592613} - - targetCorrespondingSourceObject: {fileID: 2107409826236812522, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - insertIndex: -1 - addedObject: {fileID: 1471863596914140625} - - targetCorrespondingSourceObject: {fileID: 2107409826236812522, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - insertIndex: -1 - addedObject: {fileID: 8174187717858109512} - m_SourcePrefab: {fileID: 3150474306388093854, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} ---- !u!1 &1116851395172129884 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2107409826236812522, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - m_PrefabInstance: {fileID: 1315293531310461110} - m_PrefabAsset: {fileID: 0} ---- !u!135 &3622646312819800268 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116851395172129884} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.035 - m_Center: {x: 0, y: 0.09, z: 0} ---- !u!135 &9008053342030592613 -SphereCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116851395172129884} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Radius: 0.035 - m_Center: {x: 0, y: 0.035, z: 0} ---- !u!54 &1471863596914140625 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116851395172129884} - serializedVersion: 4 - m_Mass: 0.1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!114 &8174187717858109512 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1116851395172129884} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f9552576452884a4d8e9a0c0dfe0a250, type: 3} - m_Name: - m_EditorClassIdentifier: - forceManager: {fileID: 0} - normalMaxVelocity: 10 - absolutMaxVelocity: 20 - useAntiDrift: 0 - antiDriftAmount: 20 - minAntiDriftFactor: 0.2 - normalDrag: 6 - maximumDrag: 6 - torqueDrag: 50 - tackleStunTime: 0.6 ---- !u!4 &6531908346822305002 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -3970243614316841892, guid: b9b8ddfef8cec2544ae9f4f87f3d2b98, type: 3} - m_PrefabInstance: {fileID: 1315293531310461110} - m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Hit Feedback Test Object.prefab b/Assets/Prefabs/Hit Feedback Test Object.prefab new file mode 100644 index 0000000..844d7a2 --- /dev/null +++ b/Assets/Prefabs/Hit Feedback Test Object.prefab @@ -0,0 +1,408 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &615087026190814228 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6724120541515281570} + - component: {fileID: 3868831402949404804} + - component: {fileID: 8860243756267121197} + - component: {fileID: 1413000181028828569} + - component: {fileID: 8540632914476890112} + m_Layer: 0 + m_Name: Hit Feedback Test Object + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6724120541515281570 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 615087026190814228} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7812531639219671196} + - {fileID: 8078453854212351079} + - {fileID: 7966402211636037987} + - {fileID: 144139443010232614} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &3868831402949404804 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 615087026190814228} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!135 &8860243756267121197 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 615087026190814228} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: -0.7, z: 0} +--- !u!54 &1413000181028828569 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 615087026190814228} + serializedVersion: 4 + m_Mass: 1 + m_Drag: 0 + m_AngularDrag: 0 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 0 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 +--- !u!114 &8540632914476890112 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 615087026190814228} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9552576452884a4d8e9a0c0dfe0a250, type: 3} + m_Name: + m_EditorClassIdentifier: + forceManager: {fileID: 0} + spawner: {fileID: 0} + meshRenderer1: {fileID: 3212530770354180991} + meshRenderer2: {fileID: 548639213930899716} + scoreValue: 150 + normalMaxVelocity: 10 + absolutMaxVelocity: 20 + useAntiDrift: 0 + antiDriftAmount: 20 + minAntiDriftFactor: 0.2 + normalDrag: 6 + maximumDrag: 6 + torqueDrag: 50 + tackleStunTime: 0.6 +--- !u!1 &2730608344526887506 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8078453854212351079} + - component: {fileID: 6602448420539434733} + - component: {fileID: 548639213930899716} + m_Layer: 0 + m_Name: Node-1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8078453854212351079 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2730608344526887506} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.7, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6724120541515281570} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6602448420539434733 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2730608344526887506} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &548639213930899716 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2730608344526887506} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 3e4299b4bfeaee34db1d6cf6c7b360bd, 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!1 &5097098283011723573 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7812531639219671196} + - component: {fileID: 2029305795133009954} + - component: {fileID: 3212530770354180991} + m_Layer: 0 + m_Name: Node-0 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7812531639219671196 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5097098283011723573} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6724120541515281570} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2029305795133009954 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5097098283011723573} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3212530770354180991 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5097098283011723573} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + 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: 3e4299b4bfeaee34db1d6cf6c7b360bd, 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!1 &5470583713082569112 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7966402211636037987} + - component: {fileID: 481760793255972802} + m_Layer: 7 + m_Name: VulnerableZone + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7966402211636037987 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5470583713082569112} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6724120541515281570} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &481760793255972802 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5470583713082569112} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.53 + m_Center: {x: 0, y: 0, z: 0} +--- !u!1 &7117716127125040266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 144139443010232614} + - component: {fileID: 2600551854506909169} + m_Layer: 7 + m_Name: VulnerableZone (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &144139443010232614 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7117716127125040266} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.7, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6724120541515281570} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &2600551854506909169 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7117716127125040266} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.53 + m_Center: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Hit Feedback Test Object Variant.prefab.meta b/Assets/Prefabs/Hit Feedback Test Object.prefab.meta similarity index 74% rename from Assets/Prefabs/Hit Feedback Test Object Variant.prefab.meta rename to Assets/Prefabs/Hit Feedback Test Object.prefab.meta index 737e49b..11dbe3e 100644 --- a/Assets/Prefabs/Hit Feedback Test Object Variant.prefab.meta +++ b/Assets/Prefabs/Hit Feedback Test Object.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 1e00d8bb0efc11742a757cd085930b9c +guid: 59128ad5e86634c4b9eb53745206e68c PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Prefabs/Ships/Blue Ship.prefab b/Assets/Prefabs/Ships/Blue Ship.prefab index 44de66d..b01dfb5 100644 --- a/Assets/Prefabs/Ships/Blue Ship.prefab +++ b/Assets/Prefabs/Ships/Blue Ship.prefab @@ -53,6 +53,37 @@ SphereCollider: serializedVersion: 3 m_Radius: 0.4 m_Center: {x: 0, y: 0.3, z: -0.13130158} +--- !u!1 &824086104227363207 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 982896938032841241} + m_Layer: 8 + m_Name: Gun Socket + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &982896938032841241 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 824086104227363207} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 2, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5042970769659716555} + m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0} --- !u!1 &950156585708023501 GameObject: m_ObjectHideFlags: 0 @@ -191,6 +222,7 @@ GameObject: - component: {fileID: 1205453696562000256} - component: {fileID: 4924634183815263034} - component: {fileID: 2704141135220834432} + - component: {fileID: 6551228186126772357} - component: {fileID: 4320456058255827552} - component: {fileID: 7840113418566161560} m_Layer: 8 @@ -214,6 +246,8 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: - {fileID: 1483206452300237684} + - {fileID: 1642926217488547673} + - {fileID: 982896938032841241} - {fileID: 8571208796381655806} - {fileID: 4720078012668975929} - {fileID: 2425795438557507562} @@ -317,6 +351,65 @@ MonoBehaviour: gravityEffect: {fileID: 4872706334040053047} jetFlameEffect: {fileID: 4832079438170929303} smokeTrailEffect: {fileID: 3500843490324877803} + fireController: {fileID: 6551228186126772357} +--- !u!114 &6551228186126772357 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1372816401649438144} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d2b82c757a706dd44ad77efcf0d513f4, type: 3} + m_Name: + m_EditorClassIdentifier: + TurretSocket: + - {fileID: 982896938032841241} + ShellParticles: + - {fileID: 1642926217474390553} + DefaultFXType: 4 + vulcanProjectile: {fileID: 400000, guid: e496166a742ada640b89650ebebbd052, type: 3} + vulcanMuzzle: {fileID: 400002, guid: ca6dec307275d294ba519247d04b6733, type: 3} + vulcanImpact: {fileID: 400000, guid: bfa7781c328a236468eda51a8ae2be55, type: 3} + vulcanOffset: 0 + VulcanFireRate: 0.11 + soloGunProjectile: {fileID: 6391351660618465683, guid: f1d6be8fd7d5cc6448b99caa0671e56f, type: 3} + soloGunMuzzle: {fileID: 400000, guid: b16d97c287e513344af2399ff138cd27, type: 3} + soloGunImpact: {fileID: 400004, guid: fd953838f1872d042a334b466e298967, type: 3} + soloGunOffset: 0 + sniperBeam: {fileID: 400000, guid: 12e7c1b739173c946b6fa3d40e9f62d1, type: 3} + sniperMuzzle: {fileID: 400004, guid: 43a8e47b31adb9a47b81c4653b412e5c, type: 3} + sniperImpact: {fileID: 400004, guid: a980d2b7788c0ef489f3c79f44da79e1, type: 3} + sniperOffset: 0 + shotGunProjectile: {fileID: 400002, guid: 0072b525437a5ed4891ebd255ec94fe6, type: 3} + shotGunMuzzle: {fileID: 400002, guid: ca6dec307275d294ba519247d04b6733, type: 3} + shotGunImpact: {fileID: 400000, guid: 5f10243d9632db04bb987838fb3b36b7, type: 3} + shotGunOffset: 0 + seekerProjectile: {fileID: 400000, guid: 49ca46ce7082ccf4c91329cd9b7c4b61, type: 3} + seekerMuzzle: {fileID: 400004, guid: 43a8e47b31adb9a47b81c4653b412e5c, type: 3} + seekerImpact: {fileID: 400010, guid: 762a17aff08aa1f40ac72b27c15fe2d1, type: 3} + seekerOffset: 0 + railgunBeam: {fileID: 400000, guid: ec0fb8bef2fb8a5459c55c3700521b70, type: 3} + railgunMuzzle: {fileID: 400000, guid: b16d97c287e513344af2399ff138cd27, type: 3} + railgunImpact: {fileID: 400010, guid: 2e92e894e0311c14c87f9544b2c88693, type: 3} + railgunOffset: 0 + plasmagunProjectile: {fileID: 400000, guid: e7b84dec6cdbfb646a33fd06b85cf64e, type: 3} + plasmagunMuzzle: {fileID: 400002, guid: e4aff98840a58c94ea1cec28789d55d6, type: 3} + plasmagunImpact: {fileID: 400004, guid: ec543be1efaafca46aeac6f66e7a5ff0, type: 3} + plasmaGunOffset: 0 + plasmaBeam: {fileID: 400000, guid: 66b50793fa1c780409218a1a1db5b1d8, type: 3} + plasmaOffset: 0 + plasmaBeamHeavy: {fileID: 400000, guid: a5251bb5b54465f43aebe1ddc2724566, type: 3} + plasmaBeamHeavyOffset: 0 + lightningGunBeam: {fileID: 400002, guid: 497cce4f043498049994c48e6e47f0ae, type: 3} + lightingGunBeamOffset: 0 + flameRed: {fileID: 400002, guid: bd9162be33a5ce54aa35d8e984e6d39d, type: 3} + flameOffset: 0 + laserImpulseProjectile: {fileID: 400004, guid: 64703ac190f718b4abd5d10cb23c96ce, type: 3} + laserImpulseMuzzle: {fileID: 400004, guid: 45116fb1512dc704b99d70267628129a, type: 3} + laserImpulseImpact: {fileID: 400010, guid: ce59e020d922ccb43866dee1ba26a673, type: 3} + laserImpulseOffset: 0 --- !u!114 &4320456058255827552 MonoBehaviour: m_ObjectHideFlags: 0 @@ -854,6 +947,89 @@ Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 40527c707fffde84c99533c25bbcd8cd, type: 3} m_PrefabInstance: {fileID: 1378049901460532383} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1642926217488410073 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 5042970769659716555} + m_Modifications: + - target: {fileID: 100000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_Name + value: vulcan_shell (3) + objectReference: {fileID: 0} + - target: {fileID: 100000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalPosition.x + value: -0.702 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalPosition.y + value: 1.448 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalRotation.x + value: -1.7763568e-15 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalRotation.y + value: -0.70710677 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalRotation.z + value: 1.7763568e-15 + objectReference: {fileID: 0} + - target: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -90.00001 + objectReference: {fileID: 0} + - target: {fileID: 19800000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: randomSeed + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 19800000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + propertyPath: moveWithTransform + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} +--- !u!198 &1642926217474390553 stripped +ParticleSystem: + m_CorrespondingSourceObject: {fileID: 19800000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + m_PrefabInstance: {fileID: 1642926217488410073} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1642926217488547673 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 74a34a83164977b48accb800c8a3dd67, type: 3} + m_PrefabInstance: {fileID: 1642926217488410073} + m_PrefabAsset: {fileID: 0} --- !u!1001 &2003113329371731864 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/FreeFlyArena.unity b/Assets/Scenes/FreeFlyArena.unity index e8b5115..16d373f 100644 --- a/Assets/Scenes/FreeFlyArena.unity +++ b/Assets/Scenes/FreeFlyArena.unity @@ -241,6 +241,53 @@ Transform: m_Children: [] m_Father: {fileID: 1533660267} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &23930368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 23930370} + - component: {fileID: 23930369} + m_Layer: 0 + m_Name: PoolManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &23930369 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 23930368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 12e51d46aadf24b4b813981141443db3, type: 3} + m_Name: + m_EditorClassIdentifier: + databaseName: WeaponRange + selectedItem: 0 + haveToShowArr: 00000000000000000000000000000000000000000000000000000000 +--- !u!4 &23930370 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 23930368} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1737972891} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &66553448 PrefabInstance: m_ObjectHideFlags: 0 @@ -995,6 +1042,7 @@ RectTransform: - {fileID: 1361581067} - {fileID: 3628763} - {fileID: 963194228} + - {fileID: 1827640369} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: -16.463, y: -183.163, z: -8.528} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1195,6 +1243,195 @@ GameObject: m_CorrespondingSourceObject: {fileID: 8164078558771037576, guid: 24300c11f962a8e4f9f8125bd2843705, type: 3} m_PrefabInstance: {fileID: 1703043548} m_PrefabAsset: {fileID: 0} +--- !u!1 &1737972887 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1737972891} + - component: {fileID: 1737972890} + - component: {fileID: 1737972889} + m_Layer: 0 + m_Name: _Main + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1737972889 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737972887} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: deb1b38f7c8f8e44385c9f01d055bfd0, type: 3} + m_Name: + m_EditorClassIdentifier: + audioSource: {fileID: 400000, guid: 9eeb3f92e3355994db8dc67cb3ea8ba0, type: 3} + vulcanHit: + - {fileID: 8300000, guid: b12187930d6f4b04b8a14c4e942c7f93, type: 3} + - {fileID: 8300000, guid: ee945bf47a1d77342b0e71d7e4421695, type: 3} + - {fileID: 8300000, guid: 4baa43d1a2555714a9dcc3b0b06a220c, type: 3} + - {fileID: 8300000, guid: fd4838b36b4237d41b494abc26434ccd, type: 3} + - {fileID: 8300000, guid: 9d8dda217f9277a4190a9e722542bd4a, type: 3} + - {fileID: 8300000, guid: e2b151c357bc3d848ab8ae87d63650f5, type: 3} + vulcanShot: {fileID: 8300000, guid: 14ba2f7d17b7a434f851c648484e0806, type: 3} + vulcanDelay: 0.05 + vulcanHitDelay: 0.1 + soloGunHit: + - {fileID: 8300000, guid: 77772fcc3692aae40a14a99b952c4168, type: 3} + - {fileID: 8300000, guid: 63f3836c15cf4de459c87f3181801d6c, type: 3} + - {fileID: 8300000, guid: d9eac4dfc29abe64faa49306ee4b4205, type: 3} + - {fileID: 8300000, guid: e9de0ff43b3234847b84dac0c1304373, type: 3} + soloGunShot: {fileID: 8300000, guid: b3325a8b2aa1db6408262e058666a0e2, type: 3} + soloGunDelay: 0.1 + soloGunHitDelay: 0.1 + sniperHit: + - {fileID: 8300000, guid: 4e6abf7c3e3fb594bb0fdd6dbd713716, type: 3} + - {fileID: 8300000, guid: 390e6d5686f9f034bb094a074d154504, type: 3} + - {fileID: 8300000, guid: a615af9796db06242a84e175dec40171, type: 3} + - {fileID: 8300000, guid: 7ee9ede440422534192830c927230cc4, type: 3} + - {fileID: 8300000, guid: 07e57c9acd21fb24082df8e9fe8fac6c, type: 3} + - {fileID: 8300000, guid: 2406acbce4660b14caf81514ebdb27a3, type: 3} + sniperShot: {fileID: 8300000, guid: 0fc8936ede4d4c94cbc04ad25b442ebf, type: 3} + sniperDelay: 0.1 + sniperHitDelay: 0.1 + shotGunHit: + - {fileID: 8300000, guid: 4e6abf7c3e3fb594bb0fdd6dbd713716, type: 3} + - {fileID: 8300000, guid: 390e6d5686f9f034bb094a074d154504, type: 3} + - {fileID: 8300000, guid: a615af9796db06242a84e175dec40171, type: 3} + - {fileID: 8300000, guid: 7ee9ede440422534192830c927230cc4, type: 3} + - {fileID: 8300000, guid: 07e57c9acd21fb24082df8e9fe8fac6c, type: 3} + - {fileID: 8300000, guid: 2406acbce4660b14caf81514ebdb27a3, type: 3} + shotGunShot: {fileID: 8300000, guid: 9db28af8564ff3f44ba56f1523e6561b, type: 3} + shotGunDelay: 0.1 + shotGunHitDelay: 0.05 + seekerHit: + - {fileID: 8300000, guid: e49a8a34f479db846af1106a5fe97951, type: 3} + - {fileID: 8300000, guid: 75c2520332d47c543ab6ecbed510a94f, type: 3} + - {fileID: 8300000, guid: 0e06c997f66813242af742395e3e0dc3, type: 3} + seekerShot: {fileID: 8300000, guid: deb31dbb1a26c054891a4186c584a5d0, type: 3} + seekerDelay: 0.1 + seekerHitDelay: 0.1 + railgunHit: + - {fileID: 8300000, guid: af14353652db15440bec11e44e5a7012, type: 3} + - {fileID: 8300000, guid: a8bd6c1598e010443ae8a060e2fb9839, type: 3} + - {fileID: 8300000, guid: dd339bdbf714c874abd1b5430c2f37eb, type: 3} + railgunShot: {fileID: 8300000, guid: 5175afc9a2f111d4fac8d2ee0a71fe17, type: 3} + railgunDelay: 0.1 + railgunHitDelay: 0.1 + plasmagunHit: + - {fileID: 8300000, guid: 81a346a7999a81243b8e6e18df6852ef, type: 3} + - {fileID: 8300000, guid: 58a24ee7c3371ff49bb6833b316f040a, type: 3} + - {fileID: 8300000, guid: b3325a8b2aa1db6408262e058666a0e2, type: 3} + - {fileID: 8300000, guid: 7c9ba602437be9b4f9271fb55179b1b0, type: 3} + plasmagunShot: {fileID: 8300000, guid: 1da3dd32414c56d41b46b52293cf7e4e, type: 3} + plasmagunDelay: 0.1 + plasmagunHitDelay: 0.1 + plasmabeamOpen: {fileID: 8300000, guid: efa34f6c791b62249aea6d9dbfbd1087, type: 3} + plasmabeamLoop: {fileID: 8300000, guid: 959e88d28b35e2c419016ab8ee0d9e9d, type: 3} + plasmabeamClose: {fileID: 8300000, guid: 650a66a33ed959c4aa39de2afb9fdbb5, type: 3} + plasmabeamHeavyOpen: {fileID: 8300000, guid: 37c2b8e42d3d3b44b8ea96cd214777b3, type: 3} + plasmabeamHeavyLoop: {fileID: 8300000, guid: 959e88d28b35e2c419016ab8ee0d9e9d, type: 3} + plasmabeamHeavyClose: {fileID: 8300000, guid: 650a66a33ed959c4aa39de2afb9fdbb5, type: 3} + lightningGunOpen: {fileID: 8300000, guid: 51f46968ed339684b975b62416e9bd8e, type: 3} + lightningGunLoop: {fileID: 8300000, guid: 206809617a9f6dc4e813dfc96abc1da3, type: 3} + lightningGunClose: {fileID: 8300000, guid: 59ae4c7218192d443af48fa96d0883fe, type: 3} + flameGunOpen: {fileID: 8300000, guid: e9de0ff43b3234847b84dac0c1304373, type: 3} + flameGunLoop: {fileID: 8300000, guid: 51b29026a14d387498c8a7e8df09f1ab, type: 3} + flameGunClose: {fileID: 8300000, guid: d9eac4dfc29abe64faa49306ee4b4205, type: 3} + laserImpulseHit: + - {fileID: 8300000, guid: 7ca11a0945a5da14e8281e45670ad7ef, type: 3} + - {fileID: 8300000, guid: d3b08de41108d154b83f1fba126cc359, type: 3} + - {fileID: 8300000, guid: 8acc3a66fd56dcc46b110c7a0d3213e4, type: 3} + - {fileID: 8300000, guid: b7ec6b248f1d72648ac6aef71fe447e9, type: 3} + - {fileID: 8300000, guid: 60ba8f3f1e4b1b145ad629b5ba4d5c0b, type: 3} + - {fileID: 8300000, guid: cc1180ee178a70e4db502919244f6755, type: 3} + - {fileID: 8300000, guid: 4a5f1abf2aef3f84986f73751d63fc11, type: 3} + laserImpulseShot: {fileID: 8300000, guid: 15a3211a3c389664a94d401850cad8c7, type: 3} + laserImpulseDelay: 0.1 + laserImpulseHitDelay: 0.1 +--- !u!114 &1737972890 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737972887} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5309af59ecdc1064aa93cd2541329379, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &1737972891 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1737972887} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 23930370} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1827640368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1827640369} + - component: {fileID: 1827640370} + m_Layer: 5 + m_Name: Spawner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1827640369 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827640368} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 45, z: -0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1533660267} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1827640370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1827640368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0295ecdaf8b3f7f41a5f6939adcf6955, type: 3} + m_Name: + m_EditorClassIdentifier: + xRange: 30 + yRange: 30 + targetPrefab: {fileID: 615087026190814228, guid: 59128ad5e86634c4b9eb53745206e68c, type: 3} --- !u!1001 &1837077819 PrefabInstance: m_ObjectHideFlags: 0 @@ -1475,3 +1712,4 @@ SceneRoots: - {fileID: 1533660267} - {fileID: 1659830377} - {fileID: 491610119} + - {fileID: 1737972891} diff --git a/Assets/Scenes/GameManagement.unity b/Assets/Scenes/GameManagement.unity index b4e28c2..ba3fb1c 100644 --- a/Assets/Scenes/GameManagement.unity +++ b/Assets/Scenes/GameManagement.unity @@ -506,7 +506,7 @@ MonoBehaviour: AudioManager: {fileID: 4421901766771881742, guid: d2fa91ae61bbe6644b3847b83f0f21fb, type: 3} startCamera: {fileID: 1164443743} CurrentScene: 0 - IsTestRun: 0 + IsTestRun: 1 TestScene: 4 TestSceneRule: 0 TestSceneArena: 2 diff --git a/Assets/Scenes/InGameUI.unity b/Assets/Scenes/InGameUI.unity index df67d14..d712f5a 100644 --- a/Assets/Scenes/InGameUI.unity +++ b/Assets/Scenes/InGameUI.unity @@ -164,6 +164,7 @@ RectTransform: - {fileID: 374405367} - {fileID: 1686910808} - {fileID: 630834203} + - {fileID: 493939004} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -247,6 +248,7 @@ MonoBehaviour: - {fileID: 374405368} - {fileID: 1686910811} - {fileID: 630834206} + score: {fileID: 493939005} --- !u!1 &41121971 GameObject: m_ObjectHideFlags: 0 @@ -1340,6 +1342,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 465248643} m_CullTransparentMesh: 1 +--- !u!1 &493939003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 493939004} + - component: {fileID: 493939006} + - component: {fileID: 493939005} + m_Layer: 5 + m_Name: Score + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &493939004 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493939003} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 29650259} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 332, y: -135} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &493939005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493939003} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'Score: ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 3a3809aa93488384890eda99d44622af, type: 2} + m_sharedMaterial: {fileID: -5770721753118985583, guid: 3a3809aa93488384890eda99d44622af, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 38.45 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &493939006 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 493939003} + m_CullTransparentMesh: 1 --- !u!1 &509067250 GameObject: m_ObjectHideFlags: 0 @@ -2614,7 +2750,7 @@ Canvas: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1076256082} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 3 m_RenderMode: 2 m_Camera: {fileID: 1048663016} diff --git a/Assets/Scripts/HitFeedbackTestObjectBehavior.cs b/Assets/Scripts/HitFeedbackTestObjectBehavior.cs index d38c1e4..2460541 100644 --- a/Assets/Scripts/HitFeedbackTestObjectBehavior.cs +++ b/Assets/Scripts/HitFeedbackTestObjectBehavior.cs @@ -1,3 +1,7 @@ +using System.Collections; +using System.Xml.Serialization; +using Managers; +using PrimeTween; using UnityEngine; using static AffectingForcesManager; @@ -5,6 +9,12 @@ public class HitFeedbackTestObjectBehavior : MonoBehaviour { // Private variables public AffectingForcesManager forceManager; + public TargetSpawner spawner; + public MeshRenderer meshRenderer1; + public MeshRenderer meshRenderer2; + private MaterialPropertyBlock materialProperties; + private ManageableAudio hitSound; + [SerializeField] private int scoreValue = 150; [SerializeField] private float normalMaxVelocity = 10; [SerializeField] private float absolutMaxVelocity = 20; [SerializeField] private bool useAntiDrift = false; @@ -22,11 +32,24 @@ public class HitFeedbackTestObjectBehavior : MonoBehaviour private int instanceID; private bool isTackled; private float tackledTime; + + void Awake() + { + if (forceManager == null) + { + forceManager = GameObject.FindGameObjectWithTag("ForceManager"). + GetComponent(); + } + materialProperties = new MaterialPropertyBlock(); + UpdateBurnOut(0.3f); + } + // Start is called before the first frame update void Start() { body = GetComponent(); instanceID = gameObject.GetInstanceID(); + hitSound = AudioManager.G.GetLocalSound("target_hit", 1, transform); } // Update is called once per frame @@ -129,19 +152,44 @@ public class HitFeedbackTestObjectBehavior : MonoBehaviour } } + void OnTriggerEnter(Collider collider) { - if (collider.tag == "Zone") + if (collider.tag == "Zone" || isTackled) { return; } + Vector3 colliderVelocity = collider.attachedRigidbody.velocity; Vector3 tackleDirection = body.transform.position - collider.transform.position; float colliderMass = collider.attachedRigidbody.mass; body.AddForce(colliderVelocity.magnitude * tackleDirection * (colliderMass / body.mass), ForceMode.Acceleration); UpdateTackleResponse(true); + hitSound.PlayAudio(false); + Destruction(); + StatisticsManager.G.AddFreeFlightScore(150); } + async void Destruction() + { + await Tween.Custom(0.33f, 0.5f, 1.2f, onValueChange: value => + { + UpdateBurnOut(value); + }). + OnComplete(() => Destroy(gameObject)); + } + + private void UpdateBurnOut(float value) + { + materialProperties.SetFloat("_Burnout", value); + meshRenderer1.SetPropertyBlock(materialProperties); + meshRenderer2.SetPropertyBlock(materialProperties); + } + + private void OnDestroy() + { + spawner.TargetDestroyed(gameObject); + } } diff --git a/Assets/Scripts/Input/ShipInputHandler.cs b/Assets/Scripts/Input/ShipInputHandler.cs index 29a18bc..5736149 100644 --- a/Assets/Scripts/Input/ShipInputHandler.cs +++ b/Assets/Scripts/Input/ShipInputHandler.cs @@ -54,6 +54,10 @@ namespace ShipHandling { state.boostInput = context.ReadValue(); } + public void OnShoot(InputAction.CallbackContext context) + { + state.shootInput = context.ReadValue(); + } public void Dispose() { diff --git a/Assets/Scripts/Managers/ControlsManager.cs b/Assets/Scripts/Managers/ControlsManager.cs index 5cad2d1..53b43d3 100644 --- a/Assets/Scripts/Managers/ControlsManager.cs +++ b/Assets/Scripts/Managers/ControlsManager.cs @@ -172,6 +172,10 @@ public class ControlSchemeDetection : IPlayerActions { readControlScheme(context); } + public void OnShoot(InputAction.CallbackContext context) + { + readControlScheme(context); + } public void readControlScheme(InputAction.CallbackContext context) { diff --git a/Assets/Scripts/Managers/GameManager.cs b/Assets/Scripts/Managers/GameManager.cs index ea4fd42..72088c2 100644 --- a/Assets/Scripts/Managers/GameManager.cs +++ b/Assets/Scripts/Managers/GameManager.cs @@ -139,6 +139,11 @@ namespace Managers PlayerManager = Instantiate(PlayerManager); Log.Info("PlayerManager Manager instantiated."); } + if (StatisticsManager != null) + { + StatisticsManager = Instantiate(StatisticsManager); + Log.Info("Statistics Manager instantiated."); + } else { Log.Error("PlayerManager Manager Prefab missing."); diff --git a/Assets/Scripts/Managers/StatisticsManager.cs b/Assets/Scripts/Managers/StatisticsManager.cs index 3fb75c8..1c455e5 100644 --- a/Assets/Scripts/Managers/StatisticsManager.cs +++ b/Assets/Scripts/Managers/StatisticsManager.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using System.Reflection; using log4net; +using Unity.VisualScripting; using UnityEngine; namespace Managers @@ -13,6 +14,7 @@ namespace Managers public class StatisticsManager : MonoBehaviour { private static ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType); + private int FreeFlightScore = 0; /// /// Globally accessible member to use manager with. @@ -23,5 +25,11 @@ namespace Managers G = this; Log.Info("Awake"); } + + public void AddFreeFlightScore(int score) + { + FreeFlightScore += score; + UIManager.G.hUD.UpdateScore(FreeFlightScore); + } } } \ No newline at end of file diff --git a/Assets/Scripts/Ship.cs b/Assets/Scripts/Ship.cs index 6fcc513..cbff8a6 100644 --- a/Assets/Scripts/Ship.cs +++ b/Assets/Scripts/Ship.cs @@ -6,6 +6,8 @@ using Managers; using Unity.Mathematics; using FishNet.Object; using FishNet.Connection; +using FishNet.Example.ColliderRollbacks; +using FORGE3D; public class Ship : NetworkBehaviour { @@ -21,6 +23,8 @@ public class Ship : NetworkBehaviour public ParticleSystem jetFlameEffect; public ParticleSystem smokeTrailEffect; + public F3DFXController fireController; + private AffectingForcesManager forceManager; private Rigidbody body; // Saves the current input value for thrust @@ -29,6 +33,7 @@ public class Ship : NetworkBehaviour private bool isCriticalTackle = false; private bool isTackled = false; private float tackledTime = 0f; + private bool isFiring = false; // Current Zone the player occupies private Zone zone = Zone.NimbleZone; // Upcoming zone change @@ -106,6 +111,18 @@ public class Ship : NetworkBehaviour UpdateMovement(); BoostStateUpdate(Time.deltaTime); UpdateTackleResponse(isCriticalTackle); + if (!isFiring && state.shootInput == 1) + { + isFiring = true; + //fireController.Fire(); + } + + // Stop firing + if (isFiring && state.shootInput < 1) + { + isFiring = false; + //fireController.Stop(); + } } /// @@ -437,5 +454,14 @@ public class Ship : NetworkBehaviour } } + // private void Seeker() + // { + // var offset = Quaternion.Euler(UnityEngine.Random.onUnitSphere); + // F3DPoolManager.Pools["GeneratedPool"].Spawn(muzzle, transform.position + shootExitOffset); + // var newGO = + // F3DPoolManager.Pools["GeneratedPool"].Spawn(projectile, transform.position + shootExitOffset, + // offset * transform.localRotation, null).gameObject; + // F3DAudioController.instance.SeekerShot(transform.position); + // } } diff --git a/Assets/Scripts/ShipState.cs b/Assets/Scripts/ShipState.cs index 499023a..5dd15cb 100644 --- a/Assets/Scripts/ShipState.cs +++ b/Assets/Scripts/ShipState.cs @@ -9,6 +9,7 @@ namespace ShipHandling { public float thrustInput = 0; public float boostInput = 0; + public float shootInput = 0; public float boostCapacity; // Saves the current input for steering public float steerInput = 0; diff --git a/Assets/Scripts/UI/HUD.cs b/Assets/Scripts/UI/HUD.cs index 65a3e99..2602ba3 100644 --- a/Assets/Scripts/UI/HUD.cs +++ b/Assets/Scripts/UI/HUD.cs @@ -1,3 +1,4 @@ +using TMPro; using UnityEngine; /// @@ -7,12 +8,14 @@ public class HUD : MonoBehaviour { public BoostCapacityUI[] boostCapacities; public JoinPrompt[] joinPrompts; + public TextMeshProUGUI score; private Canvas canvas; void Awake() { canvas = gameObject.GetComponent(); + score.enabled = false; } /// @@ -31,6 +34,14 @@ public class HUD : MonoBehaviour } } + public void UpdateScore(int newScore) + { + if (!score.enabled) + score.enabled = true; + + score.text = $"Score: {newScore}"; + } + public void Hide() { canvas.enabled = false; diff --git a/Assets/TargetSpawner.cs b/Assets/TargetSpawner.cs new file mode 100644 index 0000000..e599c37 --- /dev/null +++ b/Assets/TargetSpawner.cs @@ -0,0 +1,49 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class TargetSpawner : MonoBehaviour +{ + public int xRange = 30; + public int yRange = 30; + public GameObject targetPrefab; + + private List targetList = new(); + // Start is called before the first frame update + void Start() + { + SpawnTarget(); + } + + private void SpawnTarget(bool spawnRandom = true, Vector3 spawnPosition = new Vector3()) + { + int xPos = (int)spawnPosition.x; + int yPos = (int)spawnPosition.y; + if (spawnRandom) + { + xPos = Random.Range(-xRange, xRange); + yPos = Random.Range(-yRange, yRange); + } + var target = Instantiate(targetPrefab); + target.transform.SetParent(transform); + targetList.Add(target); + target.transform.localPosition = new Vector3(xPos, yPos, 0); + target.GetComponent().spawner = + gameObject.GetComponent(); + } + + void Update() + { + if (targetList.Count < 1) + { + SpawnTarget(); + } + } + + public void TargetDestroyed(GameObject go) + { + targetList.Remove(go); + } + + +} diff --git a/Assets/TargetSpawner.cs.meta b/Assets/TargetSpawner.cs.meta new file mode 100644 index 0000000..dc8e9e7 --- /dev/null +++ b/Assets/TargetSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0295ecdaf8b3f7f41a5f6939adcf6955 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: