Fixed ReadByteArray serialize error.

zestyroad · zestyroad · commit fc87d548ef38 · 2020-12-09T16:55:10.000+09:00
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/Editor/EuNet.Editor.asmdef b/sandbox/Dev/Client/Assets/Plugins/EuNet/Editor/EuNet.Editor.asmdef
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/Editor/EuNet.Editor.asmdef.meta b/sandbox/Dev/Client/Assets/Plugins/EuNet/Editor/EuNet.Editor.asmdef.meta
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/Editor/ExecutionOrderManager.cs b/sandbox/Dev/Client/Assets/Plugins/EuNet/Editor/ExecutionOrderManager.cs
diff --git a/sandbox/Dev/Client/Assets/Plugins/EuNet/Editor/NetViewHandler.cs b/sandbox/Dev/Client/Assets/Plugins/EuNet/Editor/NetViewHandler.cs
diff --git a/src/EuNet.Core/Packet/NetDataBufferReader.cs b/src/EuNet.Core/Packet/NetDataBufferReader.cs
@@ -16,7 +16,7 @@ public NetDataBufferReader(NetDataReader reader)
 
             _data = NetPool.BufferPool.Alloc(size);
 
-            reader.ReadBytesOnlyData(_data, size);
+            reader.ReadByteArrayOnlyData(_data, size);
 
             _endOffset = size;
             _offset = 0;
diff --git a/src/EuNet.Core/Packet/NetDataReader.cs b/src/EuNet.Core/Packet/NetDataReader.cs
@@ -246,7 +246,7 @@ public IPEndPoint ReadIPEndPoint()
         {
             var addressLen = ReadByte();
             byte[] addressBytes = new byte[addressLen];
-            ReadBytesOnlyData(addressBytes, addressLen);
+            ReadByteArrayOnlyData(addressBytes, addressLen);
             var port = ReadInt32();
             return new IPEndPoint(new IPAddress(addressBytes), port);
         }
@@ -266,7 +266,7 @@ public TimeSpan ReadTimeSpan()
         public Guid ReadGuid()
         {
             byte count = ReadByte();
-            var bytes = ReadBytes(count);
+            var bytes = ReadByteArray(count);
             return new Guid(bytes);
         }
 
@@ -438,7 +438,7 @@ public byte[] ReadRemainingBytes()
             return outgoingData;
         }
 
-        public byte[] ReadBytes(int count)
+        public byte[] ReadByteArray(int count)
         {
             var value = new byte[count];
             Buffer.BlockCopy(_data, _position, value, 0, count);
@@ -447,7 +447,7 @@ public byte[] ReadBytes(int count)
             return value;
         }
 
-        public byte[] ReadBytes()
+        public byte[] ReadByteArray()
         {
             int length = ReadInt32();
             byte[] outgoingData = new byte[length];
@@ -456,19 +456,19 @@ public byte[] ReadBytes()
             return outgoingData;
         }
 
-        public void ReadBytesOnlyData(byte[] destination, int start, int count)
+        public void ReadByteArrayOnlyData(byte[] destination, int start, int count)
         {
             Buffer.BlockCopy(_data, _position, destination, start, count);
             _position += count;
         }
 
-        public void ReadBytesOnlyData(byte[] destination, int count)
+        public void ReadByteArrayOnlyData(byte[] destination, int count)
         {
             Buffer.BlockCopy(_data, _position, destination, 0, count);
             _position += count;
         }
 
