From f56df7fc4889f114467df478ca667c201040a4e1 Mon Sep 17 00:00:00 2001 From: Karrar Date: Fri, 28 Feb 2025 21:25:08 +0300 Subject: [PATCH] Moved `PlayerSpawner` to `Netick.Samples` namespace. --- Netick/Editor/Netick.Unity.Editor.dll | Bin 64512 -> 64512 bytes Netick/Editor/Netick.Unity.Pro.Editor.dll | Bin 8192 -> 8192 bytes Netick/Editor/Unity.Netick.CodeGen.dll | Bin 24064 -> 24064 bytes Netick/Runtime/Netick.Unity.Pro.dll | Bin 18432 -> 18432 bytes Netick/Runtime/Netick.Unity.dll | Bin 136704 -> 136704 bytes Scripts/GameStarter.cs | 3 ++ Scripts/NetworkInfo.cs | 3 ++ Scripts/PlayerSpawner.cs | 62 ++++++++++++---------- package.json | 2 +- 9 files changed, 40 insertions(+), 30 deletions(-) diff --git a/Netick/Editor/Netick.Unity.Editor.dll b/Netick/Editor/Netick.Unity.Editor.dll index 5a1f64af2b997ffbda70ac44dac657c32b64fbef..0ab504abae8af87fe7b5b073fcf5d3efe0789541 100644 GIT binary patch delta 114 zcmZqp!QAkJc|r$^d*ks#8++~@WwhL!eQY6t z?_N#6Hre1!fWW_pl6(GE{&iWf;X+-;W2u746W)|6Kn0&XfC>UthfVe0xn9`j;$&s% M7pFI?zP-%{0I_;L#Q*>R delta 114 zcmZqp!QAkJc|r$^_P+Le8++~@Wwh9weQY6_*w!u KH>SvjWw diff --git a/Netick/Editor/Netick.Unity.Pro.Editor.dll b/Netick/Editor/Netick.Unity.Pro.Editor.dll index b242e2c6ccd0ce2d6b5af36d365da6378b617504..85f9df3efc218eab881e9f4646fbe60963e27f05 100644 GIT binary patch delta 105 zcmZp0XmFU&!SZUa==WG3{+4}wFhhp-a0J+yM AHUIzs diff --git a/Netick/Editor/Unity.Netick.CodeGen.dll b/Netick/Editor/Unity.Netick.CodeGen.dll index 9b95fa21ff195c732cdc512b5ecf0cb9099df922..b6c3a1b0f05e272515e6a925966299873046b214 100644 GIT binary patch delta 107 zcmZqJ!`QHgaY6^nQO6ZWHuik*6j-(8QfP?fVvi-RcV!uP7jtgz@p{0{(oz%CHMt-t zK)~3=B80_P*Rf4s@xcLQ_oI_91eGa31s}RW1wpF$UQGJ-BXZ|6o^ScWo6~}4aRC5{ CLM@m8 delta 107 zcmZqJ!`QHgaY6@6hUU_@8+$%@3d|GVzwqy*Cyo=^BifAhQZ{ey@p{0{V*VrWz~q9U z0D+73*A|AZf9gHO&}7R?PTi=<7lO(Zpn|)vKm~!S9X76=xHyhO`RSb>A)hv<1<&FF E001yG1^@s6 diff --git a/Netick/Runtime/Netick.Unity.Pro.dll b/Netick/Runtime/Netick.Unity.Pro.dll index 611f50bb67b3ba036cf10951e78d358eba7b1135..1719d27bf2388215a08780426a7061f0206c8804 100644 GIT binary patch delta 70 zcmZpez}PT>aY6@+@qtBM8+#^L3aqFIvd|HTcUpFR{fste*$JCaY6^nhW3;L8+#^L3LN)YJ?+f1-yYjqJS?6*(RjRB$Lb0zSb8#xg9)az IhrRjXj6} delta 121 zcmZoz!_lyYV?qZ@*pj>tjXhg?7*h@kn4d`9uwc?mzs?wD%MUC&_ia1G7$(YSu|51c z<6mW#DR!=(rbql{3=j}YVeFSnzT@8aJm9#M%vsCnJAO0fDL_Td&p|~&>QkC#TGd~C RKL1zGy_D^4e;9X30syYaHunGk diff --git a/Scripts/GameStarter.cs b/Scripts/GameStarter.cs index 57e1327..dbde984 100644 --- a/Scripts/GameStarter.cs +++ b/Scripts/GameStarter.cs @@ -5,6 +5,9 @@ using Network = Netick.Unity.Network; namespace Netick.Samples { + /// + /// This is a helper script for quick prototyping, used to start Netick. + /// [AddComponentMenu("Netick/Game Starter")] public class GameStarter : NetworkEventsListener { diff --git a/Scripts/NetworkInfo.cs b/Scripts/NetworkInfo.cs index 50f7be3..5f7badd 100644 --- a/Scripts/NetworkInfo.cs +++ b/Scripts/NetworkInfo.cs @@ -5,6 +5,9 @@ using Network = Netick.Unity.Network; namespace Netick.Samples { + /// + /// This is a helper script for quick prototyping, used to show useful network information of Netick. + /// [AddComponentMenu("Netick/Network Info")] public class NetworkInfo : NetworkEventsListener { diff --git a/Scripts/PlayerSpawner.cs b/Scripts/PlayerSpawner.cs index 065aee5..4e1430b 100644 --- a/Scripts/PlayerSpawner.cs +++ b/Scripts/PlayerSpawner.cs @@ -1,37 +1,41 @@ +using UnityEngine; using Netick; using Netick.Unity; -using UnityEngine; +using Network = Netick.Unity.Network; -/// -/// This is a helper script for quick prototyping, used to spawn/despawn a player prefab when a player (client or host) has connected/disconnected. -/// -[AddComponentMenu("Netick/Player Spawner")] -public class PlayerSpawner : NetworkEventsListener +namespace Netick.Samples { - public GameObject PlayerPrefab; - public Transform SpawnPosition; - public float HorizontalOffset = 5f; - public bool StaggerSpawns = true; - public bool DestroyPlayerObjectWhenLeaving = true; - - // This is called on the server when a player has connected. - public override void OnPlayerConnected(NetworkSandbox sandbox, Netick.NetworkPlayer client) + /// + /// This is a helper script for quick prototyping, used to spawn/despawn a player prefab when a player (client or host) has connected/disconnected. + /// + [AddComponentMenu("Netick/Player Spawner")] + public class PlayerSpawner : NetworkEventsListener { - var spawnPos = SpawnPosition.position; - if (StaggerSpawns) - spawnPos += (HorizontalOffset * Vector3.left) * (1 + sandbox.ConnectedPlayers.Count); - var player = sandbox.NetworkInstantiate(PlayerPrefab, spawnPos, SpawnPosition.rotation, client); - client.PlayerObject = player; - } + public GameObject PlayerPrefab; + public Transform SpawnPosition; + public float HorizontalOffset = 5f; + public bool StaggerSpawns = true; + public bool DestroyPlayerObjectWhenLeaving = true; - // This is called on the server when a player has disconnected. - public override void OnPlayerDisconnected(NetworkSandbox sandbox, Netick.NetworkPlayer client, TransportDisconnectReason transportDisconnectReason) - { - if (!DestroyPlayerObjectWhenLeaving) - return; + // This is called on the server when a player has connected. + public override void OnPlayerConnected(NetworkSandbox sandbox, Netick.NetworkPlayer client) + { + var spawnPos = SpawnPosition.position; + if (StaggerSpawns) + spawnPos += (HorizontalOffset * Vector3.left) * (1 + sandbox.ConnectedPlayers.Count); + var player = sandbox.NetworkInstantiate(PlayerPrefab, spawnPos, SpawnPosition.rotation, client); + client.PlayerObject = player; + } - var netObj = client.PlayerObject as NetworkObject; - if (netObj != null) - Sandbox.Destroy(netObj); + // This is called on the server when a player has disconnected. + public override void OnPlayerDisconnected(NetworkSandbox sandbox, Netick.NetworkPlayer client, TransportDisconnectReason transportDisconnectReason) + { + if (!DestroyPlayerObjectWhenLeaving) + return; + + var netObj = client.PlayerObject as NetworkObject; + if (netObj != null) + Sandbox.Destroy(netObj); + } } -} \ No newline at end of file +} diff --git a/package.json b/package.json index 1555fa6..f6c8ae2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "com.karrar.netick", - "version": "0.13.18", + "version": "0.13.19", "displayName": "Netick", "description": "A networking solution for Unity", "unity": "2021.3",