Skip to content
This repository has been archived by the owner on Dec 13, 2024. It is now read-only.

feat: update unity bomber example #26

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

feat: update unity bomber example #26

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion unity/tanks-fishnet/.dockerignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
**
!build/LinuxServer/
!builds/LinuxServer/
5 changes: 5 additions & 0 deletions unity/tanks-fishnet/.vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"recommendations": [
"visualstudiotoolsforunity.vstuc"
]
}
10 changes: 10 additions & 0 deletions unity/tanks-fishnet/.vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"version": "0.2.0",
"configurations": [
{
"name": "Attach to Unity",
"type": "vstuc",
"request": "attach"
}
]
}
105 changes: 52 additions & 53 deletions unity/tanks-fishnet/.vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,57 +1,56 @@
{
"files.exclude":
{
"**/.DS_Store":true,
"**/.git":true,
"**/.gitmodules":true,
"**/*.booproj":true,
"**/*.pidb":true,
"**/*.suo":true,
"**/*.user":true,
"**/*.userprefs":true,
"**/*.unityproj":true,
"**/*.dll":true,
"**/*.exe":true,
"**/*.pdf":true,
"**/*.mid":true,
"**/*.midi":true,
"**/*.wav":true,
"**/*.gif":true,
"**/*.ico":true,
"**/*.jpg":true,
"**/*.jpeg":true,
"**/*.png":true,
"**/*.psd":true,
"**/*.tga":true,
"**/*.tif":true,
"**/*.tiff":true,
"**/*.3ds":true,
"**/*.3DS":true,
"**/*.fbx":true,
"**/*.FBX":true,
"**/*.lxo":true,
"**/*.LXO":true,
"**/*.ma":true,
"**/*.MA":true,
"**/*.obj":true,
"**/*.OBJ":true,
"**/*.asset":true,
"**/*.cubemap":true,
"**/*.flare":true,
"**/*.mat":true,
"**/*.meta":true,
"**/*.prefab":true,
"**/*.unity":true,
"build/":true,
"Build/":true,
"Library/":true,
"library/":true,
"obj/":true,
"Obj/":true,
"ProjectSettings/":true,
"temp/":true,
"Temp/":true
"files.exclude": {
"**/.DS_Store": true,
"**/.git": true,
"**/.gitmodules": true,
"**/*.booproj": true,
"**/*.pidb": true,
"**/*.suo": true,
"**/*.user": true,
"**/*.userprefs": true,
"**/*.unityproj": true,
"**/*.dll": true,
"**/*.exe": true,
"**/*.pdf": true,
"**/*.mid": true,
"**/*.midi": true,
"**/*.wav": true,
"**/*.gif": true,
"**/*.ico": true,
"**/*.jpg": true,
"**/*.jpeg": true,
"**/*.png": true,
"**/*.psd": true,
"**/*.tga": true,
"**/*.tif": true,
"**/*.tiff": true,
"**/*.3ds": true,
"**/*.3DS": true,
"**/*.fbx": true,
"**/*.FBX": true,
"**/*.lxo": true,
"**/*.LXO": true,
"**/*.ma": true,
"**/*.MA": true,
"**/*.obj": true,
"**/*.OBJ": true,
"**/*.asset": true,
"**/*.cubemap": true,
"**/*.flare": true,
"**/*.mat": true,
"**/*.meta": true,
"**/*.prefab": true,
"**/*.unity": true,
"build/": true,
"Build/": true,
"Library/": true,
"library/": true,
"obj/": true,
"Obj/": true,
"ProjectSettings/": true,
"temp/": true,
"Temp/": true
},
"dotnet.defaultSolution": "Assets/FishNet/CodeGenerating/cecil-0.11.4/Mono.Cecil.sln",
"dotnet.defaultSolution": "tanks-fishnet.sln",
"cmake.sourceDirectory": "C:/Users/micro/Unity Projects/example-tanks-unity-mirror/Library/PackageCache/[email protected]/Editor/COMIntegration/COMIntegration~"
}
72 changes: 0 additions & 72 deletions ...tanks-fishnet/Assets/FishNet/Plugins/CodeAnalysis/FishNet.CodeAnalysis.Analyzers.dll.meta
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions unity/tanks-fishnet/Assets/FishNet/Plugins/CodeAnalysis/FishNet.CodeAnalysis.dll.meta
View file
Open in desktop

This file was deleted.

34 changes: 17 additions & 17 deletions ...anks-fishnet/Assets/FishNet/Runtime/Transporting/Transports/Tugboat/LiteNetLib/NetPeer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ namespace LiteNetLib
[Flags]
public enum ConnectionState : byte
{
Outgoing = 1 << 1,
Connected = 1 << 2,
Outgoing = 1 << 1,
Connected = 1 << 2,
ShutdownRequested = 1 << 3,
Disconnected = 1 << 4,
EndPointChange = 1 << 5,
Disconnected = 1 << 4,
EndPointChange = 1 << 5,
Any = Outgoing | Connected | ShutdownRequested | EndPointChange
}

Expand Down Expand Up @@ -161,7 +161,7 @@ private class IncomingFragments
/// <summary>
/// Current one-way ping (RTT/2) in milliseconds
/// </summary>
public int Ping => _avgRtt/2;
public int Ping => _avgRtt / 2;

/// <summary>
/// Round trip time in milliseconds
Expand Down Expand Up @@ -212,7 +212,7 @@ internal NetPeer(NetManager netManager, IPEndPoint remoteEndPoint, int id)
_connectionState = ConnectionState.Connected;
_mergeData = new NetPacket(PacketProperty.Merged, NetConstants.MaxPacketSize);
_pongPacket = new NetPacket(PacketProperty.Pong, 0);
_pingPacket = new NetPacket(PacketProperty.Ping, 0) {Sequence = 1};
_pingPacket = new NetPacket(PacketProperty.Ping, 0) { Sequence = 1 };

_unreliableChannel = new Queue<NetPacket>();
_holdedFragments = new Dictionary<ushort, IncomingFragments>();
Expand Down Expand Up @@ -268,7 +268,7 @@ private void OverrideMtu(int mtuValue)
public int GetPacketsCountInReliableQueue(byte channelNumber, bool ordered)
{
int idx = channelNumber * NetConstants.ChannelTypeCount +
(byte) (ordered ? DeliveryMethod.ReliableOrdered : DeliveryMethod.ReliableUnordered);
(byte)(ordered ? DeliveryMethod.ReliableOrdered : DeliveryMethod.ReliableUnordered);
var channel = _channels[idx];
return channel != null ? ((ReliableChannel)channel).PacketsInQueue : 0;
}
Expand Down Expand Up @@ -312,7 +312,7 @@ public void SendPooledPacket(PooledPacket packet, int userDataSize)
}
else
{
lock(_unreliableChannel)
lock (_unreliableChannel)
_unreliableChannel.Enqueue(packet._packet);
}
}
Expand Down Expand Up @@ -626,7 +626,7 @@ private void Send_Internal(

ushort currentFragmentId = (ushort)Interlocked.Increment(ref _fragmentId);

for(ushort partIdx = 0; partIdx < totalPackets; partIdx++)
for (ushort partIdx = 0; partIdx < totalPackets; partIdx++)
{
int sendLength = length > packetDataSize ? packetDataSize : length;

Expand Down Expand Up @@ -654,7 +654,7 @@ private void Send_Internal(

if (channel == null) //unreliable
{
lock(_unreliableChannel)
lock (_unreliableChannel)
_unreliableChannel.Enqueue(packet);
}
else
Expand Down Expand Up @@ -861,7 +861,7 @@ internal ShutdownResult Shutdown(byte[] data, int start, int length, bool force)
Interlocked.Exchange(ref _timeSinceLastPacket, 0);

//send shutdown packet
_shutdownPacket = new NetPacket(PacketProperty.Disconnect, length) {ConnectionNumber = _connectNum};
_shutdownPacket = new NetPacket(PacketProperty.Disconnect, length) { ConnectionNumber = _connectNum };
FastBitConverter.GetBytes(_shutdownPacket.RawData, 1, _connectTime);
if (_shutdownPacket.Size >= _mtu)
{
Expand All @@ -883,7 +883,7 @@ private void UpdateRoundTripTime(int roundTripTime)
{
_rtt += roundTripTime;
_rttCount++;
_avgRtt = _rtt/_rttCount;
_avgRtt = _rtt / _rttCount;
_resendDelay = 25.0 + _avgRtt * 2.1; // 25 ms + double rtt
}

Expand Down Expand Up @@ -939,7 +939,7 @@ internal void AddReliablePacket(DeliveryMethod method, NetPacket p)
var fragment = fragments[i];
int writtenSize = fragment.Size - NetConstants.FragmentedHeaderTotalSize;

if (pos+writtenSize > resultingPacket.RawData.Length)
if (pos + writtenSize > resultingPacket.RawData.Length)
{
_holdedFragments.Remove(packetFragId);
NetDebug.WriteError("Fragment error pos: {0} >= resultPacketSize: {1} , totalSize: {2}",
Expand Down Expand Up @@ -1003,15 +1003,15 @@ private void ProcessMtuPacket(NetPacket packet)
packet.Property = PacketProperty.MtuOk;
NetManager.SendRawAndRecycle(packet, _remoteEndPoint);
}
else if(receivedMtu > _mtu && !_finishMtu) //MtuOk
else if (receivedMtu > _mtu && !_finishMtu) //MtuOk
{
//invalid packet
if (receivedMtu != NetConstants.PossibleMtu[_mtuIdx + 1] - NetManager.ExtraPacketSizeForLayer)
return;

lock (_mtuMutex)
{
SetMtu(_mtuIdx+1);
SetMtu(_mtuIdx + 1);
}
//if maxed - finish.
if (_mtuIdx == NetConstants.PossibleMtu.Length - 1)
Expand Down Expand Up @@ -1073,7 +1073,7 @@ internal ConnectRequestResult ProcessConnectRequest(NetConnectRequestPacket conn
{
var remoteBytes = _remoteEndPoint.Serialize();
var localBytes = connRequest.TargetAddress;
for (int i = remoteBytes.Size-1; i >= 0; i--)
for (int i = remoteBytes.Size - 1; i >= 0; i--)
{
byte rb = remoteBytes[i];
if (rb == localBytes[i])
Expand Down Expand Up @@ -1173,7 +1173,7 @@ internal void ProcessPacket(NetPacket packet)
{
_pingTimer.Stop();
int elapsedMs = (int)_pingTimer.ElapsedMilliseconds;
_remoteDelta = BitConverter.ToInt64(packet.RawData, 3) + (elapsedMs * TimeSpan.TicksPerMillisecond ) / 2 - DateTime.UtcNow.Ticks;
_remoteDelta = BitConverter.ToInt64(packet.RawData, 3) + (elapsedMs * TimeSpan.TicksPerMillisecond) / 2 - DateTime.UtcNow.Ticks;
UpdateRoundTripTime(elapsedMs);
NetManager.ConnectionLatencyUpdated(this, elapsedMs / 2);
NetDebug.Write("[PP]Ping: {0} - {1} - {2}", packet.Sequence, elapsedMs, _remoteDelta);
Expand Down
Loading