-        public sbyte[] ReadSBytes()
+        public sbyte[] ReadSByteArray()
         {
             int length = ReadInt32();
             sbyte[] outgoingData = new sbyte[length];
diff --git a/src/EuNet.Core/Serializer/Formatter/CollectionFormatter.cs b/src/EuNet.Core/Serializer/Formatter/CollectionFormatter.cs
@@ -82,7 +82,7 @@ public void Serialize(NetDataWriter writer, ArraySegment<byte> value, NetDataSer
 
         public ArraySegment<byte> Deserialize(NetDataReader reader, NetDataSerializerOptions options)
         {
-            return new ArraySegment<byte>(reader.ReadBytes().ToArray());
+            return new ArraySegment<byte>(reader.ReadByteArray().ToArray());
         }
     }
 
diff --git a/src/EuNet.Core/Serializer/Formatter/StandardFormatter.cs b/src/EuNet.Core/Serializer/Formatter/StandardFormatter.cs
@@ -18,7 +18,7 @@ public void Serialize(NetDataWriter writer, byte[] value, NetDataSerializerOptio
 
         public byte[] Deserialize(NetDataReader reader, NetDataSerializerOptions options)
         {
-            return reader.ReadBytes();
+            return reader.ReadByteArray();
         }
     }
 
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Packet/NetDataBufferReader.cs b/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Packet/NetDataBufferReader.cs
@@ -16,7 +16,7 @@ public NetDataBufferReader(NetDataReader reader)
 
             _data = NetPool.BufferPool.Alloc(size);
 
-            reader.ReadBytesOnlyData(_data, size);
+            reader.ReadByteArrayOnlyData(_data, size);
 
             _endOffset = size;
             _offset = 0;
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Packet/NetDataReader.cs b/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Packet/NetDataReader.cs
@@ -246,7 +246,7 @@ public IPEndPoint ReadIPEndPoint()
         {
             var addressLen = ReadByte();
             byte[] addressBytes = new byte[addressLen];
-            ReadBytesOnlyData(addressBytes, addressLen);
+            ReadByteArrayOnlyData(addressBytes, addressLen);
             var port = ReadInt32();
             return new IPEndPoint(new IPAddress(addressBytes), port);
         }
@@ -266,7 +266,7 @@ public TimeSpan ReadTimeSpan()
         public Guid ReadGuid()
         {
             byte count = ReadByte();
-            var bytes = ReadBytes(count);
+            var bytes = ReadByteArray(count);
             return new Guid(bytes);
         }
 
@@ -438,7 +438,7 @@ public byte[] ReadRemainingBytes()
             return outgoingData;
         }
 
-        public byte[] ReadBytes(int count)
+        public byte[] ReadByteArray(int count)
         {
             var value = new byte[count];
             Buffer.BlockCopy(_data, _position, value, 0, count);
@@ -447,7 +447,7 @@ public byte[] ReadBytes(int count)
             return value;
         }
 
-        public byte[] ReadBytes()
+        public byte[] ReadByteArray()
         {
             int length = ReadInt32();
             byte[] outgoingData = new byte[length];
@@ -456,19 +456,19 @@ public byte[] ReadBytes()
             return outgoingData;
         }
 
-        public void ReadBytesOnlyData(byte[] destination, int start, int count)
+        public void ReadByteArrayOnlyData(byte[] destination, int start, int count)
         {
             Buffer.BlockCopy(_data, _position, destination, start, count);
             _position += count;
         }
 
-        public void ReadBytesOnlyData(byte[] destination, int count)
+        public void ReadByteArrayOnlyData(byte[] destination, int count)
         {
             Buffer.BlockCopy(_data, _position, destination, 0, count);
             _position += count;
         }
 
