com.xmobitea.changx.gn-unity 1.0.7 → 2.0.0

package/Runtime/Common/GNHashtable.cs

@@ -4,41 +4,44 @@
     using System.Collections.Generic;
     using System.Text;
 
+    /// <summary>
+    /// The GNData dictionary, it store Dictionary can be use to request or response
+    /// </summary>
     public class GNHashtable : GNData
     {
         public class Builder
         {
-            private IDictionary<string, object> originObject;
+            private IDictionary<string, object> dict;
 
-            public Builder Add(string key, object value)
+            public Builder add(string key, object value)
             {
-                this.originObject[key] = value;
+                this.dict[key] = value;
 
                 return this;
             }
 
-            public Builder AddAll(System.Collections.IDictionary dict)
+            public Builder addAll(System.Collections.IDictionary dict)
             {
                 var keys = dict.Keys;
                 foreach (var key in keys)
                 {
                     if (key is string keyStr)
                     {
-                        this.Add(keyStr, dict[key]);
+                        this.add(keyStr, dict[key]);
                     }
                 }
 
                 return this;
             }
 
-            public GNHashtable Build()
+            public GNHashtable build()
             {
                 var awnser = new GNHashtable();
 
-                var keys = originObject.Keys;
+                var keys = this.dict.Keys;
                 foreach (var key in keys)
                 {
-                    awnser.Add(key, originObject[key]);
+                    awnser.add(key, this.dict[key]);
                 }
 
                 return awnser;
@@ -46,57 +49,57 @@
 
             public Builder()
             {
-                this.originObject = new Dictionary<string, object>();
+                this.dict = new Dictionary<string, object>();
             }
         }
 
-        private IDictionary<string, object> originObject;
+        private IDictionary<string, object> dict;
 
         public GNHashtable()
         {
-            this.originObject = new Dictionary<string, object>();
+            this.dict = new Dictionary<string, object>();
         }
 
-        public void Add(string key, object value)
+        public void add(string key, object value)
         {
-            this.originObject[key] = CreateUseDataFromOriginData(value);
+            this.dict[key] = GNData.createUseDataFromOriginData(value);
         }
 
-        public ICollection<object> Values()
+        public ICollection<object> values()
         {
-            return this.originObject.Values;
+            return this.dict.Values;
         }
 
-        public ICollection<string> Keys()
+        public ICollection<string> keys()
         {
-            return this.originObject.Keys;
+            return this.dict.Keys;
         }
 
-        public bool ContainsKey(string key)
+        public bool containsKey(string key)
         {
-            return this.originObject.ContainsKey(key);
+            return this.dict.ContainsKey(key);
         }
 
-        public void Clear()
+        public void clear()
         {
-            this.originObject.Clear();
+            this.dict.Clear();
         }
 
-        public bool Remove(string key)
+        public bool remove(string key)
         {
-            return this.originObject.Remove(key);
+            return this.dict.Remove(key);
         }
 
-        public int Count()
+        public int count()
         {
-            return this.originObject.Count;
+            return this.dict.Count;
         }
 
-        protected object Get<T>(string k, T defaultValue = default(T))
+        protected object get<T>(string k, T defaultValue = default(T))
         {
-            if (this.originObject.ContainsKey(k))
+            if (this.dict.ContainsKey(k))
             {
-                var value = this.originObject[k];
+                var value = this.dict[k];
 
                 if (value == null) return defaultValue;
 
@@ -111,107 +114,107 @@
             return defaultValue;
         }
 
-        public byte GetByte(string k, byte defaultValue = 0)
+        public byte getByte(string k, byte defaultValue = 0)
         {
-            return Convert.ToByte(this.Get(k, defaultValue));
+            return Convert.ToByte(this.get(k, defaultValue));
         }
 
-        public sbyte GetSByte(string k, sbyte defaultValue = 0)
+        public sbyte getSByte(string k, sbyte defaultValue = 0)
         {
-            return Convert.ToSByte(this.Get(k, defaultValue));
+            return Convert.ToSByte(this.get(k, defaultValue));
         }
 
-        public short GetShort(string k, short defaultValue = 0)
+        public short getShort(string k, short defaultValue = 0)
         {
-            return Convert.ToInt16(this.Get(k, defaultValue));
+            return Convert.ToInt16(this.get(k, defaultValue));
         }
 
-        public int GetInt(string k, int defaultValue = 0)
+        public int getInt(string k, int defaultValue = 0)
         {
-            return Convert.ToInt32(this.Get(k, defaultValue));
+            return Convert.ToInt32(this.get(k, defaultValue));
         }
 
-        public float GetFloat(string k, float defaultValue = 0)
+        public float getFloat(string k, float defaultValue = 0)
         {
-            return Convert.ToSingle(this.Get(k, defaultValue));
+            return Convert.ToSingle(this.get(k, defaultValue));
         }
 
-        public long GetLong(string k, long defaultValue = 0)
+        public long getLong(string k, long defaultValue = 0)
         {
-            return Convert.ToInt64(this.Get(k, defaultValue));
+            return Convert.ToInt64(this.get(k, defaultValue));
         }
 
-        public double GetDouble(string k, double defaultValue = 0)
+        public double getDouble(string k, double defaultValue = 0)
         {
-            return Convert.ToDouble(this.Get(k, defaultValue));
+            return Convert.ToDouble(this.get(k, defaultValue));
         }
 
-        public bool GetBool(string k, bool defaultValue = false)
+        public bool getBool(string k, bool defaultValue = false)
         {
-            return Convert.ToBoolean(this.Get(k, defaultValue));
+            return Convert.ToBoolean(this.get(k, defaultValue));
         }
 
-        public string GetString(string k, string defaultValue = null)
+        public string getString(string k, string defaultValue = null)
         {
-            return Convert.ToString(this.Get(k, defaultValue));
+            return Convert.ToString(this.get(k, defaultValue));
         }
 
-        public object GetObject(string k, object defaultValue = null)
+        public object getObject(string k, object defaultValue = null)
         {
-            return this.Get(k, defaultValue);
+            return this.get(k, defaultValue);
         }
 
-        public T[] GetArray<T>(string k, T[] defaultValue = null)
+        public T[] getArray<T>(string k, T[] defaultValue = null)
         {
-            var value0 = this.GetGNArray(k);
+            var value0 = this.getGNArray(k);
             if (value0 != null)
             {
-                return value0.ToArray<T>();
+                return value0.toArray<T>();
             }
 
             return defaultValue;
         }
 
-        public IList<T> GetList<T>(string k, IList<T> defaultValue = null)
+        public IList<T> getList<T>(string k, IList<T> defaultValue = null)
         {
-            var value0 = this.GetGNArray(k);
+            var value0 = this.getGNArray(k);
             if (value0 != null)
             {
-                return value0.ToList<T>();
+                return value0.toList<T>();
             }
 
             return defaultValue;
         }
 
-        public GNArray GetGNArray(string k, GNArray defaultValue = null)
+        public GNArray getGNArray(string k, GNArray defaultValue = null)
         {
-            return (GNArray)this.Get(k, defaultValue);
+            return (GNArray)this.get(k, defaultValue);
         }
 
-        public GNHashtable GetGNHashtable(string k, GNHashtable defaultValue = null)
+        public GNHashtable getGNHashtable(string k, GNHashtable defaultValue = null)
         {
-            return (GNHashtable)this.Get(k, defaultValue);
+            return (GNHashtable)this.get(k, defaultValue);
         }
 
-        public override object ToData()
+        public override object toData()
         {
             var answer = new Dictionary<string, object>();
 
-            foreach (var c in this.originObject)
+            foreach (var c in this.dict)
             {
-                answer.Add(c.Key, CreateGNDataFromUseData(c.Value));
+                answer.Add(c.Key, GNData.createDataFromUseData(c.Value));
             }
 
             return answer;
         }
 
-        public override string ToString()
+        public override string toString()
         {
             var stringBuilder = new StringBuilder();
             stringBuilder.Append("{");
 
             var i = 0;
-            foreach (var c in this.originObject)
+            foreach (var c in this.dict)
             {
                 if (i != 0) stringBuilder.Append(",");
 
@@ -228,6 +231,11 @@
             return stringBuilder.ToString();
         }
 
+        public override string ToString()
+        {
+            return this.toString();
+        }
+
     }
 
 }

package/Runtime/Common/IGNData.cs

@@ -2,7 +2,9 @@
 {
     public interface IGNData
     {
-        object ToData();
+        object toData();
+
+        string toString();
 
     }
 

package/Runtime/Config/GNServerSettings.cs

@@ -1,22 +1,20 @@
 namespace XmobiTea.GN.Config
 {
-    using System.Collections.Generic;
-
     using UnityEngine;
 
-    using XmobiTea.GN.Constant;
-
     public enum PeerSocketVersion
     {
         V2_v2 = 0,
         V2_v3 = 1,
         V3 = 2,
+
     }
-    
+
     public enum HttpRequestType
     {
         UnityWebRequest = 0,
         HTTPRequest = 1,
+
     }
 
     //[CreateAssetMenu(fileName = GNServerSettings.ResourcesPath, menuName = "GN/GNServerSettings", order = 1)]
@@ -25,79 +23,148 @@
         public const string ResourcesPath = "GNServerSettings";
 
         [SerializeField]
-        private string _serverAddress = "127.0.0.1";
-        public string serverAddress => this._serverAddress;
+        private string serverAddress = "127.0.0.1";
+
+        [SerializeField]
+        private int serverPort = 2202;
 
         [SerializeField]
-        private int _serverPort = 2202;
-        public int serverPort => this._serverPort;
+        private bool useSsl = false;
 
         [SerializeField]
-        private bool _useSsl = false;
-        public bool useSsl => this._useSsl;
+        private bool useSocket = true;
 
         [SerializeField]
-        private bool _useSocket = true;
-        public bool useSocket => this._useSocket;
+        private bool useHttp = true;
 
         [SerializeField]
-        private bool _useHttp = true;
-        public bool useHttp => this._useHttp;
+        private int sendRate = 20;
 
         [SerializeField]
-        private int _sendRate = 20;
-        public int sendRate => this._sendRate;
+        private int reconnectDelay = 5000;
 
         [SerializeField]
-        private int _reconnectDelay = 5000;
-        public int reconnectDelay => this._reconnectDelay;
+        private float pingInterval = 20000;
 
         [SerializeField]
-        private float _pingInterval = 20000;
-        public float pingInterval => this._pingInterval;
+        private float pingTimeout = 20000;
 
         [SerializeField]
-        private float _pingTimeout = 20000;
-        public float pingTimeout => this._pingTimeout;
+        private string adminSecretKey;
 
         [SerializeField]
-        private PeerSocketVersion _peerSocketVersion = PeerSocketVersion.V3;
-        public PeerSocketVersion peerSocketVersion => this._peerSocketVersion;
+        private string serverSecretKey;
 
         [SerializeField]
-        private List<int> _codeCanSendNotAuthorized = new List<int>() { OperationCode.Debug, OperationCode.GetAppConfig, OperationCode.Login, OperationCode.RegisterAccount };
-        public List<int> codeCanSendNotAuthorized => this._codeCanSendNotAuthorized;
+        private string clientSecretKey;
 
         [SerializeField]
-        private string _gnServerSourcePath = "Template_GN-server";
-        public string gnServerSourcePath => this._gnServerSourcePath;
+        private PeerSocketVersion peerSocketVersion = PeerSocketVersion.V3;
 
         [SerializeField]
-        private HttpRequestType _httpRequestType = HttpRequestType.HTTPRequest;
-        public HttpRequestType httpRequestType => this._httpRequestType;
+        private string gnServerSourcePath = "Template_GN-server";
 
         [SerializeField]
-        private GN.Logger.LogType _logType = GN.Logger.LogType.All;
-        public GN.Logger.LogType logType => this._logType;
+        private HttpRequestType httpRequestType = HttpRequestType.HTTPRequest;
+
+        [SerializeField]
+        private GN.Logger.LogType logType = GN.Logger.LogType.All;
+
+        public string getServerAddress()
+        {
+            return this.serverAddress;
+        }
+
+        public int getServerPort()
+        {
+            return this.serverPort;
+        }
 
-        public string SocketUrl
+        public bool isUseSsl()
         {
-            get
-            {
-                if (this._serverPort < 0) return string.Format((this._useSsl ? "https" : "http") + "://{0}", this._serverAddress);
-                else return string.Format((this._useSsl ? "https" : "http") + "://{0}:{1}", this._serverAddress, this._serverPort);
-            }
+            return this.useSsl;
         }
 
-        public string HttpUrl
+
+        public bool isUseSocket()
+        {
+            return this.useSocket;
+        }
+
+        public bool isUseHttp()
         {
-            get
-            {
-                if (this._serverPort < 0) return string.Format((this._useSsl ? "https" : "http") + "://{0}", this._serverAddress);
-                else return string.Format((this._useSsl ? "https" : "http") + "://{0}:{1}", this._serverAddress, this._serverPort);
-            }
+            return this.useHttp;
+        }
+
+        public int getSendRate()
+        {
+            return this.sendRate;
+        }
+
+        public int getReconnectDelay()
+        {
+            return this.reconnectDelay;
+        }
+
+        public float getPingInterval()
+        {
+            return this.pingInterval;
+        }
+
+        public float getPingTimeout()
+        {
+            return this.pingTimeout;
+        }
+
+        public string getAdminSecretKey()
+        {
+            return this.adminSecretKey;
+        }
+
+        public string getServerSecretKey()
+        {
+            return this.serverSecretKey;
+        }
+
+        public string getClientSecretKey()
+        {
+            return this.clientSecretKey;
+        }
+
+        public PeerSocketVersion getPeerSocketVersion()
+        {
+            return this.peerSocketVersion;
+        }
+
+        public string getGNServerSourcePath()
+        {
+            return this.gnServerSourcePath;
+        }
+
+        public HttpRequestType getHttpRequestType()
+        {
+            return this.httpRequestType;
+        }
+
+        public GN.Logger.LogType getLogType()
+        {
+            return this.logType;
+        }
+
+       
+        public string getSocketUrl()
+        {
+            if (this.serverPort < 0) return string.Format((this.useSsl ? "https" : "http") + "://{0}", this.serverAddress);
+            else return string.Format((this.useSsl ? "https" : "http") + "://{0}:{1}", this.serverAddress, this.serverPort);
+        }
+
+        public string getHttpUrl()
+        {
+            if (this.serverPort < 0) return string.Format((this.useSsl ? "https" : "http") + "://{0}", this.serverAddress);
+            else return string.Format((this.useSsl ? "https" : "http") + "://{0}:{1}", this.serverAddress, this.serverPort);
         }
 
     }
 
 }
+

package/Runtime/Constant/Commands.cs

@@ -10,6 +10,7 @@
 		public const string APPLICATION_MSGPACK = "application/msgpack";
 
 		public const string RequestAuthTokenCmd = "a";
+		public const string RequestSecretCmd = "s";
 
 		public const string RequestCmd_MsgPack = "r";
 		public const string ResponseCmd_MsgPack = "r";
@@ -23,5 +24,7 @@
 		public const string File = "f";
 
 		private Commands() { }
+
 	}
+
 }

