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

package/Editor/GNServerSettingsEditor.cs

@@ -24,10 +24,12 @@
         SerializedProperty pingInterval;
         SerializedProperty pingTimout;
         SerializedProperty peerSocketVersion;
-        SerializedProperty codeCanSendNotAuthorized;
         SerializedProperty gnServerSourcePath;
         SerializedProperty httpRequestType;
         SerializedProperty logType;
+        SerializedProperty adminSecretKey;
+        SerializedProperty serverSecretKey;
+        SerializedProperty clientSecretKey;
 
         private Dictionary<int, string> operationCodeFieldDict;
 
@@ -35,115 +37,67 @@
 
         private void OnEnable()
         {
-            serverAddress = serializedObject.FindProperty("_serverAddress");
-            serverPort = serializedObject.FindProperty("_serverPort");
-            useSsl = serializedObject.FindProperty("_useSsl");
-            useSocket = serializedObject.FindProperty("_useSocket");
-            useHttp = serializedObject.FindProperty("_useHttp");
-            sendRate = serializedObject.FindProperty("_sendRate");
-            reconnectDelay = serializedObject.FindProperty("_reconnectDelay");
-            pingInterval = serializedObject.FindProperty("_pingInterval");
-            pingTimout = serializedObject.FindProperty("_pingTimeout");
-            peerSocketVersion = serializedObject.FindProperty("_peerSocketVersion");
-            codeCanSendNotAuthorized = serializedObject.FindProperty("_codeCanSendNotAuthorized");
-            gnServerSourcePath = serializedObject.FindProperty("_gnServerSourcePath");
-            httpRequestType = serializedObject.FindProperty("_httpRequestType");
-            //postType = serializedObject.FindProperty("_postType");
-            logType = serializedObject.FindProperty("_logType");
+            this.serverAddress = serializedObject.FindProperty("serverAddress");
+            this.serverPort = serializedObject.FindProperty("serverPort");
+            this.useSsl = serializedObject.FindProperty("useSsl");
+            this.useSocket = serializedObject.FindProperty("useSocket");
+            this.useHttp = serializedObject.FindProperty("useHttp");
+            this.sendRate = serializedObject.FindProperty("sendRate");
+            this.reconnectDelay = serializedObject.FindProperty("reconnectDelay");
+            this.pingInterval = serializedObject.FindProperty("pingInterval");
+            this.pingTimout = serializedObject.FindProperty("pingTimeout");
+            this.peerSocketVersion = serializedObject.FindProperty("peerSocketVersion");
+            this.gnServerSourcePath = serializedObject.FindProperty("gnServerSourcePath");
+            this.httpRequestType = serializedObject.FindProperty("httpRequestType");
+            //postType = serializedObject.FindProperty("postType");
+            this.logType = serializedObject.FindProperty("logType");
+            this.adminSecretKey = serializedObject.FindProperty("adminSecretKey");
+            this.serverSecretKey = serializedObject.FindProperty("serverSecretKey");
+            this.clientSecretKey = serializedObject.FindProperty("clientSecretKey");
 
             var fields = typeof(OperationCode).GetFields();
 
-            if (operationCodeFieldDict == null) operationCodeFieldDict = new Dictionary<int, string>();
-            else operationCodeFieldDict.Clear();
+            if (this.operationCodeFieldDict == null) this.operationCodeFieldDict = new Dictionary<int, string>();
+            else this.operationCodeFieldDict.Clear();
 
             for (var i = 0; i < fields.Length; i++)
             {
                 var field = fields[i];
 
-                operationCodeFieldDict[(int)field.GetValue(null)] = field.Name;
+                this.operationCodeFieldDict[(int)field.GetValue(null)] = field.Name;
             }
         }
 
         public override void OnInspectorGUI()
         {
-            serializedObject.Update();
+            this.serializedObject.Update();
 
-            EditorGUILayout.LabelField($"GN Unity Client SDK Version v{GNNetwork.GetClientSdkVersion()}");
+            EditorGUILayout.LabelField($"GN Unity Client SDK Version v{GNNetwork.getClientSdkVersion()}");
             EditorGUILayout.Space(20);
 
-            EditorGUILayout.PropertyField(serverAddress);
-            EditorGUILayout.PropertyField(serverPort);
-            EditorGUILayout.PropertyField(useSsl);
-            EditorGUILayout.PropertyField(useSocket);
-            EditorGUILayout.PropertyField(useHttp);
-            EditorGUILayout.PropertyField(sendRate);
-            EditorGUILayout.PropertyField(reconnectDelay);
-            EditorGUILayout.PropertyField(pingInterval);
-            EditorGUILayout.PropertyField(pingTimout);
-            EditorGUILayout.PropertyField(peerSocketVersion);
+            EditorGUILayout.PropertyField(this.serverAddress);
+            EditorGUILayout.PropertyField(this.serverPort);
+            EditorGUILayout.PropertyField(this.useSsl);
+            EditorGUILayout.PropertyField(this.useSocket);
+            EditorGUILayout.PropertyField(this.useHttp);
+            EditorGUILayout.PropertyField(this.sendRate);
+            EditorGUILayout.PropertyField(this.reconnectDelay);
+            EditorGUILayout.PropertyField(this.pingInterval);
+            EditorGUILayout.PropertyField(this.pingTimout);
+            EditorGUILayout.PropertyField(this.peerSocketVersion);
             EditorGUILayout.Space(20);
 
-            EditorGUILayout.BeginVertical();
-            EditorGUILayout.LabelField($"Code Can Send Not Authorized size is {codeCanSendNotAuthorized.arraySize}");
-
-            //scrollPosition = GUILayout.BeginScrollView(scrollPosition);
-
-
-            for (var i = 0; i < codeCanSendNotAuthorized.arraySize; i++)
-            {
-                var serializedProperty = codeCanSendNotAuthorized.GetArrayElementAtIndex(i);
-                
-                var operationCodeName = string.Empty;
-
-                if (operationCodeFieldDict.ContainsKey(serializedProperty.intValue)) operationCodeName = $"({serializedProperty.intValue}) {operationCodeFieldDict[serializedProperty.intValue]}";
-                else operationCodeName = "Choose an operation code";
-
-                EditorGUILayout.BeginHorizontal();
-
-                if (EditorGUILayout.DropdownButton(new GUIContent(operationCodeName), FocusType.Passive))
-                {
-                    var operationCodeMenu = new GenericMenu();
-                    operationCodeMenu.AddItem(new GUIContent("None"), !operationCodeFieldDict.ContainsKey(serializedProperty.intValue), id =>
-                    {
-                        serializedProperty.intValue = (int)id;
-                        if (serializedObject.hasModifiedProperties) serializedObject.ApplyModifiedProperties();
-                    }, int.MinValue);
-                    operationCodeMenu.AddSeparator("");
-
-                    foreach (var c in operationCodeFieldDict)
-                    {
-                        operationCodeMenu.AddItem(new GUIContent($"({c.Key}) {c.Value}"), serializedProperty.intValue == c.Key, id =>
-                        {
-                            serializedProperty.intValue = (int)id;
-                            if (serializedObject.hasModifiedProperties) serializedObject.ApplyModifiedProperties();
-                        }, c.Key);
-                    }
-
-                    operationCodeMenu.ShowAsContext();
-                }
-
-                if (GUILayout.Button("-", GUILayout.MaxWidth(50)))
-                {
-                    codeCanSendNotAuthorized.DeleteArrayElementAtIndex(i);
-                }
-
-                EditorGUILayout.EndHorizontal();
-            }
-
-            if (GUILayout.Button("+"))
-            {
-                codeCanSendNotAuthorized.arraySize += 1;
-            }
+            EditorGUILayout.PropertyField(this.gnServerSourcePath);
+            EditorGUILayout.PropertyField(this.httpRequestType);
+            //EditorGUILayout.PropertyField(postType);
+            EditorGUILayout.PropertyField(this.logType);
 
-            EditorGUILayout.EndVertical();
             EditorGUILayout.Space(20);
+            EditorGUILayout.PropertyField(this.adminSecretKey);
+            EditorGUILayout.PropertyField(this.serverSecretKey);
+            EditorGUILayout.PropertyField(this.clientSecretKey);
 
-            EditorGUILayout.PropertyField(gnServerSourcePath);
-            EditorGUILayout.PropertyField(httpRequestType);
-            //EditorGUILayout.PropertyField(postType);
-            EditorGUILayout.PropertyField(logType);
-
-            if (serializedObject.hasModifiedProperties) serializedObject.ApplyModifiedProperties();
+            if (this.serializedObject.hasModifiedProperties) this.serializedObject.ApplyModifiedProperties();
         }
 
         [MenuItem("XmobiTea GN/Open Settings")]
