From ed677a9419fe4540d3a5e55c5cbb5f6801d2ac07 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Thu, 9 May 2024 15:20:22 +0200 Subject: [PATCH] chore: tweaked the projectile volume, enabled firing again, changed the F3D object pool and sounds to consume less space in the scene --- .../F3DPoolManagerCache/WeaponRange.asset | 6 +- Assets/Scenes/FreeFlyArena.unity | 111 +++++++++--------- Assets/Scripts/Ship.cs | 4 +- 3 files changed, 61 insertions(+), 60 deletions(-) diff --git a/Assets/FORGE3D/Resources/F3DPoolManagerCache/WeaponRange.asset b/Assets/FORGE3D/Resources/F3DPoolManagerCache/WeaponRange.asset index 8e2fbdc..e5668e9 100644 --- a/Assets/FORGE3D/Resources/F3DPoolManagerCache/WeaponRange.asset +++ b/Assets/FORGE3D/Resources/F3DPoolManagerCache/WeaponRange.asset @@ -44,15 +44,15 @@ MonoBehaviour: - {fileID: 400000, guid: 9eeb3f92e3355994db8dc67cb3ea8ba0, type: 3} - {fileID: 400002, guid: 0072b525437a5ed4891ebd255ec94fe6, type: 3} - {fileID: 6391351660618465683, guid: f1d6be8fd7d5cc6448b99caa0671e56f, type: 3} - poolLength: 32000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000f40100003200000032000000 + poolLength: 05000000050000000500000005000000050000000500000005000000050000000500000005000000050000000500000005000000050000000500000005000000050000000500000005000000050000000500000005000000050000000500000005000000320000000500000005000000 poolLengthMax: 32000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000320000003200000032000000f40100003200000032000000 broadcastSpawnName: OnSpawned broadcastDespawnName: OnDespawned delayedSpawnInInstall: 0 objectsPerUpdate: 5 needBroadcasting: 1 - optimizeSpawn: 0 - targetFPS: 50 + optimizeSpawn: 1 + targetFPS: 60 pooling: 1 needSort: 0 needParenting: 0 diff --git a/Assets/Scenes/FreeFlyArena.unity b/Assets/Scenes/FreeFlyArena.unity index 16d373f..69f51b4 100644 --- a/Assets/Scenes/FreeFlyArena.unity +++ b/Assets/Scenes/FreeFlyArena.unity @@ -1274,42 +1274,43 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: audioSource: {fileID: 400000, guid: 9eeb3f92e3355994db8dc67cb3ea8ba0, type: 3} + volumeRange: {x: 0.2, y: 0.25} 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} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + vulcanShot: {fileID: 0} 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} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + soloGunShot: {fileID: 0} 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} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + sniperShot: {fileID: 0} 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} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + shotGunShot: {fileID: 0} shotGunDelay: 0.1 shotGunHitDelay: 0.05 seekerHit: @@ -1320,41 +1321,41 @@ MonoBehaviour: 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} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + railgunShot: {fileID: 0} 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} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + plasmagunShot: {fileID: 0} 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} + plasmabeamOpen: {fileID: 0} + plasmabeamLoop: {fileID: 0} + plasmabeamClose: {fileID: 0} + plasmabeamHeavyOpen: {fileID: 0} + plasmabeamHeavyLoop: {fileID: 0} + plasmabeamHeavyClose: {fileID: 0} + lightningGunOpen: {fileID: 0} + lightningGunLoop: {fileID: 0} + lightningGunClose: {fileID: 0} + flameGunOpen: {fileID: 0} + flameGunLoop: {fileID: 0} + flameGunClose: {fileID: 0} 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} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + laserImpulseShot: {fileID: 0} laserImpulseDelay: 0.1 laserImpulseHitDelay: 0.1 --- !u!114 &1737972890 diff --git a/Assets/Scripts/Ship.cs b/Assets/Scripts/Ship.cs index cbff8a6..e778370 100644 --- a/Assets/Scripts/Ship.cs +++ b/Assets/Scripts/Ship.cs @@ -114,14 +114,14 @@ public class Ship : NetworkBehaviour if (!isFiring && state.shootInput == 1) { isFiring = true; - //fireController.Fire(); + fireController.Fire(); } // Stop firing if (isFiring && state.shootInput < 1) { isFiring = false; - //fireController.Stop(); + fireController.Stop(); } }