diff --git a/Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg b/Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg new file mode 100644 index 0000000..544e55d Binary files /dev/null and b/Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg differ diff --git a/Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg.meta b/Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg.meta new file mode 100644 index 0000000..54d5235 --- /dev/null +++ b/Assets/Audio/Sfx/ZapSplat/LaserWithRecoveryEdited.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 97f46159a554a2241bc81ec959810a3c +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/GameObjects/Prefabs/LocalPlayer.prefab b/Assets/GameObjects/Prefabs/LocalPlayer.prefab index 1fcffe2..3bbe7a6 100644 --- a/Assets/GameObjects/Prefabs/LocalPlayer.prefab +++ b/Assets/GameObjects/Prefabs/LocalPlayer.prefab @@ -383,6 +383,14 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 344149233808046796, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: 7.566995e-10 + objectReference: {fileID: 0} + - target: {fileID: 344149233808046796, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.000000002386514 + objectReference: {fileID: 0} - target: {fileID: 379718841342258282, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 11 @@ -407,6 +415,18 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 763852477540987668, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: 2.3283064e-10 + objectReference: {fileID: 0} + - target: {fileID: 763852477540987668, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.004999999 + objectReference: {fileID: 0} + - target: {fileID: 763852477540987668, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -0.0000000032596281 + objectReference: {fileID: 0} - target: {fileID: 818818471439489480, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -423,6 +443,18 @@ PrefabInstance: propertyPath: m_Interpolate value: 1 objectReference: {fileID: 0} + - target: {fileID: 918157999893541890, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: 2.9103833e-10 + objectReference: {fileID: 0} + - target: {fileID: 918157999893541890, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.0050000013 + objectReference: {fileID: 0} + - target: {fileID: 918157999893541890, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: 8.1490725e-10 + objectReference: {fileID: 0} - target: {fileID: 1099499151032430613, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -459,10 +491,30 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 1474628001344880432, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: 8.731148e-10 + objectReference: {fileID: 0} + - target: {fileID: 1474628001344880432, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.005000002 + objectReference: {fileID: 0} + - target: {fileID: 1474628001344880432, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.0000000013969841 + objectReference: {fileID: 0} - target: {fileID: 1524001137958809340, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 1563834189630986886, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: 2.056404e-10 + objectReference: {fileID: 0} + - target: {fileID: 1563834189630986886, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: 2.9103833e-10 + objectReference: {fileID: 0} - target: {fileID: 1568822327050945942, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -475,6 +527,18 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 1732152866466499441, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: -0.0019999999 + objectReference: {fileID: 0} + - target: {fileID: 1732152866466499441, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.0000000029685907 + objectReference: {fileID: 0} + - target: {fileID: 1732152866466499441, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -2.3283064e-10 + objectReference: {fileID: 0} - target: {fileID: 1750646420088699038, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -551,10 +615,30 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 2679118590361571831, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.0000000016880222 + objectReference: {fileID: 0} + - target: {fileID: 2679118590361571831, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -6.9849193e-10 + objectReference: {fileID: 0} - target: {fileID: 2904155198995007701, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 2943941952033420351, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: -0.005 + objectReference: {fileID: 0} + - target: {fileID: 2943941952033420351, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.004999999 + objectReference: {fileID: 0} + - target: {fileID: 2943941952033420351, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -0.0000000017462298 + objectReference: {fileID: 0} - target: {fileID: 2977190612538258419, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -563,6 +647,14 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 3036392209998779077, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 4.3655746e-10 + objectReference: {fileID: 0} + - target: {fileID: 3036392209998779077, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -1.7462298e-10 + objectReference: {fileID: 0} - target: {fileID: 3039511818919854869, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -583,6 +675,18 @@ PrefabInstance: propertyPath: m_Interpolate value: 1 objectReference: {fileID: 0} + - target: {fileID: 3442013983275689255, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: -0.004 + objectReference: {fileID: 0} + - target: {fileID: 3442013983275689255, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.0049999994 + objectReference: {fileID: 0} + - target: {fileID: 3442013983275689255, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -6.9849193e-10 + objectReference: {fileID: 0} - target: {fileID: 3586172491057624631, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -595,6 +699,18 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 3754086060060195658, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: 0.0000000012001307 + objectReference: {fileID: 0} + - target: {fileID: 3754086060060195658, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.0069999946 + objectReference: {fileID: 0} + - target: {fileID: 3754086060060195658, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.0000000023283067 + objectReference: {fileID: 0} - target: {fileID: 3760897784048698022, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -603,6 +719,18 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 3838727570029787274, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: -1.9310109e-10 + objectReference: {fileID: 0} + - target: {fileID: 3838727570029787274, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.006999999 + objectReference: {fileID: 0} + - target: {fileID: 3838727570029787274, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -3.4924597e-10 + objectReference: {fileID: 0} - target: {fileID: 3941325531018882676, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -707,6 +835,18 @@ PrefabInstance: propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 5292418829868779564, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: 0.005000001 + objectReference: {fileID: 0} + - target: {fileID: 5292418829868779564, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.004999998 + objectReference: {fileID: 0} + - target: {fileID: 5292418829868779564, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -0.0000000016298145 + objectReference: {fileID: 0} - target: {fileID: 5494702265850733364, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -715,6 +855,14 @@ PrefabInstance: propertyPath: m_Interpolate value: 1 objectReference: {fileID: 0} + - target: {fileID: 5534018082305589581, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 4.947651e-10 + objectReference: {fileID: 0} + - target: {fileID: 5534018082305589581, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -2.910383e-11 + objectReference: {fileID: 0} - target: {fileID: 5541361429010640606, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -735,6 +883,18 @@ PrefabInstance: propertyPath: m_Interpolate value: 1 objectReference: {fileID: 0} + - target: {fileID: 5868304319878826749, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: -2.910383e-10 + objectReference: {fileID: 0} + - target: {fileID: 5868304319878826749, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.007999997 + objectReference: {fileID: 0} + - target: {fileID: 5868304319878826749, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.0009999977 + objectReference: {fileID: 0} - target: {fileID: 5904574347635162510, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -747,6 +907,18 @@ PrefabInstance: propertyPath: m_ApplyRootMotion value: 0 objectReference: {fileID: 0} + - target: {fileID: 6046999980401981001, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: 0.0000000012660166 + objectReference: {fileID: 0} + - target: {fileID: 6046999980401981001, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.007999996 + objectReference: {fileID: 0} + - target: {fileID: 6046999980401981001, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.0009999954 + objectReference: {fileID: 0} - target: {fileID: 6095352539050781205, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -763,10 +935,46 @@ PrefabInstance: propertyPath: m_Layer value: 15 objectReference: {fileID: 0} + - target: {fileID: 6509601673379624412, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: -6.7484507e-10 + objectReference: {fileID: 0} + - target: {fileID: 6509601673379624412, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.008999997 + objectReference: {fileID: 0} + - target: {fileID: 6509601673379624412, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: 8.731149e-11 + objectReference: {fileID: 0} + - target: {fileID: 6552276148513064138, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: 0.0039999993 + objectReference: {fileID: 0} + - target: {fileID: 6552276148513064138, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.0049999966 + objectReference: {fileID: 0} + - target: {fileID: 6552276148513064138, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -0.0000000012805685 + objectReference: {fileID: 0} - target: {fileID: 6607538649249053632, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 objectReference: {fileID: 0} + - target: {fileID: 6803535682218829847, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: -1.5825846e-10 + objectReference: {fileID: 0} + - target: {fileID: 6803535682218829847, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.008999998 + objectReference: {fileID: 0} + - target: {fileID: 6803535682218829847, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: -9.313226e-10 + objectReference: {fileID: 0} - target: {fileID: 6838127399383095326, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -779,6 +987,18 @@ PrefabInstance: propertyPath: m_Layer value: 11 objectReference: {fileID: 0} + - target: {fileID: 7073531434489355369, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.x + value: -1.5743856e-10 + objectReference: {fileID: 0} + - target: {fileID: 7073531434489355369, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.y + value: 0.007000001 + objectReference: {fileID: 0} + - target: {fileID: 7073531434489355369, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: m_ConnectedAnchor.z + value: 0.0000000013969839 + objectReference: {fileID: 0} - target: {fileID: 7078895688717378999, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 @@ -831,6 +1051,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7391558912774766619, guid: 0bffd92c46c257840806f5e957954800, type: 3} + propertyPath: RaygunClip + value: + objectReference: {fileID: 8300000, guid: 97f46159a554a2241bc81ec959810a3c, type: 3} - target: {fileID: 7421528823095581755, guid: 0bffd92c46c257840806f5e957954800, type: 3} propertyPath: m_Layer value: 10 diff --git a/Assets/Scripts/Players/Player.cs b/Assets/Scripts/Players/Player.cs index a53a77c..fb04f50 100644 --- a/Assets/Scripts/Players/Player.cs +++ b/Assets/Scripts/Players/Player.cs @@ -275,6 +275,7 @@ namespace NeonTea.Quakeball.Players { if (GameObject.FindObjectOfType() == null) { Debug.LogWarning("Player.Awake: There is no PhysicsSyncer in this scene! Some code will not work as expected."); } + LastShot = Time.time - Cooldown; } private void Update() {