* misc

3 files changed, 15 insertions, 20 deletions

diff --git a/MultiplayerToolkit/Assets/MultiplayerToolkit/Backend/Wrap/NetServer.cs b/MultiplayerToolkit/Assets/MultiplayerToolkit/Backend/Wrap/NetServer.cs
index 8cd94ad..d8f60fc 100644
--- a/MultiplayerToolkit/Assets/MultiplayerToolkit/Backend/Wrap/NetServer.cs
+++ b/MultiplayerToolkit/Assets/MultiplayerToolkit/Backend/Wrap/NetServer.cs
@@ -23,7 +23,7 @@ namespace MultiplayerToolkit.Backend.Wrap
     {
         public static int RECEIVE_BUFFER_SIZE = 4096;
 
-        public Action<byte[], int> onReceiveData;
+        public Action<byte[], int> onReceiveTcpData;
 
         private TcpClient m_TcpClient;
         private NetworkStream m_TcpStream;
@@ -88,7 +88,10 @@ namespace MultiplayerToolkit.Backend.Wrap
             while (true)
             {
                 int length = await m_TcpStream.ReadAsync(receiveBuffer, 0, RECEIVE_BUFFER_SIZE);
-                OnReceiveData(receiveBuffer, length);
+                if (onReceiveTcpData != null)
+                {
+                    onReceiveTcpData(receiveBuffer, length);
+                }
             }
         }
 
@@ -124,14 +127,6 @@ namespace MultiplayerToolkit.Backend.Wrap
             }
         }
 
-        private void OnReceiveData(byte[] data, int length)
-        {
-            if(onReceiveData != null)
-            {
-                onReceiveData(data, length);
-            }
-        }
-
         public void SendData(byte[] data, int offset, int length, ESendOption option = ESendOption.Reliable)
         {
             if (option == ESendOption.Reliable)
diff --git a/MultiplayerToolkit/Assets/MultiplayerToolkit/Test/TestNetObject/TestNetObjectServer.cs b/MultiplayerToolkit/Assets/MultiplayerToolkit/Test/TestNetObject/TestNetObjectServer.cs
index c0d9e99..388d3cd 100644
--- a/MultiplayerToolkit/Assets/MultiplayerToolkit/Test/TestNetObject/TestNetObjectServer.cs
+++ b/MultiplayerToolkit/Assets/MultiplayerToolkit/Test/TestNetObject/TestNetObjectServer.cs
@@ -34,11 +34,11 @@ public class TestNetObjectServer : MonoBehaviour
 
         public int id;
 
-        public NetMember member;
+        public NetMember net;
 
         public Player()
         {
-            member = new NetMember();
+            net = new NetMember();
             this.id = Interlocked.Increment(ref IdCount);
         }
     }
@@ -69,8 +69,8 @@ public class TestNetObjectServer : MonoBehaviour
     {
         //TestReceive(client);
         Player player = new Player();
-        player.member.BindTcpClient(client);
-        player.member.onReceiveData += OnRecvData;
+        player.net.BindTcpClient(client);
+        player.net.onReceiveTcpData += OnRecvTcpData;
         playerList.Add(player);
 
         // welcome 
@@ -78,10 +78,10 @@ public class TestNetObjectServer : MonoBehaviour
         hello.WriteUshort((ushort)EMsgID.Hello); 
         hello.WriteInt((int)player.id);
         hello.InsertLength();
-        player.member.SendData(hello.ToArray(), 0, hello.writeBufferLength, ESendOption.Reliable);
+        player.net.SendData(hello.ToArray(), 0, hello.writeBufferLength, ESendOption.Reliable);
     }
 
-    private void OnRecvData(byte[] data, int len)
+    private void OnRecvTcpData(byte[] data, int len)
     {
         Packet packet = Packet.GetReadablePacket(data, 0, len);
         HandleMessage(packet, null);
@@ -91,7 +91,7 @@ public class TestNetObjectServer : MonoBehaviour
     {
         for (int i = 0; i < playerList.Count; ++i)
         {
-            playerList[i].member.SendData(packet.ToArray(), 0, packet.GetWritableBufferLength(), option);
+            playerList[i].net.SendData(packet.ToArray(), 0, packet.GetWritableBufferLength(), option);
         }
     }
 
@@ -125,7 +125,7 @@ public class TestNetObjectServer : MonoBehaviour
                     string content = packet.ReadString();
                     Debug.Log(content);
                     UdpReceiveResult result = (UdpReceiveResult)state;
-                    player.member.BindUdpClient(server.udpClient, result.RemoteEndPoint);
+                    player.net.BindUdpClient(server.udpClient, result.RemoteEndPoint);
                 }
                 break;
 
diff --git a/MultiplayerToolkit/Assets/MultiplayerToolkit/Test/TestWrap/TestWrapServer.cs b/MultiplayerToolkit/Assets/MultiplayerToolkit/Test/TestWrap/TestWrapServer.cs
index 705354a..c7e7929 100644
--- a/MultiplayerToolkit/Assets/MultiplayerToolkit/Test/TestWrap/TestWrapServer.cs
+++ b/MultiplayerToolkit/Assets/MultiplayerToolkit/Test/TestWrap/TestWrapServer.cs
@@ -57,7 +57,7 @@ public class TestWrapServer : MonoBehaviour
         //TestReceive(client);
         Player player = new Player();
         player.member.BindTcpClient(client);
-        player.member.onReceiveData += OnRecvData;
+        player.member.onReceiveTcpData += OnRecvTcpData;
         playerList.Add(player);
 
         // hello 
@@ -67,7 +67,7 @@ public class TestWrapServer : MonoBehaviour
         player.member.SendData(hello.ToArray(), 0, hello.GetWritableBufferLength(), ESendOption.Reliable);
     }
 
-    private void OnRecvData(byte[] data, int len)
+    private void OnRecvTcpData(byte[] data, int len)
     {
         Packet packet = Packet.GetReadablePacket(data);
         string str = packet.ReadString();