unity sdk .net4.x支持 #1148

Author: jay602

NetworkInterface.cs

@@ -9,7 +9,6 @@
 	using System.Text;
 	using System.Text.RegularExpressions;
 	using System.Threading;
-	using System.Runtime.Remoting.Messaging;
 
 	using MessageID = System.UInt16;
 	using MessageLength = System.UInt16;
@@ -36,6 +35,7 @@ public class ConnectState
 			public string connectIP = "";
 			public int connectPort = 0;
 			public ConnectCallback connectCB = null;
+			public AsyncConnectMethod caller = null;
 			public object userData = null;
 			public Socket socket = null;
 			public NetworkInterface networkInterface = null;
@@ -166,13 +166,11 @@ private void _asyncConnect(ConnectState state)
 		private void _asyncConnectCB(IAsyncResult ar)
 		{
 			ConnectState state = (ConnectState)ar.AsyncState;
-			AsyncResult result = (AsyncResult)ar;
-			AsyncConnectMethod caller = (AsyncConnectMethod)result.AsyncDelegate;
-
+		
 			Dbg.DEBUG_MSG(string.Format("NetWorkInterface::_asyncConnectCB(), connect to '{0}:{1}' finish. error = '{2}'", state.connectIP, state.connectPort, state.error));
 
 			// Call EndInvoke to retrieve the results.
-			caller.EndInvoke(ar);
+			state.caller.EndInvoke(ar);
 			Event.fireIn("_onConnectionState", new object[] { state });
 		}
 
@@ -194,22 +192,24 @@ public void connectTo(string ip, int port, ConnectCallback callback, object user
 			_socket.NoDelay = true;
 			//_socket.Blocking = false;
 
+			AsyncConnectMethod asyncConnectMethod = new AsyncConnectMethod(this._asyncConnect);
+
 			ConnectState state = new ConnectState();
 			state.connectIP = ip;
 			state.connectPort = port;
 			state.connectCB = callback;
 			state.userData = userData;
 			state.socket = _socket;
 			state.networkInterface = this;
+			state.caller = asyncConnectMethod;
 
 			Dbg.DEBUG_MSG("connect to " + ip + ":" + port + " ...");
 			connected = false;
 
 			// 先注册一个事件回调，该事件在当前线程触发
 			Event.registerIn("_onConnectionState", this, "_onConnectionState");
 
-			var v = new AsyncConnectMethod(this._asyncConnect);
-			v.BeginInvoke(state, new AsyncCallback(this._asyncConnectCB), state);
+			asyncConnectMethod.BeginInvoke(state, new AsyncCallback(this._asyncConnectCB), state);
 		}
 
 		public bool send(MemoryStream stream)

PacketReceiver.cs

@@ -8,7 +8,6 @@
 	using System.Text;
 	using System.Text.RegularExpressions;
 	using System.Threading;
-	using System.Runtime.Remoting.Messaging;
 
 	using MessageID = System.UInt16;
 	using MessageLength = System.UInt16;
@@ -100,9 +99,8 @@ int _free()
 
 		public void startRecv()
 		{
-
-			var v = new AsyncReceiveMethod(this._asyncReceive);
-			v.BeginInvoke(new AsyncCallback(_onRecv), null);
+			AsyncReceiveMethod asyncReceiveMethod = new AsyncReceiveMethod(this._asyncReceive);
+			asyncReceiveMethod.BeginInvoke(new AsyncCallback(_onRecv), asyncReceiveMethod);
 		}
 
 		private void _asyncReceive()
@@ -168,8 +166,7 @@ private void _asyncReceive()
 
 		private void _onRecv(IAsyncResult ar)
 		{
-			AsyncResult result = (AsyncResult)ar;
-			AsyncReceiveMethod caller = (AsyncReceiveMethod)result.AsyncDelegate;
+			AsyncReceiveMethod caller = (AsyncReceiveMethod)ar.AsyncState;
 			caller.EndInvoke(ar);
 		}
 	}

PacketSender.cs

@@ -128,7 +128,7 @@ void _startSend()
 		{
 			// 由于socket用的是非阻塞式，因此在这里不能直接使用socket.send()方法
 			// 必须放到另一个线程中去做
-			_asyncSendMethod.BeginInvoke(_asyncCallback, null);
+			_asyncSendMethod.BeginInvoke(_asyncCallback, _asyncSendMethod);
 		}
 
 		void _asyncSend()
@@ -183,8 +183,7 @@ void _asyncSend()
 
 		private static void _onSent(IAsyncResult ar)
 		{
-			AsyncResult result = (AsyncResult)ar;
-			AsyncSendMethod caller = (AsyncSendMethod)result.AsyncDelegate;
+			AsyncSendMethod caller = (AsyncSendMethod)ar.AsyncState;
 			caller.EndInvoke(ar);
 		}
 	}