-        public sbyte[] ReadSBytes()
+        public sbyte[] ReadSByteArray()
         {
             int length = ReadInt32();
             sbyte[] outgoingData = new sbyte[length];
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Serializer/Formatter/CollectionFormatter.cs b/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Serializer/Formatter/CollectionFormatter.cs
@@ -82,7 +82,7 @@ public void Serialize(NetDataWriter writer, ArraySegment<byte> value, NetDataSer
 
         public ArraySegment<byte> Deserialize(NetDataReader reader, NetDataSerializerOptions options)
         {
-            return new ArraySegment<byte>(reader.ReadBytes().ToArray());
+            return new ArraySegment<byte>(reader.ReadByteArray().ToArray());
         }
     }
 
diff --git a/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Serializer/Formatter/StandardFormatter.cs b/src/EuNet.Unity/Assets/Plugins/EuNet/Runtime/EuNet.Core/Serializer/Formatter/StandardFormatter.cs
@@ -18,7 +18,7 @@ public void Serialize(NetDataWriter writer, byte[] value, NetDataSerializerOptio
 
         public byte[] Deserialize(NetDataReader reader, NetDataSerializerOptions options)
         {
-            return reader.ReadBytes();
+            return reader.ReadByteArray();
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -246,7 +246,7 @@ public IPEndPoint ReadIPEndPoint()`
`246`	`246`	`{`
`247`	`247`	`var addressLen = ReadByte();`
`248`	`248`	`byte[] addressBytes = new byte[addressLen];`
`249`		`- ReadBytesOnlyData(addressBytes, addressLen);`
	`249`	`+ ReadByteArrayOnlyData(addressBytes, addressLen);`
`250`	`250`	`var port = ReadInt32();`
`251`	`251`	`return new IPEndPoint(new IPAddress(addressBytes), port);`
`252`	`252`	`}`
`@@ -266,7 +266,7 @@ public TimeSpan ReadTimeSpan()`
`266`	`266`	`public Guid ReadGuid()`
`267`	`267`	`{`
`268`	`268`	`byte count = ReadByte();`
`269`		`- var bytes = ReadBytes(count);`
	`269`	`+ var bytes = ReadByteArray(count);`
`270`	`270`	`return new Guid(bytes);`
`271`	`271`	`}`
`272`	`272`
`@@ -438,7 +438,7 @@ public byte[] ReadRemainingBytes()`
`438`	`438`	`return outgoingData;`
`439`	`439`	`}`
`440`	`440`
`441`		`- public byte[] ReadBytes(int count)`
	`441`	`+ public byte[] ReadByteArray(int count)`
`442`	`442`	`{`
`443`	`443`	`var value = new byte[count];`
`444`	`444`	`Buffer.BlockCopy(_data, _position, value, 0, count);`
`@@ -447,7 +447,7 @@ public byte[] ReadBytes(int count)`
`447`	`447`	`return value;`
`448`	`448`	`}`
`449`	`449`
`450`		`- public byte[] ReadBytes()`
	`450`	`+ public byte[] ReadByteArray()`
`451`	`451`	`{`
`452`	`452`	`int length = ReadInt32();`
`453`	`453`	`byte[] outgoingData = new byte[length];`
`@@ -456,19 +456,19 @@ public byte[] ReadBytes()`
`456`	`456`	`return outgoingData;`
`457`	`457`	`}`
`458`	`458`
`459`		`- public void ReadBytesOnlyData(byte[] destination, int start, int count)`
	`459`	`+ public void ReadByteArrayOnlyData(byte[] destination, int start, int count)`
`460`	`460`	`{`
`461`	`461`	`Buffer.BlockCopy(_data, _position, destination, start, count);`
`462`	`462`	`_position += count;`
`463`	`463`	`}`
`464`	`464`
`465`		`- public void ReadBytesOnlyData(byte[] destination, int count)`
	`465`	`+ public void ReadByteArrayOnlyData(byte[] destination, int count)`
`466`	`466`	`{`
`467`	`467`	`Buffer.BlockCopy(_data, _position, destination, 0, count);`
`468`	`468`	`_position += count;`
`469`	`469`	`}`
`470`	`470`
`471`		`- public sbyte[] ReadSBytes()`
	`471`	`+ public sbyte[] ReadSByteArray()`
`472`	`472`	`{`
`473`	`473`	`int length = ReadInt32();`
`474`	`474`	`sbyte[] outgoingData = new sbyte[length];`
Original file line number	Diff line number	Diff line change
`@@ -82,7 +82,7 @@ public void Serialize(NetDataWriter writer, ArraySegment<byte> value, NetDataSer`
`82`	`82`
`83`	`83`	`public ArraySegment<byte> Deserialize(NetDataReader reader, NetDataSerializerOptions options)`
`84`	`84`	`{`
`85`		`- return new ArraySegment<byte>(reader.ReadBytes().ToArray());`
	`85`	`+ return new ArraySegment<byte>(reader.ReadByteArray().ToArray());`
`86`	`86`	`}`
`87`	`87`	`}`
`88`	`88`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ public void Serialize(NetDataWriter writer, byte[] value, NetDataSerializerOptio`
`18`	`18`
`19`	`19`	`public byte[] Deserialize(NetDataReader reader, NetDataSerializerOptions options)`
`20`	`20`	`{`
`21`		`- return reader.ReadBytes();`
	`21`	`+ return reader.ReadByteArray();`
`22`	`22`	`}`
`23`	`23`	`}`
`24`	`24`