Backups/RAGECOOP-V
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed three players issue, some work on API and resources management.

Browse Source
This commit is contained in:
Sardelka
2022-06-06 17:37:11 +08:00
parent 0914afc4ed
commit a1dda2ffa4
28 changed files with 559 additions and 653 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Core/Logging/Logger.cs
View File

@ -74,7 +74,7 @@ namespace RageCoop.Core.Logging
if (LogLevel>4) { return; }
lock (Buffer)
{
string msg = string.Format("[{0}][{2}] [ERR] {1}", Date(),string.Join("\r\n",ex.Message,ex.StackTrace,ex.ToString()), Process.GetCurrentProcess().Id);
string msg = string.Format("[{0}][{2}] [ERR] {1}", Date(),"\r\n"+ex.ToString(), Process.GetCurrentProcess().Id);
Buffer+=msg+"\r\n";
}

34
Core/Packets/DownloadPackets.cs → Core/Packets/FilePackets.cs
View File

@ -6,13 +6,18 @@ using Lidgren.Network;
namespace RageCoop.Core
{
public enum FileType:byte
{
Resource=0,
Custom=1,
}
public partial class Packets
{
public class FileTransferRequest : Packet
{
public byte ID { get; set; }
public int ID { get; set; }
public string FileName { get; set; }
public string Name { get; set; }
public long FileLength { get; set; }
@ -24,10 +29,11 @@ namespace RageCoop.Core
List<byte> byteArray = new List<byte>();
// The ID from the download
byteArray.Add(ID);
byteArray.AddInt(ID);
// The name of the file
byte[] nameBytes = Encoding.UTF8.GetBytes(FileName);
byte[] nameBytes = Encoding.UTF8.GetBytes(Name);
byteArray.AddRange(BitConverter.GetBytes(nameBytes.Length));
byteArray.AddRange(nameBytes);
@ -46,29 +52,29 @@ namespace RageCoop.Core
#region NetIncomingMessageToPacket
BitReader reader = new BitReader(array);
ID = reader.ReadByte();
ID = reader.ReadInt();
int nameArrayLength = reader.ReadInt();
FileName = reader.ReadString(nameArrayLength);
Name = reader.ReadString(nameArrayLength);
FileLength = reader.ReadLong();
#endregion
}
}
public class FileTransferTick : Packet
public class FileTransferChunk : Packet
{
public byte ID { get; set; }
public int ID { get; set; }
public byte[] FileChunk { get; set; }
public override void Pack(NetOutgoingMessage message)
{
#region PacketToNetOutGoingMessage
message.Write((byte)PacketTypes.FileTransferTick);
message.Write((byte)PacketTypes.FileTransferChunk);
List<byte> byteArray = new List<byte>();
// The ID from the download
byteArray.Add(ID);
byteArray.AddInt(ID);
// The chunk of the file
byteArray.AddRange(BitConverter.GetBytes(FileChunk.Length));
@ -86,7 +92,7 @@ namespace RageCoop.Core
#region NetIncomingMessageToPacket
BitReader reader = new BitReader(array);
ID = reader.ReadByte();
ID = reader.ReadInt();
int chunkLength = reader.ReadInt();
FileChunk = reader.ReadByteArray(chunkLength);
#endregion
@ -95,7 +101,7 @@ namespace RageCoop.Core
public class FileTransferComplete : Packet
{
public byte ID { get; set; }
public int ID { get; set; }
public override void Pack(NetOutgoingMessage message)
{
@ -105,7 +111,7 @@ namespace RageCoop.Core
List<byte> byteArray = new List<byte>();
// The ID from the download
byteArray.Add(ID);
byteArray.AddInt(ID);
byte[] result = byteArray.ToArray();
@ -119,7 +125,7 @@ namespace RageCoop.Core
#region NetIncomingMessageToPacket
BitReader reader = new BitReader(array);
ID = reader.ReadByte();
ID = reader.ReadInt();
#endregion
}
}

61
Core/Packets/Packets.cs
View File

@ -123,13 +123,14 @@ namespace RageCoop.Core
ChatMessage=10,
NativeCall=11,
NativeResponse=12,
Mod=13,
//Mod=13,
CleanUpWorld=14,
FileTransferTick=15,
FileTransferChunk=15,
FileTransferRequest=16,
FileTransferComplete=17,
ServerClientEvent=18,
ServerClientEvent = 18,
#region Sync
#region INTERVAL
@ -236,58 +237,6 @@ namespace RageCoop.Core
public partial class Packets
{
public class Mod : Packet
{
public string Name { get; set; }
public byte CustomPacketID { get; set; }
public byte[] Bytes { get; set; }
public override void Pack(NetOutgoingMessage message)
{
#region PacketToNetOutGoingMessage
message.Write((byte)PacketTypes.Mod);
List<byte> byteArray = new List<byte>();
// Write Name
byte[] nameBytes = Encoding.UTF8.GetBytes(Name);
byteArray.AddRange(BitConverter.GetBytes(nameBytes.Length));
byteArray.AddRange(nameBytes);
// Write CustomPacketID
byteArray.Add(CustomPacketID);
// Write Bytes
byteArray.AddRange(BitConverter.GetBytes(Bytes.Length));
byteArray.AddRange(Bytes);
byte[] result = byteArray.ToArray();
message.Write(result.Length);
message.Write(result);
#endregion
}
public override void Unpack(byte[] array)
{
#region NetIncomingMessageToPacket
BitReader reader = new BitReader(array);
// Read Name
int nameLength = reader.ReadInt();
Name = reader.ReadString(nameLength);
// Read CustomPacketID
CustomPacketID = reader.ReadByte();
// Read Bytes
int bytesLength = reader.ReadInt();
Bytes = reader.ReadByteArray(bytesLength);
#endregion
}
}
public class ChatMessage : Packet
{