@@ -201,7 +155,7 @@
         private static void SyncEnumTypeFolder()
         {
             var gnServerSettings = GetSettings();
-            var dir = Application.dataPath + "/../../" + gnServerSettings.gnServerSourcePath + "/src/common/constant/enumType";
+            var dir = Application.dataPath + "/../../" + gnServerSettings.getGNServerSourcePath() + "/src/common/constant/enumType";
 
             var allPathFiles = Directory.GetFiles(dir, "*.ts");
             for (var i = 0; i < allPathFiles.Length; i++)
@@ -258,7 +212,7 @@
         private static void SyncParameterCodeFolder()
         {
             var gnServerSettings = GetSettings();
-            var dir = Application.dataPath + "/../../" + gnServerSettings.gnServerSourcePath + "/src/common/constant/parameterCode";
+            var dir = Application.dataPath + "/../../" + gnServerSettings.getGNServerSourcePath() + "/src/common/constant/parameterCode";
 
             var allPathFiles = Directory.GetFiles(dir, "*.ts");
             for (var i = 0; i < allPathFiles.Length; i++)
@@ -321,7 +275,7 @@
         private static void SyncErrorCodeFolder()
         {
             var gnServerSettings = GetSettings();
-            var dir = Application.dataPath + "/../../" + gnServerSettings.gnServerSourcePath + "/src/common/constant/errorCode";
+            var dir = Application.dataPath + "/../../" + gnServerSettings.getGNServerSourcePath() + "/src/common/constant/errorCode";
 
             var allPathFiles = Directory.GetFiles(dir, "*.ts");
             for (var i = 0; i < allPathFiles.Length; i++)
@@ -392,7 +346,7 @@
             const string Template = "public const int $name = $code;";
 
             var gnServerSettings = GetSettings();
-            var dirPath = Application.dataPath + "/../../" + gnServerSettings.gnServerSourcePath + "/src/common/constant/OperationCode.ext.ts";
+            var dirPath = Application.dataPath + "/../../" + gnServerSettings.getGNServerSourcePath() + "/src/common/constant/OperationCode.ext.ts";
             var allLines = File.ReadAllLines(dirPath);
 
             var stringBuilder = new StringBuilder();
@@ -435,7 +389,7 @@
             const string Template = "public const int $name = $code;";
 
             var gnServerSettings = GetSettings();
-            var dirPath = Application.dataPath + "/../../" + gnServerSettings.gnServerSourcePath + "/src/common/constant/EventCode.ext.ts";
+            var dirPath = Application.dataPath + "/../../" + gnServerSettings.getGNServerSourcePath() + "/src/common/constant/EventCode.ext.ts";
             var allLines = File.ReadAllLines(dirPath);
 
             var stringBuilder = new StringBuilder();

package/Runtime/Common/GNArray.cs

@@ -4,86 +4,122 @@
     using System.Collections.Generic;
     using System.Text;
 
+    /// <summary>
+    /// The GNData array, it store Array can be use to request or response
+    /// </summary>
     public class GNArray : GNData
     {
+        /// <summary>
+        /// Builder for GNArray
+        /// </summary>
         public class Builder
         {
-            private List<object> originArray;
-
-            public Builder Add(object value)
+            /// <summary>
+            /// The origin array
+            /// </summary>
+            private List<object> array;
+
+            /// <summary>
+            /// Add a value to origin array
+            /// </summary>
+            /// <param name="value">The value type must is string, bool, number, Map or Array</param>
+            /// <returns></returns>
+            public Builder add(object value)
             {
-                originArray.Add(value);
+                this.array.Add(value);
 
                 return this;
             }
 
-            public Builder AddAll(System.Collections.IList list)
+            /// <summary>
+            /// Add some values to origin array
+            /// </summary>
+            /// <param name="list">The element value type must is type string, bool, number, Map or Array</param>
+            /// <returns></returns>
+            public Builder addAll(System.Collections.IList list)
             {
                 foreach (var o in list)
                 {
-                    Add(o);
+                    this.add(o);
                 }
 
                 return this;
             }
 
-            public GNArray Build()
+            /// <summary>
+            /// Build GNArray
+            /// </summary>
+            /// <returns></returns>
+            public GNArray build()
             {
                 var awnser = new GNArray();
 
-                foreach (var o in originArray)
+                foreach (var o in this.array)
                 {
-                    awnser.Add(o);
+                    awnser.add(o);
                 }
 
                 return awnser;
             }
 
+            /// <summary>
+            /// Constructor for GNArray builder
+            /// </summary>
             public Builder()
             {
-                originArray = new List<object>();
+                this.array = new List<object>();
             }
         }
 
-        private List<object> originArray;
+        /// <summary>
+        /// The GN array
+        /// </summary>
+        private List<object> array;
 
+        /// <summary>
+        /// The constructor for GNArray
+        /// </summary>
         public GNArray()
         {
-            this.originArray = new List<object>();
+            this.array = new List<object>();
         }
 
-        public void Add(object value)
+        /// <summary>
+        /// Add a value
+        /// </summary>
+        /// <param name="value">The </param>
+        public void add(object value)
         {
-            this.originArray.Add(CreateUseDataFromOriginData(value));
+            this.array.Add(GNData.createUseDataFromOriginData(value));
         }
 
-        public ICollection<object> Values()
+        public ICollection<object> values()
         {
-            return this.originArray;
+            return this.array;
         }
 
-        public void Clear()
+        public void clear()
         {
-            this.originArray.Clear();
+            this.array.Clear();
         }
 
-        public bool Remove(int index)
+        public bool remove(int index)
         {
-            this.originArray.RemoveAt(index);
+            this.array.RemoveAt(index);
 
             return true;
         }
 
-        public int Count()
+        public int count()
         {
-            return this.originArray.Count;
+            return this.array.Count;
         }
 
-        protected object Get<T>(int k, T defaultValue = default(T))
+        protected object get<T>(int k, T defaultValue = default(T))
         {
-            if (k < 0 || k > this.originArray.Count - 1) return defaultValue;
+            if (k < 0 || k > this.array.Count - 1) return defaultValue;
 
-            var value = this.originArray[k];
+            var value = this.array[k];
 
             if (value == null) return defaultValue;
 
@@ -95,155 +131,155 @@
             return value;
         }
 
-        public T[] ToArray<T>()
+        public T[] toArray<T>()
         {
-            var answer = new T[this.originArray.Count];
+            var answer = new T[this.array.Count];
 
-            for (var i = 0; i < this.originArray.Count; i++)
+            for (var i = 0; i < this.array.Count; i++)
             {
-                answer[i] = (T)this.CustomGet(i);
+                answer[i] = (T)this.customGet(i);
             }
 
             return answer;
         }
 
-        public IList<T> ToList<T>()
+        public IList<T> toList<T>()
         {
             var answer = new List<T>();
 
-            for (var i = 0; i < this.originArray.Count; i++)
+            for (var i = 0; i < this.array.Count; i++)
             {
-                answer.Add((T)this.CustomGet(i));
+                answer.Add((T)this.customGet(i));
             }
 
             return answer;
         }
 
-        private object CustomGet(int k)
+        private object customGet(int k)
         {
-            var obj = this.Get<object>(k);
+            var obj = this.get<object>(k);
             if (obj == null) return null;
 
             var objType = obj.GetType();
-            if (objType == typeof(byte)) return this.GetByte(k);
-            else if (objType == typeof(sbyte)) return this.GetSByte(k);
-            else if (objType == typeof(short)) return this.GetShort(k);
-            else if (objType == typeof(int)) return this.GetInt(k);
-            else if (objType == typeof(float)) return this.GetFloat(k);
-            else if (objType == typeof(long)) return this.GetLong(k);
-            else if (objType == typeof(double)) return this.GetDouble(k);
-            else if (objType == typeof(bool)) return this.GetBool(k);
-            else if (objType == typeof(string)) return this.GetString(k);
-            else if (objType == typeof(GNArray) || objType == typeof(System.Collections.IList)) return this.GetGNArray(k);
-            else if (objType == typeof(GNHashtable) || objType == typeof(System.Collections.IDictionary)) return this.GetGNHashtable(k);
+            if (objType == typeof(byte)) return this.getByte(k);
+            else if (objType == typeof(sbyte)) return this.getSByte(k);
+            else if (objType == typeof(short)) return this.getShort(k);
+            else if (objType == typeof(int)) return this.getInt(k);
+            else if (objType == typeof(float)) return this.getFloat(k);
+            else if (objType == typeof(long)) return this.getLong(k);
+            else if (objType == typeof(double)) return this.getDouble(k);
+            else if (objType == typeof(bool)) return this.getBool(k);
+            else if (objType == typeof(string)) return this.getString(k);
+            else if (objType == typeof(GNArray) || objType == typeof(System.Collections.IList)) return this.getGNArray(k);
+            else if (objType == typeof(GNHashtable) || objType == typeof(System.Collections.IDictionary)) return this.getGNHashtable(k);
 
             return obj;
         }
 
-        public byte GetByte(int k, byte defaultValue = 0)
+        public byte getByte(int k, byte defaultValue = 0)
         {
-            return Convert.ToByte(this.Get(k, defaultValue));
+            return Convert.ToByte(this.get(k, defaultValue));
         }
 
-        public sbyte GetSByte(int k, sbyte defaultValue = 0)
+        public sbyte getSByte(int k, sbyte defaultValue = 0)
         {
-            return Convert.ToSByte(this.Get(k, defaultValue));
+            return Convert.ToSByte(this.get(k, defaultValue));
         }
 
-        public short GetShort(int k, short defaultValue = 0)
+        public short getShort(int k, short defaultValue = 0)
         {
-            return Convert.ToInt16(this.Get(k, defaultValue));
+            return Convert.ToInt16(this.get(k, defaultValue));
         }
 
-        public int GetInt(int k, int defaultValue = 0)
+        public int getInt(int k, int defaultValue = 0)
         {
-            return Convert.ToInt32(this.Get(k, defaultValue));
+            return Convert.ToInt32(this.get(k, defaultValue));
         }
 
-        public float GetFloat(int k, float defaultValue = 0)
+        public float getFloat(int k, float defaultValue = 0)
         {
-            return Convert.ToSingle(this.Get(k, defaultValue));
+            return Convert.ToSingle(this.get(k, defaultValue));
         }
 
-        public long GetLong(int k, long defaultValue = 0)
+        public long getLong(int k, long defaultValue = 0)
         {
-            return Convert.ToInt64(this.Get(k, defaultValue));
+            return Convert.ToInt64(this.get(k, defaultValue));
         }
 
-        public double GetDouble(int k, double defaultValue = 0)
+        public double getDouble(int k, double defaultValue = 0)
         {
-            return Convert.ToDouble(this.Get(k, defaultValue));
+            return Convert.ToDouble(this.get(k, defaultValue));
         }
 
-        public bool GetBool(int k, bool defaultValue = false)
+        public bool getBool(int k, bool defaultValue = false)
         {
-            return Convert.ToBoolean(this.Get(k, defaultValue));
+            return Convert.ToBoolean(this.get(k, defaultValue));
         }
 
-        public string GetString(int k, string defaultValue = null)
+        public string getString(int k, string defaultValue = null)
         {
-            return Convert.ToString(this.Get(k, defaultValue));
+            return Convert.ToString(this.get(k, defaultValue));
         }
 
-        public object GetObject(int k, object defaultValue = null)
+        public object getObject(int k, object defaultValue = null)
         {
-            return this.Get(k, defaultValue);
+            return this.get(k, defaultValue);
         }
 
-        public T[] GetArray<T>(int k, T[] defaultValue = null)
+        public T[] getArray<T>(int 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>(int k, IList<T> defaultValue = null)
+        public IList<T> getList<T>(int 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(int k, GNArray defaultValue = null)
+        public GNArray getGNArray(int k, GNArray defaultValue = null)
         {
-            return (GNArray)this.Get(k, defaultValue);
+            return (GNArray)this.get(k, defaultValue);
         }
 
-        public GNHashtable GetGNHashtable(int k, GNHashtable defaultValue = null)
+        public GNHashtable getGNHashtable(int 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 List<object>();
 
-            foreach (var c in originArray)
+            foreach (var c in this.array)
             {
-                answer.Add(CreateGNDataFromUseData(c));
+                answer.Add(GNData.createDataFromUseData(c));
             }
 
             return answer;
         }
 
-        public override string ToString()
+        public override string toString()
         {
             var stringBuilder = new StringBuilder();
             stringBuilder.Append("[");
 
-            for (var i = 0; i < originArray.Count; i++)
+            for (var i = 0; i < this.array.Count; i++)
             {
                 if (i != 0) stringBuilder.Append(",");
 
-                var value = originArray[i];
+                var value = this.array[i];
 
                 if (value == null) stringBuilder.Append("null");
                 else if (value is GNData gnData) stringBuilder.Append(gnData.ToString());
@@ -256,6 +292,11 @@
             return stringBuilder.ToString();
         }
 
+        public override string ToString()
+        {
+            return this.toString();
+        }
+
     }
 
 }

package/Runtime/Common/GNData.cs

@@ -1,21 +1,25 @@
 namespace XmobiTea.GN.Common
 {
-    public class GNData : IGNData
+
+    /// <summary>
+    /// The base class for GNData
+    /// </summary>
+    public abstract class GNData : IGNData
     {
-        protected static object CreateUseDataFromOriginData(object value)
+        protected static object createUseDataFromOriginData(object value)
         {
             if (value == null) return null;
 
             if (value is System.Collections.IList list)
             {
-                var answer = new GNArray.Builder().AddAll(list).Build();
+                var answer = new GNArray.Builder().addAll(list).build();
 
                 return answer;
             }
 
             if (value is System.Collections.IDictionary dict)
             {
-                var answer = new GNHashtable.Builder().AddAll(dict).Build();
+                var answer = new GNHashtable.Builder().addAll(dict).build();
 
                 return answer;
             }
@@ -23,19 +27,21 @@
             return value;
         }
 
-        protected static object CreateGNDataFromUseData(object value)
+        protected static object createDataFromUseData(object value)
         {
             if (value == null) return null;
 
             if (value is IGNData gnData)
             {
-                return gnData.ToData();
+                return gnData.toData();
             }
 
             return value;
         }
 
-        public virtual object ToData() { return null; }
+        public abstract object toData();
+
+        public abstract string toString();
 
     }