com.xmobitea.changx.gn-unity 2.5.0 → 2.6.0

package/CHANGELOG.md.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 5a53040ab41691d42adaf25716c0d620
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 5a53040ab41691d42adaf25716c0d620
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor/GNServerSettingsEditor.cs

@@ -1,4 +1,4 @@
-namespace XmobiTea.GN.Editor
+namespace XmobiTea.GearN.Editor
 {
     using System.Collections.Generic;
     using System.IO;
@@ -6,8 +6,8 @@
     using UnityEditor;
 
     using UnityEngine;
-    using XmobiTea.GN.Config;
-    using XmobiTea.GN.Constant;
+    using XmobiTea.GearN.Config;
+    using XmobiTea.GearN.Constant;
     using Debug = UnityEngine.Debug;
 
     [CustomEditor(typeof(GNServerSettings))]
@@ -19,12 +19,13 @@
         SerializedProperty useSsl;
         SerializedProperty useSocket;
         SerializedProperty useHttp;
+        SerializedProperty defaultTimeoutInSeconds;
+        SerializedProperty messageType;
         SerializedProperty sendRate;
         SerializedProperty reconnectDelay;
         SerializedProperty pingInterval;
         SerializedProperty pingTimout;
         SerializedProperty peerSocketVersion;
-        //SerializedProperty gnServerSourcePath;
         SerializedProperty httpRequestType;
         SerializedProperty logType;
         SerializedProperty adminSecretKey;
@@ -43,14 +44,14 @@
             this.useSsl = this.serializedObject.FindProperty("useSsl");
             this.useSocket = this.serializedObject.FindProperty("useSocket");
             this.useHttp = this.serializedObject.FindProperty("useHttp");
+            this.defaultTimeoutInSeconds = this.serializedObject.FindProperty("defaultTimeoutInSeconds");
+            this.messageType = this.serializedObject.FindProperty("messageType");
             this.sendRate = this.serializedObject.FindProperty("sendRate");
             this.reconnectDelay = this.serializedObject.FindProperty("reconnectDelay");
             this.pingInterval = this.serializedObject.FindProperty("pingInterval");
             this.pingTimout = this.serializedObject.FindProperty("pingTimeout");
             this.peerSocketVersion = this.serializedObject.FindProperty("peerSocketVersion");
-            //this.gnServerSourcePath = serializedObject.FindProperty("gnServerSourcePath");
             this.httpRequestType = this.serializedObject.FindProperty("httpRequestType");
-            //postType = serializedObject.FindProperty("postType");
             this.logType = this.serializedObject.FindProperty("logType");
             this.adminSecretKey = this.serializedObject.FindProperty("adminSecretKey");
             this.serverSecretKey = this.serializedObject.FindProperty("serverSecretKey");
@@ -73,7 +74,7 @@
         {
             this.serializedObject.Update();
 
-            EditorGUILayout.LabelField($"GN Unity Client SDK Version v{GNNetwork.getClientSdkVersion()}");
+            EditorGUILayout.LabelField($"GearN Unity Client SDK Version v{GNNetwork.getClientSdkVersion()}");
             EditorGUILayout.Space(20);
 
             EditorGUILayout.PropertyField(this.serverAddress);
@@ -81,6 +82,8 @@
             EditorGUILayout.Space(5);
             EditorGUILayout.PropertyField(this.useSsl);
             EditorGUILayout.PropertyField(this.sendRate);
+            EditorGUILayout.PropertyField(this.defaultTimeoutInSeconds);
+            EditorGUILayout.PropertyField(this.messageType);
             EditorGUILayout.Space(10);
 
             EditorGUILayout.PropertyField(this.useHttp);
@@ -104,17 +107,15 @@
                 EditorGUILayout.PropertyField(this.pingTimout);
                 EditorGUILayout.PropertyField(this.peerSocketVersion);
 #else
-                EditorGUILayout.LabelField("GN Unity Client current only support BEST_HTTP/2 to handle socket");
-                EditorGUILayout.LabelField("You must import BEST_HTTP/2 package");
-                EditorGUILayout.LabelField("\tand define UNITY_USING_BEST_HTTP on Project Settings/Player");
+                EditorGUILayout.LabelField("GearN Unity Client current only support BEST_HTTP/2 or SocketIOUnity to handle socket");
+                EditorGUILayout.LabelField("You must import BEST_HTTP/2 or SocketIOUnity package");
+                EditorGUILayout.LabelField("\tand define UNITY_USING_BEST_HTTP if using BEST_HTTP/2 (or define UNITY_USING_SOCKET_IO_UNITY if using SocketIOUnity) on Project Settings/Player");
                 EditorGUILayout.LabelField("\t\t-> Scripting Define Symbols");
 #endif
             }
 
             EditorGUILayout.Space(20);
 
-            //EditorGUILayout.PropertyField(this.gnServerSourcePath);
-            //EditorGUILayout.PropertyField(postType);
             EditorGUILayout.PropertyField(this.logType);
 
             EditorGUILayout.Space(20);
@@ -125,7 +126,7 @@
             if (this.serializedObject.hasModifiedProperties) this.serializedObject.ApplyModifiedProperties();
         }
 
