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

package/Editor/GNServerSettingsEditor.cs

@@ -1,5 +1,6 @@
 namespace XmobiTea.GN.Editor
 {
+    using System.Collections.Generic;
     using System.IO;
     using System.Text;
 
@@ -7,6 +8,7 @@
 
     using UnityEngine;
     using XmobiTea.GN.Config;
+    using XmobiTea.GN.Constant;
     using Debug = UnityEngine.Debug;
 
     [CustomEditor(typeof(GNServerSettings))]
@@ -25,9 +27,12 @@
         SerializedProperty codeCanSendNotAuthorized;
         SerializedProperty gnServerSourcePath;
         SerializedProperty httpRequestType;
-        SerializedProperty postType;
         SerializedProperty logType;
 
+        private Dictionary<int, string> operationCodeFieldDict;
+
+        Color m_Color = Color.white;
+
         private void OnEnable()
         {
             serverAddress = serializedObject.FindProperty("_serverAddress");
@@ -43,14 +48,29 @@
             codeCanSendNotAuthorized = serializedObject.FindProperty("_codeCanSendNotAuthorized");
             gnServerSourcePath = serializedObject.FindProperty("_gnServerSourcePath");
             httpRequestType = serializedObject.FindProperty("_httpRequestType");
-            postType = serializedObject.FindProperty("_postType");
+            //postType = serializedObject.FindProperty("_postType");
             logType = serializedObject.FindProperty("_logType");
+
+            var fields = typeof(OperationCode).GetFields();
+
+            if (operationCodeFieldDict == null) operationCodeFieldDict = new Dictionary<int, string>();
+            else operationCodeFieldDict.Clear();
+
+            for (var i = 0; i < fields.Length; i++)
+            {
+                var field = fields[i];
+
+                operationCodeFieldDict[(int)field.GetValue(null)] = field.Name;
+            }
         }
 
         public override void OnInspectorGUI()
         {
             serializedObject.Update();
 
+            EditorGUILayout.LabelField($"GN Unity Client SDK Version v{GNNetwork.GetClientSdkVersion()}");
+            EditorGUILayout.Space(20);
+
             EditorGUILayout.PropertyField(serverAddress);
             EditorGUILayout.PropertyField(serverPort);
             EditorGUILayout.PropertyField(useSsl);
@@ -61,10 +81,66 @@
             EditorGUILayout.PropertyField(pingInterval);
             EditorGUILayout.PropertyField(pingTimout);
             EditorGUILayout.PropertyField(peerSocketVersion);
-            EditorGUILayout.PropertyField(codeCanSendNotAuthorized);
+            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.EndVertical();
+            EditorGUILayout.Space(20);
+
             EditorGUILayout.PropertyField(gnServerSourcePath);
             EditorGUILayout.PropertyField(httpRequestType);
-            EditorGUILayout.PropertyField(postType);
+            //EditorGUILayout.PropertyField(postType);
             EditorGUILayout.PropertyField(logType);
 
             if (serializedObject.hasModifiedProperties) serializedObject.ApplyModifiedProperties();
@@ -98,7 +174,7 @@
         }
 
         [MenuItem("XmobiTea GN/About GN")]
-        private static void AboutEUNfox()
+        private static void AboutGN()
         {
             Application.OpenURL("https://gn.xmobitea.com");
         }

package/Runtime/Common/GNArray.cs

@@ -54,37 +54,37 @@
 
         public void Add(object value)
         {
-            originArray.Add(CreateUseDataFromOriginData(value));
+            this.originArray.Add(CreateUseDataFromOriginData(value));
         }
 
         public ICollection<object> Values()
         {
-            return originArray;
+            return this.originArray;
         }
 
         public void Clear()
         {
-            originArray.Clear();
+            this.originArray.Clear();
         }
 
         public bool Remove(int index)
         {
-            originArray.RemoveAt(index);
+            this.originArray.RemoveAt(index);
 
             return true;
         }
 
         public int Count()
         {
-            return originArray.Count;
+            return this.originArray.Count;
         }
 
         protected object Get<T>(int k, T defaultValue = default(T))
         {
-            if (k < 0 || k > originArray.Count - 1) return defaultValue;
+            if (k < 0 || k > this.originArray.Count - 1) return defaultValue;
+
+            var value = this.originArray[k];
 
-            var value = originArray[k];
-            
             if (value == null) return defaultValue;
 
             if (value is T t)
@@ -97,11 +97,11 @@
 
         public T[] ToArray<T>()
         {
-            var answer = new T[originArray.Count];
+            var answer = new T[this.originArray.Count];
 
-            for (var i = 0; i < originArray.Count; i++)
+            for (var i = 0; i < this.originArray.Count; i++)
             {
-                answer[i] = (T)Get<T>(i);
+                answer[i] = (T)this.CustomGet(i);
             }
 
             return answer;
@@ -111,67 +111,88 @@
         {
             var answer = new List<T>();
 
-            for (var i = 0; i < originArray.Count; i++)
+            for (var i = 0; i < this.originArray.Count; i++)
             {
-                answer.Add((T)Get<T>(i));
+                answer.Add((T)this.CustomGet(i));
             }
 
             return answer;
         }
 
+        private object CustomGet(int 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);
+
+            return obj;
+        }
+
         public byte GetByte(int k, byte defaultValue = 0)
         {
-            return Convert.ToByte(Get(k, defaultValue));
+            return Convert.ToByte(this.Get(k, defaultValue));
         }
 
         public sbyte GetSByte(int k, sbyte defaultValue = 0)
         {
-            return Convert.ToSByte(Get(k, defaultValue));
+            return Convert.ToSByte(this.Get(k, defaultValue));
         }
 
         public short GetShort(int k, short defaultValue = 0)
         {
-            return Convert.ToInt16(Get(k, defaultValue));
+            return Convert.ToInt16(this.Get(k, defaultValue));
         }
 
         public int GetInt(int k, int defaultValue = 0)
         {
-            return Convert.ToInt32(Get(k, defaultValue));
+            return Convert.ToInt32(this.Get(k, defaultValue));
         }
 
         public float GetFloat(int k, float defaultValue = 0)
         {
-            return Convert.ToSingle(Get(k, defaultValue));
+            return Convert.ToSingle(this.Get(k, defaultValue));
         }
 
         public long GetLong(int k, long defaultValue = 0)
         {
-            return Convert.ToInt64(Get(k, defaultValue));
+            return Convert.ToInt64(this.Get(k, defaultValue));
         }
 
         public double GetDouble(int k, double defaultValue = 0)
         {
-            return Convert.ToDouble(Get(k, defaultValue));
+            return Convert.ToDouble(this.Get(k, defaultValue));
         }
 
         public bool GetBool(int k, bool defaultValue = false)
         {
-            return Convert.ToBoolean(Get(k, defaultValue));
+            return Convert.ToBoolean(this.Get(k, defaultValue));
         }
 
         public string GetString(int k, string defaultValue = null)
         {
-            return Convert.ToString(Get(k, defaultValue));
+            return Convert.ToString(this.Get(k, defaultValue));
         }
 
         public object GetObject(int k, object defaultValue = null)
         {
-            return Get(k, defaultValue);
+            return this.Get(k, defaultValue);
         }
 
         public T[] GetArray<T>(int k, T[] defaultValue = null)
         {
-            var value0 = GetGNArray(k);
+            var value0 = this.GetGNArray(k);
             if (value0 != null)
             {
                 return value0.ToArray<T>();
@@ -182,7 +203,7 @@
 
         public IList<T> GetList<T>(int k, IList<T> defaultValue = null)
         {
-            var value0 = GetGNArray(k);
+            var value0 = this.GetGNArray(k);
             if (value0 != null)
             {
                 return value0.ToList<T>();
@@ -193,12 +214,12 @@
 
         public GNArray GetGNArray(int k, GNArray defaultValue = null)
         {
-            return (GNArray)Get(k, defaultValue);
+            return (GNArray)this.Get(k, defaultValue);
         }
 
         public GNHashtable GetGNHashtable(int k, GNHashtable defaultValue = null)
         {
-            return (GNHashtable)Get(k, defaultValue);
+            return (GNHashtable)this.Get(k, defaultValue);
         }
 
         public override object ToData()
@@ -234,5 +255,7 @@
             stringBuilder.Append("]");
             return stringBuilder.ToString();
         }
+
     }
+
 }

package/Runtime/Common/GNData.cs

@@ -1,8 +1,5 @@
 namespace XmobiTea.GN.Common
 {
-    using System;
-    using System.Collections.Generic;
-
     public class GNData : IGNData
     {
         protected static object CreateUseDataFromOriginData(object value)
@@ -11,12 +8,7 @@
 
             if (value is System.Collections.IList list)
             {
-                var answer = new GNArray();
-
-                for (var i = 0; i < list.Count; i++)
-                {
-                    answer.Add(list[i]);
-                }
+                var answer = new GNArray.Builder().AddAll(list).Build();
 
                 return answer;
             }
@@ -44,5 +36,7 @@
         }
 
         public virtual object ToData() { return null; }
+
     }
+
 }

package/Runtime/Common/GNHashtable.cs

@@ -12,7 +12,7 @@
 
             public Builder Add(string key, object value)
             {
-                originObject[key] = value;
+                this.originObject[key] = value;
 
                 return this;
             }
@@ -24,7 +24,7 @@
                 {
                     if (key is string keyStr)
                     {
-                        Add(keyStr, dict[key]);
+                        this.Add(keyStr, dict[key]);
                     }
                 }
 
@@ -46,7 +46,7 @@
 
             public Builder()
             {
-                originObject = new Dictionary<string, object>();
+                this.originObject = new Dictionary<string, object>();
             }
         }
 
@@ -59,44 +59,44 @@
 
         public void Add(string key, object value)
         {
-            originObject[key] = CreateUseDataFromOriginData(value);
+            this.originObject[key] = CreateUseDataFromOriginData(value);
         }
 
         public ICollection<object> Values()
         {
-            return originObject.Values;
+            return this.originObject.Values;
         }
 
         public ICollection<string> Keys()
         {
-            return originObject.Keys;
+            return this.originObject.Keys;
         }
 
         public bool ContainsKey(string key)
         {
-            return originObject.ContainsKey(key);
+            return this.originObject.ContainsKey(key);
         }
 
         public void Clear()
         {
-            originObject.Clear();
+            this.originObject.Clear();
         }
 
         public bool Remove(string key)
         {
-            return originObject.Remove(key);
+            return this.originObject.Remove(key);
         }
 
         public int Count()
         {
-            return originObject.Count;
+            return this.originObject.Count;
         }
 
         protected object Get<T>(string k, T defaultValue = default(T))
         {
-            if (originObject.ContainsKey(k))
+            if (this.originObject.ContainsKey(k))
             {
-                var value = originObject[k];
+                var value = this.originObject[k];
 
                 if (value == null) return defaultValue;
 
@@ -113,57 +113,57 @@
 
         public byte GetByte(string k, byte defaultValue = 0)
         {
-            return Convert.ToByte(Get(k, defaultValue));
+            return Convert.ToByte(this.Get(k, defaultValue));
         }
 
         public sbyte GetSByte(string k, sbyte defaultValue = 0)
         {
-            return Convert.ToSByte(Get(k, defaultValue));
+            return Convert.ToSByte(this.Get(k, defaultValue));
         }
 
         public short GetShort(string k, short defaultValue = 0)
         {
-            return Convert.ToInt16(Get(k, defaultValue));
+            return Convert.ToInt16(this.Get(k, defaultValue));
         }
 
         public int GetInt(string k, int defaultValue = 0)
         {
-            return Convert.ToInt32(Get(k, defaultValue));
+            return Convert.ToInt32(this.Get(k, defaultValue));
         }
 
         public float GetFloat(string k, float defaultValue = 0)
         {
-            return Convert.ToSingle(Get(k, defaultValue));
+            return Convert.ToSingle(this.Get(k, defaultValue));
         }
 
         public long GetLong(string k, long defaultValue = 0)
         {
-            return Convert.ToInt64(Get(k, defaultValue));
+            return Convert.ToInt64(this.Get(k, defaultValue));
         }
 
         public double GetDouble(string k, double defaultValue = 0)
         {
-            return Convert.ToDouble(Get(k, defaultValue));
+            return Convert.ToDouble(this.Get(k, defaultValue));
         }
 
         public bool GetBool(string k, bool defaultValue = false)
         {
-            return Convert.ToBoolean(Get(k, defaultValue));
+            return Convert.ToBoolean(this.Get(k, defaultValue));
         }
 
         public string GetString(string k, string defaultValue = null)
         {
-            return Convert.ToString(Get(k, defaultValue));
+            return Convert.ToString(this.Get(k, defaultValue));
         }
 
         public object GetObject(string k, object defaultValue = null)
         {
-            return Get(k, defaultValue);
+            return this.Get(k, defaultValue);
         }
 
         public T[] GetArray<T>(string k, T[] defaultValue = null)
         {
-            var value0 = GetGNArray(k);
+            var value0 = this.GetGNArray(k);
             if (value0 != null)
             {
                 return value0.ToArray<T>();
@@ -174,7 +174,7 @@
 
         public IList<T> GetList<T>(string k, IList<T> defaultValue = null)
         {
-            var value0 = GetGNArray(k);
+            var value0 = this.GetGNArray(k);
             if (value0 != null)
             {
                 return value0.ToList<T>();
@@ -185,19 +185,19 @@
 
         public GNArray GetGNArray(string k, GNArray defaultValue = null)
         {
-            return (GNArray)Get(k, defaultValue);
+            return (GNArray)this.Get(k, defaultValue);
         }
 
         public GNHashtable GetGNHashtable(string k, GNHashtable defaultValue = null)
         {
-            return (GNHashtable)Get(k, defaultValue);
+            return (GNHashtable)this.Get(k, defaultValue);
         }
 
         public override object ToData()
         {
             var answer = new Dictionary<string, object>();
 
-            foreach (var c in originObject)
+            foreach (var c in this.originObject)
             {
                 answer.Add(c.Key, CreateGNDataFromUseData(c.Value));
             }
@@ -211,7 +211,7 @@
             stringBuilder.Append("{");
 
             var i = 0;
-            foreach (var c in originObject)
+            foreach (var c in this.originObject)
             {
                 if (i != 0) stringBuilder.Append(",");
 
@@ -227,5 +227,7 @@
             stringBuilder.Append("}");
             return stringBuilder.ToString();
         }
+
     }
+
 }

package/Runtime/Common/IGNData.cs

@@ -1,9 +1,9 @@
 namespace XmobiTea.GN.Common
 {
-    using System.Collections.Generic;
-
     public interface IGNData
     {
         object ToData();
+
     }
+
 }

package/Runtime/Config/GNServerSettings.cs

@@ -19,12 +19,6 @@
         HTTPRequest = 1,
     }
 
-    public enum PostType
-    {
-        Json,
-        MsgPack
-    }
-
     //[CreateAssetMenu(fileName = GNServerSettings.ResourcesPath, menuName = "GN/GNServerSettings", order = 1)]
     public class GNServerSettings : ScriptableObject
     {
@@ -32,79 +26,78 @@
 
         [SerializeField]
         private string _serverAddress = "127.0.0.1";
-        public string serverAddress => _serverAddress;
+        public string serverAddress => this._serverAddress;
 
         [SerializeField]
         private int _serverPort = 2202;
-        public int serverPort => _serverPort;
+        public int serverPort => this._serverPort;
 
         [SerializeField]
         private bool _useSsl = false;
-        public bool useSsl => _useSsl;
+        public bool useSsl => this._useSsl;
 
         [SerializeField]
         private bool _useSocket = true;
-        public bool useSocket => _useSocket;
+        public bool useSocket => this._useSocket;
 
         [SerializeField]
         private bool _useHttp = true;
-        public bool useHttp => _useHttp;
+        public bool useHttp => this._useHttp;
 
         [SerializeField]
         private int _sendRate = 20;
-        public int sendRate => _sendRate;
+        public int sendRate => this._sendRate;
 
         [SerializeField]
         private int _reconnectDelay = 5000;
-        public int reconnectDelay => _reconnectDelay;
+        public int reconnectDelay => this._reconnectDelay;
 
         [SerializeField]
         private float _pingInterval = 20000;
-        public float pingInterval => _pingInterval;
+        public float pingInterval => this._pingInterval;
 
         [SerializeField]
         private float _pingTimeout = 20000;
-        public float pingTimeout => _pingTimeout;
+        public float pingTimeout => this._pingTimeout;
 
         [SerializeField]
         private PeerSocketVersion _peerSocketVersion = PeerSocketVersion.V3;
-        public PeerSocketVersion peerSocketVersion => _peerSocketVersion;
+        public PeerSocketVersion peerSocketVersion => this._peerSocketVersion;
 
         [SerializeField]
         private List<int> _codeCanSendNotAuthorized = new List<int>() { OperationCode.Debug, OperationCode.GetAppConfig, OperationCode.Login, OperationCode.RegisterAccount };
-        public List<int> codeCanSendNotAuthorized => _codeCanSendNotAuthorized;
+        public List<int> codeCanSendNotAuthorized => this._codeCanSendNotAuthorized;
 
         [SerializeField]
         private string _gnServerSourcePath = "Template_GN-server";
-        public string gnServerSourcePath => _gnServerSourcePath;
+        public string gnServerSourcePath => this._gnServerSourcePath;
 
         [SerializeField]
         private HttpRequestType _httpRequestType = HttpRequestType.HTTPRequest;
-        public HttpRequestType httpRequestType => _httpRequestType;
-
-        [SerializeField]
-        private PostType _postType = PostType.MsgPack;
-        public PostType postType => _postType;
+        public HttpRequestType httpRequestType => this._httpRequestType;
 
         [SerializeField]
         private GN.Logger.LogType _logType = GN.Logger.LogType.All;
-        public GN.Logger.LogType logType => _logType;
+        public GN.Logger.LogType logType => this._logType;
 
         public string SocketUrl
         {
             get
             {
-                if (_serverPort < 0) return string.Format((_useSsl ? "https" : "http") + "://{0}", _serverAddress);
-                else return string.Format((_useSsl ? "https" : "http") + "://{0}:{1}", _serverAddress, _serverPort);
+                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 HttpUrl
         {
             get
             {
-                if (_serverPort < 0) return string.Format((_useSsl ? "https" : "http") + "://{0}", _serverAddress);
-                else return string.Format((_useSsl ? "https" : "http") + "://{0}:{1}", _serverAddress, _serverPort);
+                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);
             }
         }
+
     }
+
 }