package/Runtime/Constant/EnumType/FriendStatus.cs

@@ -2,9 +2,11 @@
 {
     public enum FriendStatus
     {
-        Friend = 0,
-        WaitingAccept = 1,
-        SentRequestAndWaitingAccept = 2,
-        Unknown = 3,
+        Friend = 1,
+        WaitingAccept = 2,
+        SentRequestAndWaitingAccept = 3,
+        NotFriend = 4,
+
     }
+
 }

package/Runtime/Constant/EnumType/GoogleLoginType.cs

@@ -4,5 +4,7 @@
 	{
 		AccessToken = 1,
 		IdToken = 2,
+
 	}
+
 }

package/Runtime/Constant/EnumType/GroupStatus.cs

@@ -0,0 +1,12 @@
+namespace XmobiTea.GN.Constant
+{
+	public enum GroupStatus
+	{
+		Member = 1,
+		WaitingAccept = 2,
+		SentRequestAndWaitingAccept = 3,
+		NotMember = 4,
+
+	}
+
+}

package/Runtime/Constant/EnumType/{UserRoleType.cs.meta → GroupStatus.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 54f5dde9dbce9b94189f320fe54968dd
+guid: 779cfd8373db86d4ab9e820c032c1fc0
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/Constant/EnumType/InvalidMemberType.cs

@@ -2,20 +2,22 @@
 {
     public enum InvalidMemberType
     {
-        UnknownError = 0,
-        DataRequired = 1,
-        TypeInvalid = 2,
-        StringNull = 3,
-        StringMinLength = 4,
-        StringMaxLength = 5,
-        NumberMinValue = 6,
-        NumberMaxValue = 7,
-        NumberMustInt = 8,
-        GNHashtableNull = 9,
-        GNHashtableMinLength = 10,
-        GNHashtableMaxLength = 11,
-        GNArrayNull = 12,
-        GNArrayMinLength = 13,
-        GNArrayMaxLength = 14,
+        UnknownError = 1,
+        DataRequired = 2,
+        TypeInvalid = 3,
+        StringNull = 4,
+        StringMinLength = 5,
+        StringMaxLength = 6,
+        NumberMinValue = 7,
+        NumberMaxValue = 8,
+        NumberMustInt = 9,
+        GNHashtableNull = 10,
+        GNHashtableMinLength = 11,
+        GNHashtableMaxLength = 12,
+        GNArrayNull = 13,
+        GNArrayMinLength = 14,
+        GNArrayMaxLength = 15,
+
     }
+
 }

package/Runtime/Constant/EnumType/ItemType.cs

@@ -0,0 +1,10 @@
+namespace XmobiTea.GN.Constant
+{
+	public enum ItemType
+	{
+		NonComsumable = 1,
+		Consumable = 2,
+
+	}
+
+}

package/Runtime/Constant/EnumType/{LoginType.cs.meta → ItemType.cs.meta}

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: c2ae69e2f0c72e74f88c3dc9fe2484c7
+guid: cfc1a2632567b6048807d780f8c82f74
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

package/Runtime/Constant/EnumType/MatchmakingMemberStatus.cs

@@ -0,0 +1,11 @@
+namespace XmobiTea.GN.Constant
+{
+	public enum MatchmakingMemberStatus
+	{
+		Pending = 1,
+		Joined = 2,
+		Canceled = 3,
+
+	}
+
+}

package/Runtime/Constant/{ErrorCode/DebugErrorCode.cs.meta → EnumType/MatchmakingMemberStatus.cs.meta}

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

package/Runtime/Constant/EnumType/MatchmakingTicketStatus.cs

@@ -0,0 +1,13 @@
+namespace XmobiTea.GN.Constant
+{
+	public enum MatchmakingTicketStatus
+	{
+        WaitingForMembers = 1,
+        WaitingForMatch = 2,
+        WaitingForServer = 3,
+        Matched = 4,
+        Canceled = 5,
+
+    }
+
+}