-        [MenuItem("XmobiTea GN/Open Settings")]
+        [MenuItem("XmobiTea GearN/Open Settings")]
         private static void OpenGNServerSettings()
         {
             var gnServerSettings = GetSettings();
@@ -152,16 +153,22 @@
             return gnServerSettings;
         }
 
-        [MenuItem("XmobiTea GN/About GN")]
+        [MenuItem("XmobiTea GearN/About")]
         private static void AboutGN()
         {
-            Application.OpenURL("https://gn.xmobitea.com");
+            Application.OpenURL("https://gearn.net");
         }
 
-        [MenuItem("XmobiTea GN/Go to GN-server")]
+        [MenuItem("XmobiTea GearN/Documentation")]
+        private static void DocsGearN()
+        {
+            Application.OpenURL("https://docs.gearn.net");
+        }
+
+        [MenuItem("XmobiTea GearN/Go to github")]
         private static void GotoGNserver()
         {
-            Application.OpenURL("https://github.com/XmobiTea-Family/GN-server");
+            Application.OpenURL("https://github.com/XmobiTea-Family/GearN-server");
         }
     }
 }

package/Editor/GNServerSettingsEditor.cs.meta

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

package/Editor/XmobiTea.GN.editor.asmdef.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: ba24c582838c46b46a06e994b21731bf
-AssemblyDefinitionImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: ba24c582838c46b46a06e994b21731bf
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Editor.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: 02ac5a24056066a43ac2ab82682d0154
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 02ac5a24056066a43ac2ab82682d0154
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/LICENSE.md.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: ba566b2bc2e89c443b4cdf2ac1e39355
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: ba566b2bc2e89c443b4cdf2ac1e39355
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/README.md.meta

@@ -1,7 +1,7 @@
-fileFormatVersion: 2
-guid: 3884ab28cd5c49a458e657ffcbb69ff2
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: 3884ab28cd5c49a458e657ffcbb69ff2
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

package/Runtime/Common/Action0.cs

@@ -0,0 +1,5 @@
+namespace XmobiTea.GearN.Common
+{
+    public delegate void Action0();
+
+}

package/Runtime/{Constant/ParameterCode/GNParameterCode.cs.meta → Common/Action0.cs.meta}

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

package/Runtime/Common/Action1.cs

@@ -0,0 +1,5 @@
+namespace XmobiTea.GearN.Common
+{
+    public delegate void Action1<T>(T t);
+
+}

package/Runtime/Common/Action1.cs.meta

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

package/Runtime/Common/Action2.cs

@@ -0,0 +1,5 @@
+namespace XmobiTea.GearN.Common
+{
+    public delegate void Action2<T1, T2>(T1 t1, T2 t2);
+
+}

package/Runtime/Common/Action2.cs.meta

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

package/Runtime/Common/Action3.cs

@@ -0,0 +1,5 @@
+namespace XmobiTea.GearN.Common
+{
+    public delegate void Action3<T1, T2, T3>(T1 t1, T2 t2, T3 t3);
+
+}

package/Runtime/Common/Action3.cs.meta

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

package/Runtime/Common/Action4.cs

@@ -0,0 +1,5 @@
+namespace XmobiTea.GearN.Common
+{
+    public delegate void Action4<T1, T2, T3, T4>(T1 t1, T2 t2, T3 t3, T4 t4);
+
+}

package/Runtime/Common/Action4.cs.meta

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

package/Runtime/Common/GNArray.cs

@@ -1,4 +1,4 @@
-namespace XmobiTea.GN.Common
+namespace XmobiTea.GearN.Common
 {
     using System;
     using System.Collections.Generic;

package/Runtime/Common/GNArray.cs.meta

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

package/Runtime/Common/GNData.cs

@@ -1,10 +1,23 @@
-namespace XmobiTea.GN.Common
+namespace XmobiTea.GearN.Common
 {
+    using System;
+
     /// <summary>
     /// The base class for GNData, providing core functionalities for handling GNData structures.
     /// </summary>
     public abstract class GNData : IGNData
     {
+        private static readonly Type typeOfByte = typeof(byte);
+        private static readonly Type typeOfSByte = typeof(sbyte);
+        private static readonly Type typeOfShort = typeof(short);
+        private static readonly Type typeOfUShort = typeof(ushort);
+        private static readonly Type typeOfInt = typeof(int);
+        private static readonly Type typeOfUInt = typeof(uint);
+        private static readonly Type typeOfFloat = typeof(float);
+        private static readonly Type typeOfLong = typeof(long);
+        private static readonly Type typeOfULong = typeof(ulong);
+        private static readonly Type typeOfDouble = typeof(double);
+
         /// <summary>
         /// Converts origin data (e.g., list or dictionary) into a GNData structure.
         /// </summary>
@@ -26,6 +39,23 @@
                 return answer;
             }
 
+            var valueType = value.GetType();
+            if (valueType.GetType().IsEnum)
+            {
+                var underlyingValueType = Enum.GetUnderlyingType(valueType);
+
+                if (underlyingValueType == GNData.typeOfByte) return Convert.ToByte(value);
+                else if (underlyingValueType == GNData.typeOfSByte) return Convert.ToSByte(value);
+                else if (underlyingValueType == GNData.typeOfShort) return Convert.ToInt16(value);
+                else if (underlyingValueType == GNData.typeOfUShort) return Convert.ToUInt16(value);
+                else if (underlyingValueType == GNData.typeOfInt) return Convert.ToInt32(value);
+                else if (underlyingValueType == GNData.typeOfUInt) return Convert.ToUInt32(value);
+                else if (underlyingValueType == GNData.typeOfFloat) return Convert.ToSingle(value);
+                else if (underlyingValueType == GNData.typeOfLong) return Convert.ToInt64(value);
+                else if (underlyingValueType == GNData.typeOfULong) return Convert.ToUInt64(value);
+                else if (underlyingValueType == GNData.typeOfDouble) return Convert.ToDouble(value);
+            }
+
             return value;
         }
 

package/Runtime/Common/GNData.cs.meta

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

package/Runtime/Common/GNHashtable.cs

@@ -1,4 +1,4 @@
-namespace XmobiTea.GN.Common
+namespace XmobiTea.GearN.Common
 {
     using System;
     using System.Collections.Generic;

package/Runtime/Common/GNHashtable.cs.meta

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

package/Runtime/Common/IGNData.cs

@@ -1,4 +1,4 @@
-namespace XmobiTea.GN.Common
+namespace XmobiTea.GearN.Common
 {
     /// <summary>
     /// Interface defining the structure for GNData objects.

package/Runtime/Common/IGNData.cs.meta

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

package/Runtime/Common.meta

@@ -1,8 +1,8 @@
-fileFormatVersion: 2
-guid: b7214dcb9e233e54b977c23f3c78b4e2
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+fileFormatVersion: 2
+guid: b7214dcb9e233e54b977c23f3c78b4e2
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: