From 39e9ae23823341124ef798483bc34167e7ac37f3 Mon Sep 17 00:00:00 2001 From: 11BelowStudio Date: Thu, 3 Jun 2021 13:36:40 +0100 Subject: [PATCH] We have sound effects and such now. I suppose that, after lunch, it will be time to actually make and add the music. --- .../.idea/workspace.xml | 30 ++- Assets/MyAssets/Audio/constant hum.ogg | 3 + Assets/MyAssets/Audio/constant hum.ogg.meta | 22 ++ Assets/MyAssets/Audio/points box noise.ogg | 3 + .../MyAssets/Audio/points box noise.ogg.meta | 22 ++ Assets/MyAssets/Audio/scored point!.ogg | 3 + Assets/MyAssets/Audio/scored point!.ogg.meta | 22 ++ Assets/MyAssets/Audio/space rock noise.ogg | 3 + .../MyAssets/Audio/space rock noise.ogg.meta | 22 ++ Assets/MyAssets/Camera Spinner.prefab | 152 +++++++++++++ Assets/MyAssets/Camera Spinner.prefab.meta | 7 + .../MyAssets/Gameplay/GameController.prefab | 139 +++++++++++- Assets/MyAssets/Gameplay/PointsCube.prefab | 97 +++++++++ .../Gameplay/PointsCube/SlowerSpeen.anim | 199 +++++++++++++++++ .../Gameplay/PointsCube/SlowerSpeen.anim.meta | 8 + .../PointsCube/SlowerSpinner.controller | 72 +++++++ .../PointsCube/SlowerSpinner.controller.meta | 8 + Assets/MyAssets/Gameplay/ServerShip.prefab | 204 ++++++++++++++++-- Assets/MyAssets/Gameplay/SpaceRock.prefab | 97 +++++++++ .../Gameplay/Warp Tunnel/Warp tunnel.prefab | 69 ++++++ Assets/Scenes/GameScene.unity | 8 +- Assets/Scenes/StartMenu.unity | 148 ++++++------- Assets/Scenes/TheLobby.unity | 150 ++++++------- Assets/Scripts/Game/GameController.cs | 15 +- Assets/Scripts/Game/PointsBox.cs | 2 +- Assets/Scripts/Game/Ship/ServerSpaceship.cs | 28 ++- .../Game/SpaceRock/NetworkedSpaceRock.cs | 2 +- Assets/Scripts/Menus/LobbyControl.cs | 5 +- UserSettings/EditorUserSettings.asset | 4 +- 29 files changed, 1303 insertions(+), 241 deletions(-) create mode 100644 Assets/MyAssets/Audio/constant hum.ogg create mode 100644 Assets/MyAssets/Audio/constant hum.ogg.meta create mode 100644 Assets/MyAssets/Audio/points box noise.ogg create mode 100644 Assets/MyAssets/Audio/points box noise.ogg.meta create mode 100644 Assets/MyAssets/Audio/scored point!.ogg create mode 100644 Assets/MyAssets/Audio/scored point!.ogg.meta create mode 100644 Assets/MyAssets/Audio/space rock noise.ogg create mode 100644 Assets/MyAssets/Audio/space rock noise.ogg.meta create mode 100644 Assets/MyAssets/Camera Spinner.prefab create mode 100644 Assets/MyAssets/Camera Spinner.prefab.meta create mode 100644 Assets/MyAssets/Gameplay/PointsCube/SlowerSpeen.anim create mode 100644 Assets/MyAssets/Gameplay/PointsCube/SlowerSpeen.anim.meta create mode 100644 Assets/MyAssets/Gameplay/PointsCube/SlowerSpinner.controller create mode 100644 Assets/MyAssets/Gameplay/PointsCube/SlowerSpinner.controller.meta diff --git a/.idea/.idea.SBIG 2021 One Button/.idea/workspace.xml b/.idea/.idea.SBIG 2021 One Button/.idea/workspace.xml index c26dbb9..9fbee4c 100644 --- a/.idea/.idea.SBIG 2021 One Button/.idea/workspace.xml +++ b/.idea/.idea.SBIG 2021 One Button/.idea/workspace.xml @@ -2,25 +2,19 @@ - - - - - - - + - - - - + + + + - - + + @@ -145,7 +139,7 @@ - + diff --git a/Assets/MyAssets/Audio/constant hum.ogg b/Assets/MyAssets/Audio/constant hum.ogg new file mode 100644 index 0000000..7b700b5 --- /dev/null +++ b/Assets/MyAssets/Audio/constant hum.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ba09fbc4e725cfd9c19efb6f2dcc4b038c0f59504bb3a2cf63ed24f0ce7d672 +size 129660 diff --git a/Assets/MyAssets/Audio/constant hum.ogg.meta b/Assets/MyAssets/Audio/constant hum.ogg.meta new file mode 100644 index 0000000..34d31e6 --- /dev/null +++ b/Assets/MyAssets/Audio/constant hum.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: fd6071f6d3adec740b29c570131abc48 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyAssets/Audio/points box noise.ogg b/Assets/MyAssets/Audio/points box noise.ogg new file mode 100644 index 0000000..3ec0ac0 --- /dev/null +++ b/Assets/MyAssets/Audio/points box noise.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:983f740ffa4b6218ad34eaaa70439db462b8f7ac9c45cc352c5ea85ad8d09f9f +size 12017 diff --git a/Assets/MyAssets/Audio/points box noise.ogg.meta b/Assets/MyAssets/Audio/points box noise.ogg.meta new file mode 100644 index 0000000..fc8644e --- /dev/null +++ b/Assets/MyAssets/Audio/points box noise.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 30fb1e7653dcfe14487a30318853993b +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyAssets/Audio/scored point!.ogg b/Assets/MyAssets/Audio/scored point!.ogg new file mode 100644 index 0000000..56266e4 --- /dev/null +++ b/Assets/MyAssets/Audio/scored point!.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:e56c49e3a247fb2406b45dfd3aff3db76531bdd65f127c2fd985b12dc779878d +size 39966 diff --git a/Assets/MyAssets/Audio/scored point!.ogg.meta b/Assets/MyAssets/Audio/scored point!.ogg.meta new file mode 100644 index 0000000..ec188c7 --- /dev/null +++ b/Assets/MyAssets/Audio/scored point!.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: cb8a258d04ca10d469d257c8f975ec21 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyAssets/Audio/space rock noise.ogg b/Assets/MyAssets/Audio/space rock noise.ogg new file mode 100644 index 0000000..19cab3f --- /dev/null +++ b/Assets/MyAssets/Audio/space rock noise.ogg @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:53dbe7e50322f2cb2c1d4cf006b47bb1c44a106c71a483bea149bcaa8f937821 +size 132446 diff --git a/Assets/MyAssets/Audio/space rock noise.ogg.meta b/Assets/MyAssets/Audio/space rock noise.ogg.meta new file mode 100644 index 0000000..2e07946 --- /dev/null +++ b/Assets/MyAssets/Audio/space rock noise.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3cfc4e75450b0a44685ea6c692e45db1 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyAssets/Camera Spinner.prefab b/Assets/MyAssets/Camera Spinner.prefab new file mode 100644 index 0000000..4c5e511 --- /dev/null +++ b/Assets/MyAssets/Camera Spinner.prefab @@ -0,0 +1,152 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4550561498231342337 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4550561498231342340} + - component: {fileID: 4550561498231342343} + - component: {fileID: 4550561498231342342} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4550561498231342340 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4550561498231342337} + m_LocalRotation: {x: -0.13052624, y: 0, z: 0, w: 0.9914449} + m_LocalPosition: {x: 0, y: -2.16, z: -9.49} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 4550561499275839917} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: -15, y: 0, z: 0} +--- !u!20 &4550561498231342343 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4550561498231342337} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.074092224, g: 0.07829746, b: 0.084905684, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 34.3 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &4550561498231342342 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4550561498231342337} + m_Enabled: 1 +--- !u!1 &4550561499275839918 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4550561499275839917} + - component: {fileID: 4550561499275839916} + - component: {fileID: 4550561499275839919} + m_Layer: 0 + m_Name: Camera Spinner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4550561499275839917 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4550561499275839918} + 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: 4550561498231342340} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &4550561499275839916 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4550561499275839918} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7961c1bb2a9b50440b137c8b13d2d7ff, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!111 &4550561499275839919 +Animation: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4550561499275839918} + m_Enabled: 1 + serializedVersion: 3 + m_Animation: {fileID: 7400000, guid: f460dcdfba66050439a31547ccb6b13f, type: 2} + m_Animations: [] + m_WrapMode: 0 + m_PlayAutomatically: 1 + m_AnimatePhysics: 0 + m_CullingType: 0 diff --git a/Assets/MyAssets/Camera Spinner.prefab.meta b/Assets/MyAssets/Camera Spinner.prefab.meta new file mode 100644 index 0000000..760dab6 --- /dev/null +++ b/Assets/MyAssets/Camera Spinner.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 710977f71965fae49899fed56a173f4c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyAssets/Gameplay/GameController.prefab b/Assets/MyAssets/Gameplay/GameController.prefab index 50cc336..2eeb4e4 100644 --- a/Assets/MyAssets/Gameplay/GameController.prefab +++ b/Assets/MyAssets/Gameplay/GameController.prefab @@ -1,5 +1,132 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &3207455388821588295 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8942876224925554133} + - component: {fileID: 2707439903755510395} + m_Layer: 0 + m_Name: Scored points audio source + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8942876224925554133 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3207455388821588295} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 6715725409949146861} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &2707439903755510395 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3207455388821588295} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: cb8a258d04ca10d469d257c8f975ec21, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.75 + m_Pitch: 1 + Loop: 0 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + 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: 0 + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &6715725409949146860 GameObject: m_ObjectHideFlags: 0 @@ -28,7 +155,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.2986608, y: -0.4762237, z: -8.798296} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 8942876224925554133} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -51,16 +179,17 @@ MonoBehaviour: theObjectPool: {fileID: 0} SpaceRockPrefab: {fileID: 3332950033486320138, guid: b848f8a42d4bf084e89672d4e76edfc5, type: 3} spawnerRadius: 4.5 - spawnerZPosition: 50 + spawnerZPosition: 150 minWaveSize: 3 maxWaveSize: 4 minSpawnDelay: 0.1 - maxSpawnDelay: 1 - minWaveDelay: 1 - maxWaveDelay: 2 + maxSpawnDelay: 0.5 + minWaveDelay: 0.5 + maxWaveDelay: 1 pointsBoxPrefab: {fileID: 3391054102520139909, guid: 43d67d0714f9e1640b3998e076f2463c, type: 3} minPointsBoxDelay: 3 maxPointsBoxDelay: 10 + pointsScoredAudioSource: {fileID: 2707439903755510395} explosionPrefab: {fileID: 4153581380243878057, guid: fdb9e34379aaf894badab30f6102805a, type: 3} m_DelayedStartTime: 5 m_TickPeriodic: diff --git a/Assets/MyAssets/Gameplay/PointsCube.prefab b/Assets/MyAssets/Gameplay/PointsCube.prefab index 0aaec58..fc1defb 100644 --- a/Assets/MyAssets/Gameplay/PointsCube.prefab +++ b/Assets/MyAssets/Gameplay/PointsCube.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 3936187962046375886} - component: {fileID: 1819549376378268030} - component: {fileID: 6780693204376248592} + - component: {fileID: 4746869296168700212} m_Layer: 0 m_Name: PointsCube m_TagString: Untagged @@ -98,6 +99,102 @@ SphereCollider: serializedVersion: 2 m_Radius: 1 m_Center: {x: 0, y: 0, z: 0} +--- !u!82 &4746869296168700212 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3391054102520139909} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 30fb1e7653dcfe14487a30318853993b, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 100 + DopplerLevel: 0 + MinDistance: 1 + MaxDistance: 100 + Pan2D: 0 + rolloffMode: 0 + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &5369653382314031883 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/MyAssets/Gameplay/PointsCube/SlowerSpeen.anim b/Assets/MyAssets/Gameplay/PointsCube/SlowerSpeen.anim new file mode 100644 index 0000000..5de1254 --- /dev/null +++ b/Assets/MyAssets/Gameplay/PointsCube/SlowerSpeen.anim @@ -0,0 +1,199 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SlowerSpeen + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 3, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 120 + value: {x: 0, y: 360, z: 0} + inSlope: {x: 0, y: 3, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 4 + script: {fileID: 0} + typeID: 4 + customType: 4 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 120 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 120 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 3 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 120 + value: 360 + inSlope: 3 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 69 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 120 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: localEulerAnglesRaw.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.z + path: + classID: 4 + script: {fileID: 0} + m_HasGenericRootTransform: 1 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/MyAssets/Gameplay/PointsCube/SlowerSpeen.anim.meta b/Assets/MyAssets/Gameplay/PointsCube/SlowerSpeen.anim.meta new file mode 100644 index 0000000..536ba40 --- /dev/null +++ b/Assets/MyAssets/Gameplay/PointsCube/SlowerSpeen.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f460dcdfba66050439a31547ccb6b13f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyAssets/Gameplay/PointsCube/SlowerSpinner.controller b/Assets/MyAssets/Gameplay/PointsCube/SlowerSpinner.controller new file mode 100644 index 0000000..2dedae8 --- /dev/null +++ b/Assets/MyAssets/Gameplay/PointsCube/SlowerSpinner.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-8269491250068427731 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 3916722463521699024} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 3916722463521699024} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SlowerSpinner + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -8269491250068427731} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &3916722463521699024 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: SlowerSpeen + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f460dcdfba66050439a31547ccb6b13f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/MyAssets/Gameplay/PointsCube/SlowerSpinner.controller.meta b/Assets/MyAssets/Gameplay/PointsCube/SlowerSpinner.controller.meta new file mode 100644 index 0000000..5412315 --- /dev/null +++ b/Assets/MyAssets/Gameplay/PointsCube/SlowerSpinner.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7961c1bb2a9b50440b137c8b13d2d7ff +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/MyAssets/Gameplay/ServerShip.prefab b/Assets/MyAssets/Gameplay/ServerShip.prefab index 5f4c718..24e6467 100644 --- a/Assets/MyAssets/Gameplay/ServerShip.prefab +++ b/Assets/MyAssets/Gameplay/ServerShip.prefab @@ -29,7 +29,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466193471335400689} - m_RootOrder: 5 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &5171549162979668503 AudioSource: @@ -51,8 +51,8 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 + MinDistance: 0.5 + MaxDistance: 3 Pan2D: 0 rolloffMode: 0 BypassEffects: 0 @@ -156,7 +156,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466193471335400689} - m_RootOrder: 6 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &2973290281285065710 AudioSource: @@ -178,8 +178,8 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 + MinDistance: 0.5 + MaxDistance: 3 Pan2D: 0 rolloffMode: 0 BypassEffects: 0 @@ -254,6 +254,38 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &2164537724542407457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4419623447851182730} + m_Layer: 0 + m_Name: The nose of the ship + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4419623447851182730 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2164537724542407457} + m_LocalRotation: {x: 0.04784737, y: 0, z: 0, w: 0.9988547} + m_LocalPosition: {x: -3.604956e-10, y: -0.04199999, z: 0.0000000064964856} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 423716217393433059} + - {fileID: 5244199940950654577} + m_Father: {fileID: 466193471335400689} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 5.485, y: 0, z: 0} --- !u!1 &4842832433727734471 GameObject: m_ObjectHideFlags: 0 @@ -286,14 +318,14 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.2, y: 1.2, z: 1.2} m_Children: - - {fileID: 423716217393433059} - - {fileID: 5244199940950654577} - {fileID: 7907347339367252603} - {fileID: 2971476791112006726} - {fileID: 4850609737867207130} - {fileID: 7601319947069531998} - {fileID: 8959741715128658477} - {fileID: 3462596187218490730} + - {fileID: 4008330859979630010} + - {fileID: 4419623447851182730} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -412,12 +444,140 @@ MonoBehaviour: downThruster: {fileID: 1068741946064985028} leftThruster: {fileID: 5171549162979668503} rightThruster: {fileID: 2973290281285065710} + constantThruster: {fileID: 1425051701072469381} Rigid: m_InternalValue: {fileID: 7690357684576917884} Position: m_InternalValue: {x: 0, y: 0, z: 0} Rotation: m_InternalValue: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5343598605361821474 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4008330859979630010} + - component: {fileID: 1425051701072469381} + m_Layer: 0 + m_Name: Rear hummer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4008330859979630010 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5343598605361821474} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.05, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 466193471335400689} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!82 &1425051701072469381 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5343598605361821474} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: fd6071f6d3adec740b29c570131abc48, type: 3} + m_PlayOnAwake: 0 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 200 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 5 + Pan2D: 0 + rolloffMode: 0 + 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: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 --- !u!1 &5519769232018726471 GameObject: m_ObjectHideFlags: 0 @@ -444,10 +604,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5519769232018726471} m_LocalRotation: {x: 0.7071068, y: 0.7071068, z: -0, w: 0} - m_LocalPosition: {x: 0, y: 0.05, z: 0} - m_LocalScale: {x: 0.009999999, y: 0.5, z: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.009999999, y: 0.49999997, z: 0.5} m_Children: [] - m_Father: {fileID: 466193471335400689} + m_Father: {fileID: 4419623447851182730} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 90} --- !u!33 &148572632988572005 @@ -528,7 +688,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466193471335400689} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &1068741946064985028 AudioSource: @@ -550,8 +710,8 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 + MinDistance: 0.5 + MaxDistance: 3 Pan2D: 0 rolloffMode: 0 BypassEffects: 0 @@ -656,7 +816,7 @@ Transform: m_LocalScale: {x: 1.3, y: 0.75, z: 1.3} m_Children: [] m_Father: {fileID: 466193471335400689} - m_RootOrder: 7 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &2997112706144857248 MeshFilter: @@ -733,10 +893,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6798323056934780818} m_LocalRotation: {x: -0.7071068, y: 0.7071068, z: -0, w: 0} - m_LocalPosition: {x: 0, y: 0.05, z: 0} - m_LocalScale: {x: 0.009999999, y: 0.5, z: 0.5} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.009999999, y: 0.49999997, z: 0.5} m_Children: [] - m_Father: {fileID: 466193471335400689} + m_Father: {fileID: 4419623447851182730} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 180, z: -90} --- !u!33 &3373003453991299041 @@ -817,7 +977,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466193471335400689} - m_RootOrder: 3 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &4484667719457385744 AudioSource: @@ -839,8 +999,8 @@ AudioSource: SpatializePostEffects: 0 Priority: 128 DopplerLevel: 1 - MinDistance: 1 - MaxDistance: 500 + MinDistance: 0.5 + MaxDistance: 3 Pan2D: 0 rolloffMode: 0 BypassEffects: 0 @@ -945,7 +1105,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 466193471335400689} - m_RootOrder: 2 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!20 &654137743255344523 Camera: diff --git a/Assets/MyAssets/Gameplay/SpaceRock.prefab b/Assets/MyAssets/Gameplay/SpaceRock.prefab index 21cbc43..97cd968 100644 --- a/Assets/MyAssets/Gameplay/SpaceRock.prefab +++ b/Assets/MyAssets/Gameplay/SpaceRock.prefab @@ -15,6 +15,7 @@ GameObject: - component: {fileID: 2699543562704384561} - component: {fileID: 3152753110815222889} - component: {fileID: 6696899827814021267} + - component: {fileID: 766245253094752561} m_Layer: 0 m_Name: SpaceRock m_TagString: SpaceRock @@ -149,3 +150,99 @@ MonoBehaviour: PrefabHashGenerator: SpaceRock AlwaysReplicateAsRoot: 0 DontDestroyWithOwner: 0 +--- !u!82 &766245253094752561 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3332950033486320138} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: 3cfc4e75450b0a44685ea6c692e45db1, type: 3} + m_PlayOnAwake: 1 + m_Volume: 1 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 100 + DopplerLevel: 0.3 + MinDistance: 2 + MaxDistance: 100 + Pan2D: 0 + rolloffMode: 0 + 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: 1 + 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/MyAssets/Gameplay/Warp Tunnel/Warp tunnel.prefab b/Assets/MyAssets/Gameplay/Warp Tunnel/Warp tunnel.prefab index e5b723c..715a68a 100644 --- a/Assets/MyAssets/Gameplay/Warp Tunnel/Warp tunnel.prefab +++ b/Assets/MyAssets/Gameplay/Warp Tunnel/Warp tunnel.prefab @@ -32,6 +32,7 @@ Transform: - {fileID: 1185579609204741061} - {fileID: 1185579610754531410} - {fileID: 5753854654549524270} + - {fileID: 9187788526208623749} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -52,6 +53,7 @@ MonoBehaviour: - {fileID: 3932434413266864759} - {fileID: 3932434414271404512} - {fileID: 7583809222634481308} + - {fileID: 6442191322936802615} notInGameZSpeedScale: 0.0625 inGameZSpeedScale: 0.5 tunnelPieceMovementSpeed: 0 @@ -261,6 +263,73 @@ Transform: m_CorrespondingSourceObject: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} m_PrefabInstance: {fileID: 4949639757438643471} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5780375951896116206 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4597497845978526554} + m_Modifications: + - target: {fileID: 675337278326441689, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_Name + value: Tunnel tube (4) + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalPosition.z + value: 166.4 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} +--- !u!1 &6442191322936802615 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 675337278326441689, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + m_PrefabInstance: {fileID: 5780375951896116206} + m_PrefabAsset: {fileID: 0} +--- !u!4 &9187788526208623749 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3438939980421488491, guid: 9652d2677b6f4c548b22c7489ffccec9, type: 3} + m_PrefabInstance: {fileID: 5780375951896116206} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6944653857449287749 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index fe36628..91671e8 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -15,11 +15,11 @@ RenderSettings: m_ObjectHideFlags: 0 serializedVersion: 9 m_Fog: 1 - m_FogColor: {r: 0.043137256, g: 0.09803922, b: 0.1764706, a: 1} + m_FogColor: {r: 0.023985408, g: 0.05683936, b: 0.103773594, a: 1} m_FogMode: 3 - m_FogDensity: 0.02 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 + m_FogDensity: 0.01 + m_LinearFogStart: 30 + m_LinearFogEnd: 45 m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} diff --git a/Assets/Scenes/StartMenu.unity b/Assets/Scenes/StartMenu.unity index ee6012c..6c557c5 100644 --- a/Assets/Scenes/StartMenu.unity +++ b/Assets/Scenes/StartMenu.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_SkyboxMaterial: {fileID: 2100000, guid: fdf36f659eed7ce40abdfb5b748229fe, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_IndirectSpecularColor: {r: 0.035471812, g: 0.08209709, b: 0.14144045, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -618,89 +618,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &842505619 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 842505622} - - component: {fileID: 842505621} - - component: {fileID: 842505620} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &842505620 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 842505619} - m_Enabled: 1 ---- !u!20 &842505621 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 842505619} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.074092224, g: 0.07829746, b: 0.084905684, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &842505622 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 842505619} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.2986608, y: -0.4762237, z: -8.798296} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &900671904 @@ -1243,7 +1160,7 @@ RectTransform: - {fileID: 900671908} - {fileID: 1477550525} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -1736,5 +1653,62 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &4550561498464884882 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839918, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_Name + value: Camera Spinner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 710977f71965fae49899fed56a173f4c, type: 3} diff --git a/Assets/Scenes/TheLobby.unity b/Assets/Scenes/TheLobby.unity index 74c97dc..7185696 100644 --- a/Assets/Scenes/TheLobby.unity +++ b/Assets/Scenes/TheLobby.unity @@ -26,7 +26,7 @@ RenderSettings: m_AmbientIntensity: 1 m_AmbientMode: 0 m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0} + m_SkyboxMaterial: {fileID: 2100000, guid: fdf36f659eed7ce40abdfb5b748229fe, type: 2} m_HaloStrength: 0.5 m_FlareStrength: 1 m_FlareFadeSpeed: 3 @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1} + m_IndirectSpecularColor: {r: 0.035471812, g: 0.08209709, b: 0.14144045, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -184,7 +184,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &764093236 GameObject: @@ -518,7 +518,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1205667152 GameObject: @@ -787,89 +787,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1276996029} m_CullTransparentMesh: 1 ---- !u!1 &1425871000 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1425871003} - - component: {fileID: 1425871002} - - component: {fileID: 1425871001} - m_Layer: 0 - m_Name: Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1425871001 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1425871000} - m_Enabled: 1 ---- !u!20 &1425871002 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1425871000} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.1260235, g: 0.13571458, b: 0.1509434, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1425871003 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1425871000} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 584.7162, y: 328.64664, z: 57.002075} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1677149559 GameObject: m_ObjectHideFlags: 0 @@ -965,10 +882,67 @@ RectTransform: - {fileID: 1014648756} - {fileID: 1205667153} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &1929398796 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839917, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4550561499275839918, guid: 710977f71965fae49899fed56a173f4c, type: 3} + propertyPath: m_Name + value: Camera Spinner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 710977f71965fae49899fed56a173f4c, type: 3} diff --git a/Assets/Scripts/Game/GameController.cs b/Assets/Scripts/Game/GameController.cs index 5c2958f..40a5a6b 100644 --- a/Assets/Scripts/Game/GameController.cs +++ b/Assets/Scripts/Game/GameController.cs @@ -52,6 +52,9 @@ public class GameController: NetworkBehaviour public float minPointsBoxDelay; public float maxPointsBoxDelay; + [SerializeField] + private AudioSource pointsScoredAudioSource; + [Header("Other stuff")] @@ -237,6 +240,10 @@ public override void NetworkStart() isGameOver.Value = true; } } + else if (newValue > oldValue && m_ClientGameStarted) + { + pointsScoredAudioSource.Play(); + } }; } @@ -531,7 +538,7 @@ public void GainedPoint() { if (!isGameOver.Value) // if the game isn't over yet { - Score.Value += Random.Range(0.125f, 1f); // score 1 point! + Score.Value += Random.Range(0.06125f, 0.25f); // score anywhere between 1/16 and 1/4 point! } } } @@ -546,6 +553,10 @@ public void HitPointsBox() } Score.Value += 3; + if (Hitpoints.Value < DEFAULT_HITPOINTS) + { + Hitpoints.Value += 1; + } } @@ -578,7 +589,7 @@ public void GameOver() } - + public void DisplayGameOverText(string message) { diff --git a/Assets/Scripts/Game/PointsBox.cs b/Assets/Scripts/Game/PointsBox.cs index 9aedebd..9e1e731 100644 --- a/Assets/Scripts/Game/PointsBox.cs +++ b/Assets/Scripts/Game/PointsBox.cs @@ -162,7 +162,7 @@ public void FixedUpdate() if (IsServer) { - if (Rigid.Value.position.z <= -5) + if (Rigid.Value.position.z <= -10) { Yeet(); } diff --git a/Assets/Scripts/Game/Ship/ServerSpaceship.cs b/Assets/Scripts/Game/Ship/ServerSpaceship.cs index 6a43598..941be9d 100644 --- a/Assets/Scripts/Game/Ship/ServerSpaceship.cs +++ b/Assets/Scripts/Game/Ship/ServerSpaceship.cs @@ -29,6 +29,8 @@ public class ServerSpaceship: NetworkBehaviour public AudioSource rightThruster; + public AudioSource constantThruster; + //[SerializeField] private GameObject prefabPlayerShot; //[SerializeField] private GameObject playerShotSpawner; @@ -68,9 +70,10 @@ private void Start() Rigid.Value = rb; Position.Value = rb.position; Rotation.Value = rb.rotation; - gc = GameController.Singleton; - gc.isGameOver.OnValueChanged += OnGameOverChanged; } + gc = GameController.Singleton; + gc.isGameOver.OnValueChanged += OnGameOverChanged; + gc.hasGameStarted.OnValueChanged += OnGameStartedChanged; } // Start is called before the first frame update @@ -239,6 +242,14 @@ private void FixedUpdate() } } + + private void OnGameStartedChanged(bool hadItStarted, bool isItNowStarted) + { + if (isItNowStarted) + { + constantThruster.Play(); + } + } @@ -249,15 +260,12 @@ private void OnGameOverChanged(bool wasOver, bool isNowOver) if (IsServer) { currentThrusts.Clear(); - upThruster.Stop(); - downThruster.Stop(); - leftThruster.Stop(); - rightThruster.Stop(); } - } - else - { - + upThruster.Stop(); + downThruster.Stop(); + leftThruster.Stop(); + rightThruster.Stop(); + constantThruster.Stop(); } } diff --git a/Assets/Scripts/Game/SpaceRock/NetworkedSpaceRock.cs b/Assets/Scripts/Game/SpaceRock/NetworkedSpaceRock.cs index cba9e3d..614cc3f 100644 --- a/Assets/Scripts/Game/SpaceRock/NetworkedSpaceRock.cs +++ b/Assets/Scripts/Game/SpaceRock/NetworkedSpaceRock.cs @@ -195,7 +195,7 @@ public void FixedUpdate() if (IsServer) { - if (Rigid.Value.position.z <= -5) + if (Rigid.Value.position.z <= -10) { Yeet(true); } diff --git a/Assets/Scripts/Menus/LobbyControl.cs b/Assets/Scripts/Menus/LobbyControl.cs index 5448f33..81cb522 100644 --- a/Assets/Scripts/Menus/LobbyControl.cs +++ b/Assets/Scripts/Menus/LobbyControl.cs @@ -97,8 +97,11 @@ private void GenerateUserStatsForLobby() /// private void UpdateAndCheckPlayersInLobby() { +#if UNITY_EDITOR m_AllPlayersInLobby = m_ClientsInLobby.Count > 0; - //m_AllPlayersInLobby = m_ClientsInLobby.Count == 4; +#else + m_AllPlayersInLobby = m_ClientsInLobby.Count == 4; +#endif foreach (var clientLobbyStatus in m_ClientsInLobby) { diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 73c6ab4..72485c0 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -15,10 +15,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c0417050c072926337e38271427fb flags: 0 RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c761e1f033a25233c35243f280d7df7ee3d2cfb + value: 22424703114646680e0b0227036c78111b122b292926237e38271427fb flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c78111b122b292926237e38271427fb + value: 22424703114646680e0b0227036c761e1f033a25233c35243f280d7df7ee3d2cfb flags: 0 vcSharedLogLevel: value: 0d5e400f0650