com.xmobitea.changx.gn-unity 2.0.1 → 2.0.3

package/Runtime/Networking/NetworkingPeer.cs

@@ -1,144 +1,144 @@
-namespace XmobiTea.GN.Networking
-{
-    using System;
-    using XmobiTea.GN.Common;
-    using XmobiTea.GN.Constant;
-    using XmobiTea.GN.Entity;
-
-    public partial class NetworkingPeer
-    {
-        private IPeer socketPeer;
-        private IPeer httpPeer;
-
-        internal AuthenticateStatus authenticateStatus;
-
-        internal int getPing()
-        {
-            var count = 0;
-            var totalPing = 0;
-
-            if (this.httpPeer.isUsing())
-            {
-                count++;
-                totalPing += ((PeerBase)this.httpPeer).ping;
-            }
-
-            if (this.socketPeer.isUsing())
-            {
-                count++;
-                totalPing += ((PeerBase)this.socketPeer).ping;
-            }
-
-            return totalPing / count;
-        }
-
-        internal string getClientId()
-        {
-            return (this.socketPeer as Socket.SocketPeer).getClientId();
-        }
-
-        private long lastCurrentServerMilliseconds;
-        private float lastGetCurrentMilliseconds;
-
-        internal void setServerTimeMilliseconds(long currentServerMilliseconds)
-        {
-            this.lastCurrentServerMilliseconds = currentServerMilliseconds;
-            this.lastGetCurrentMilliseconds = UnityEngine.Time.realtimeSinceStartup;
-        }
-
-        internal long getServerTimestamp()
-        {
-            return this.lastCurrentServerMilliseconds + (int)((UnityEngine.Time.realtimeSinceStartup - this.lastGetCurrentMilliseconds) * 1000);
-        }
-
-        internal void initPeer()
-        {
-            this.setServerTimeMilliseconds(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
-
-            var gnServerSettings = GNNetwork.gnServerSettings;
-            if (gnServerSettings == null) throw new NullReferenceException("Null GN Server Settings, please find it now");
-
-            this.authenticateStatus = new AuthenticateStatus();
-
-            this.httpPeer = new Http.HttpPeer();
-            this.httpPeer.initPeer();
-
-            this.socketPeer = new Socket.SocketPeer();
-            this.socketPeer.initPeer();
-        }
-
-        internal void service()
-        {
-            this.httpPeer?.service();
-            this.socketPeer?.service();
-        }
-
-        internal void sendViaSocket(RequestType requestType, RequestRole requestRole, OperationRequest request, Action<OperationResponse> onResponse = null, string authToken = null, string secretKey = null, GNHashtable customTags = null)
-        {
-            if (authToken == null) authToken = GNNetwork.getAuthenticateStatus().getAuthToken();
-            if (secretKey == null)
-            {
-                if (requestRole == RequestRole.Admin) secretKey = GNNetwork.gnServerSettings.getAdminSecretKey();
-                else if (requestRole == RequestRole.Server) secretKey = GNNetwork.gnServerSettings.getServerSecretKey();
-                else if (requestRole == RequestRole.Client) secretKey = GNNetwork.gnServerSettings.getClientSecretKey();
-            }
-
-            this.socketPeer.enqueue(requestType, requestRole, request, onResponse, authToken, secretKey, customTags);
-        }
-
-        internal void sendViaHttp(RequestType requestType, RequestRole requestRole, OperationRequest request, Action<OperationResponse> onResponse = null, string authToken = null, string secretKey = null, GNHashtable customTags = null)
-        {
-            if (authToken == null) authToken = this.authenticateStatus.getAuthToken();
-            if (secretKey == null)
-            {
-                if (requestRole == RequestRole.Admin) secretKey = GNNetwork.gnServerSettings.getAdminSecretKey();
-                else if (requestRole == RequestRole.Server) secretKey = GNNetwork.gnServerSettings.getServerSecretKey();
-                else if (requestRole == RequestRole.Client) secretKey = GNNetwork.gnServerSettings.getClientSecretKey();
-            }
-
-            this.httpPeer.enqueue(requestType, requestRole, request, onResponse, authToken, secretKey, customTags);
-        }
-
-        internal void sendRequestAuthSocket()
-        {
-            (this.socketPeer as Socket.SocketPeer).sendRequestAuthSocket();
-        }
-
-        internal void connectSocket(Action _onSocketConnect)
-        {
-            (this.socketPeer as Socket.SocketPeer).connect(_onSocketConnect);
-        }
-
-        internal void disconnectSocket(Action _onSocketDisconnect)
-        {
-            (this.socketPeer as Socket.SocketPeer).disconnect(_onSocketDisconnect);
-        }
-
-        internal void setOnEventHandler(Action<OperationEvent> _onEventHandler)
-        {
-            (this.socketPeer as Socket.SocketPeer).setOnEventHandler(_onEventHandler);
-        }
-
-        internal void setOnConnectHandler(Action _onConnectHandler)
-        {
-            (this.socketPeer as Socket.SocketPeer).setOnConnectHandler(_onConnectHandler);
-        }
-
-        internal void setOnDisconnectHandler(Action _onDisconnectHandler)
-        {
-            (this.socketPeer as Socket.SocketPeer).setOnDisconnectHandler(_onDisconnectHandler);
-        }
-
-        internal void removeOnConnectHandler(Action _onConnectHandler)
-        {
-            (this.socketPeer as Socket.SocketPeer).removeOnConnectHandler(_onConnectHandler);
-        }
-
-        internal void removeOnDisconnectHandler(Action _onDisconnectHandler)
-        {
-            (this.socketPeer as Socket.SocketPeer).removeOnDisconnectHandler(_onDisconnectHandler);
-        }
-
-    }
-
-}
+namespace XmobiTea.GN.Networking
+{
+    using System;
+    using XmobiTea.GN.Common;
+    using XmobiTea.GN.Constant;
+    using XmobiTea.GN.Entity;
+
+    public partial class NetworkingPeer
+    {
+        private IPeer socketPeer;
+        private IPeer httpPeer;
+
+        internal AuthenticateStatus authenticateStatus;
+
+        internal int getPing()
+        {
+            var count = 0;
+            var totalPing = 0;
+
+            if (this.httpPeer.isUsing())
+            {
+                count++;
+                totalPing += ((PeerBase)this.httpPeer).ping;
+            }
+
+            if (this.socketPeer.isUsing())
+            {
+                count++;
+                totalPing += ((PeerBase)this.socketPeer).ping;
+            }
+
+            return totalPing / count;
+        }
+
+        internal string getClientId()
+        {
+            return (this.socketPeer as Socket.SocketPeer).getClientId();
+        }
+
+        private long lastCurrentServerMilliseconds;
+        private float lastGetCurrentMilliseconds;
+
+        internal void setServerTimeMilliseconds(long currentServerMilliseconds)
+        {
+            this.lastCurrentServerMilliseconds = currentServerMilliseconds;
+            this.lastGetCurrentMilliseconds = UnityEngine.Time.realtimeSinceStartup;
+        }
+
+        internal long getServerTimestamp()
+        {
+            return this.lastCurrentServerMilliseconds + (int)((UnityEngine.Time.realtimeSinceStartup - this.lastGetCurrentMilliseconds) * 1000);
+        }
+
+        internal void initPeer()
+        {
+            this.setServerTimeMilliseconds(DateTimeOffset.UtcNow.ToUnixTimeMilliseconds());
+
+            var gnServerSettings = GNNetwork.gnServerSettings;
+            if (gnServerSettings == null) throw new NullReferenceException("Null GN Server Settings, please find it now");
+
+            this.authenticateStatus = new AuthenticateStatus();
+
+            this.httpPeer = new Http.HttpPeer();
+            this.httpPeer.initPeer();
+
+            this.socketPeer = new Socket.SocketPeer();
+            this.socketPeer.initPeer();
+        }
+
+        internal void service()
+        {
+            this.httpPeer?.service();
+            this.socketPeer?.service();
+        }
+
+        internal void sendViaSocket(RequestType requestType, RequestRole requestRole, OperationRequest request, Action<OperationResponse> onResponse = null, string authToken = null, string secretKey = null, GNHashtable customTags = null)
+        {
+            if (authToken == null) authToken = GNNetwork.getAuthenticateStatus().getAuthToken();
+            if (secretKey == null)
+            {
+                if (requestRole == RequestRole.Admin) secretKey = GNNetwork.gnServerSettings.getAdminSecretKey();
+                else if (requestRole == RequestRole.Server) secretKey = GNNetwork.gnServerSettings.getServerSecretKey();
+                else if (requestRole == RequestRole.Client) secretKey = GNNetwork.gnServerSettings.getClientSecretKey();
+            }
+
+            this.socketPeer.enqueue(requestType, requestRole, request, onResponse, authToken, secretKey, customTags);
+        }
+
+        internal void sendViaHttp(RequestType requestType, RequestRole requestRole, OperationRequest request, Action<OperationResponse> onResponse = null, string authToken = null, string secretKey = null, GNHashtable customTags = null)
+        {
+            if (authToken == null) authToken = this.authenticateStatus.getAuthToken();
+            if (secretKey == null)
+            {
+                if (requestRole == RequestRole.Admin) secretKey = GNNetwork.gnServerSettings.getAdminSecretKey();
+                else if (requestRole == RequestRole.Server) secretKey = GNNetwork.gnServerSettings.getServerSecretKey();
+                else if (requestRole == RequestRole.Client) secretKey = GNNetwork.gnServerSettings.getClientSecretKey();
+            }
+
+            this.httpPeer.enqueue(requestType, requestRole, request, onResponse, authToken, secretKey, customTags);
+        }
+
+        internal void sendRequestAuthSocket()
+        {
+            (this.socketPeer as Socket.SocketPeer).sendRequestAuthSocket();
+        }
+
+        internal void connectSocket(Action _onSocketConnect)
+        {
+            (this.socketPeer as Socket.SocketPeer).connect(_onSocketConnect);
+        }
+
+        internal void disconnectSocket(Action _onSocketDisconnect)
+        {
+            (this.socketPeer as Socket.SocketPeer).disconnect(_onSocketDisconnect);
+        }
+
+        internal void setOnEventHandler(Action<OperationEvent> _onEventHandler)
+        {
+            (this.socketPeer as Socket.SocketPeer).setOnEventHandler(_onEventHandler);
+        }
+
+        internal void setOnConnectHandler(Action _onConnectHandler)
+        {
+            (this.socketPeer as Socket.SocketPeer).setOnConnectHandler(_onConnectHandler);
+        }
+
+        internal void setOnDisconnectHandler(Action _onDisconnectHandler)
+        {
+            (this.socketPeer as Socket.SocketPeer).setOnDisconnectHandler(_onDisconnectHandler);
+        }
+
+        internal void removeOnConnectHandler(Action _onConnectHandler)
+        {
+            (this.socketPeer as Socket.SocketPeer).removeOnConnectHandler(_onConnectHandler);
+        }
+
+        internal void removeOnDisconnectHandler(Action _onDisconnectHandler)
+        {
+            (this.socketPeer as Socket.SocketPeer).removeOnDisconnectHandler(_onDisconnectHandler);
+        }
+
+    }
+
+}

package/Runtime/Networking/NetworkingPeer.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 69c4e5d71765aaa45a73e7dddac28586
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 69c4e5d71765aaa45a73e7dddac28586
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Networking/NetworkingPeerAPI.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: b52091d6ac295314a875773e185b6d76
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: b52091d6ac295314a875773e185b6d76
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Networking/OperationPending.cs

@@ -1,95 +1,95 @@
-namespace XmobiTea.GN.Networking
-{
-    using System;
-    using XmobiTea.GN.Common;
-    using XmobiTea.GN.Constant;
-    using XmobiTea.GN.Entity;
-
-    public struct OperationPending
-    {
-        private OperationRequest operationRequest;
-        private RequestType requestType;
-        private RequestRole requestRole;
-        private string authToken;
-        private string secretKey;
-        private GNHashtable customTags;
-        private Action<OperationResponse> onOperationResponse;
-        private float timeout;
-
-        private float firstSend;
-        private float secondsSend;
-
-        public OperationPending(RequestType requestType, RequestRole requestRole, OperationRequest operationRequest, Action<OperationResponse> onOperationResponse, string authToken, string secretKey, GNHashtable customTags)
-        {
-            this.operationRequest = operationRequest;
-            this.onOperationResponse = onOperationResponse;
-            this.timeout = UnityEngine.Time.realtimeSinceStartup + OperationRequest.defaultTimeOut;
-            this.firstSend = 0;
-            this.secondsSend = 0;
-
-            this.requestType = requestType;
-            this.requestRole = requestRole;
-            this.authToken = authToken;
-            this.secretKey = secretKey;
-            this.customTags = customTags;
-        }
-
-        public RequestType getRequestType()
-        {
-            return this.requestType;
-        }
-
-        public RequestRole getRequestRole()
-        {
-            return this.requestRole;
-        }
-
-        public string getAuthToken()
-        {
-            return this.authToken;
-        }
-
-        public string getSecretKey()
-        {
-            return this.secretKey;
-        }
-
-        public GNHashtable getCustomTags()
-        {
-            return this.customTags;
-        }
-
-        public void onSend()
-        {
-            this.firstSend = UnityEngine.Time.realtimeSinceStartup;
-            this.timeout = this.firstSend + this.operationRequest.getTimeout();
-        }
-
-        public void onRecv()
-        {
-            this.secondsSend = UnityEngine.Time.realtimeSinceStartup;
-        }
-
-        public float getExecuteTimerInMs()
-        {
-            return (this.secondsSend - this.firstSend) * 1000;
-        }
-
-        public bool isTimeout()
-        {
-            return this.timeout < UnityEngine.Time.realtimeSinceStartup;
-        }
-
-        public OperationRequest getOperationRequest()
-        {
-            return this.operationRequest;
-        }
-
-        public Action<OperationResponse> getCallback()
-        {
-            return this.onOperationResponse;
-        }
-
-    }
-
-}
+namespace XmobiTea.GN.Networking
+{
+    using System;
+    using XmobiTea.GN.Common;
+    using XmobiTea.GN.Constant;
+    using XmobiTea.GN.Entity;
+
+    public struct OperationPending
+    {
+        private OperationRequest operationRequest;
+        private RequestType requestType;
+        private RequestRole requestRole;
+        private string authToken;
+        private string secretKey;
+        private GNHashtable customTags;
+        private Action<OperationResponse> onOperationResponse;
+        private float timeout;
+
+        private float firstSend;
+        private float secondsSend;
+
+        public OperationPending(RequestType requestType, RequestRole requestRole, OperationRequest operationRequest, Action<OperationResponse> onOperationResponse, string authToken, string secretKey, GNHashtable customTags)
+        {
+            this.operationRequest = operationRequest;
+            this.onOperationResponse = onOperationResponse;
+            this.timeout = UnityEngine.Time.realtimeSinceStartup + OperationRequest.defaultTimeOut;
+            this.firstSend = 0;
+            this.secondsSend = 0;
+
+            this.requestType = requestType;
+            this.requestRole = requestRole;
+            this.authToken = authToken;
+            this.secretKey = secretKey;
+            this.customTags = customTags;
+        }
+
+        public RequestType getRequestType()
+        {
+            return this.requestType;
+        }
+
+        public RequestRole getRequestRole()
+        {
+            return this.requestRole;
+        }
+
+        public string getAuthToken()
+        {
+            return this.authToken;
+        }
+
+        public string getSecretKey()
+        {
+            return this.secretKey;
+        }
+
+        public GNHashtable getCustomTags()
+        {
+            return this.customTags;
+        }
+
+        public void onSend()
+        {
+            this.firstSend = UnityEngine.Time.realtimeSinceStartup;
+            this.timeout = this.firstSend + this.operationRequest.getTimeout();
+        }
+
+        public void onRecv()
+        {
+            this.secondsSend = UnityEngine.Time.realtimeSinceStartup;
+        }
+
+        public float getExecuteTimerInMs()
+        {
+            return (this.secondsSend - this.firstSend) * 1000;
+        }
+
+        public bool isTimeout()
+        {
+            return this.timeout < UnityEngine.Time.realtimeSinceStartup;
+        }
+
+        public OperationRequest getOperationRequest()
+        {
+            return this.operationRequest;
+        }
+
+        public Action<OperationResponse> getCallback()
+        {
+            return this.onOperationResponse;
+        }
+
+    }
+
+}

package/Runtime/Networking/OperationPending.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 38d642be16c3bec44a3787b9d91ef71e
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 38d642be16c3bec44a3787b9d91ef71e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: