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

package/Runtime/Config/GNServerSettings.cs

@@ -13,8 +13,12 @@
     public enum HttpRequestType
     {
         UnityWebRequest = 0,
+
+#if UNITY_USING_BEST_HTTP
         HTTPRequest = 1,
+#endif
 
+        HttpWebRequest = 2,
     }
 
     //[CreateAssetMenu(fileName = GNServerSettings.ResourcesPath, menuName = "GN/GNServerSettings", order = 1)]
@@ -62,10 +66,7 @@
         private PeerSocketVersion peerSocketVersion = PeerSocketVersion.V3;
 
         [SerializeField]
-        private string gnServerSourcePath = "Template_GN-server";
-
-        [SerializeField]
-        private HttpRequestType httpRequestType = HttpRequestType.HTTPRequest;
+        private HttpRequestType httpRequestType = HttpRequestType.UnityWebRequest;
 
         [SerializeField]
         private GN.Logger.LogType logType = GN.Logger.LogType.All;
@@ -136,11 +137,6 @@
             return this.peerSocketVersion;
         }
 
-        public string getGNServerSourcePath()
-        {
-            return this.gnServerSourcePath;
-        }
-
         public HttpRequestType getHttpRequestType()
         {
             return this.httpRequestType;

package/Runtime/Constant/EnumType/MatchmakingMemberStatus.cs.meta

@@ -1,11 +1,11 @@
-fileFormatVersion: 2
-guid: 3d0ecb4f8957d344aadaae7e4069f4f0
-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.meta

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

package/Runtime/Entity/DataMember.cs

@@ -116,7 +116,7 @@ namespace XmobiTea.GN.Entity
     {
         public override GNFieldDataType gnFieldType => GNFieldDataType.Number;
 
-        public new double defaultValue { get; set; }
+        //public new double defaultValue { get; set; }
         public double minValue { get; set; } = -1;
         public double maxValue { get; set; } = -1;
         public bool mustInt { get; set; } = false;

package/Runtime/Entity/Models/MultiplayerModels.cs.meta

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

package/Runtime/Entity/Models/MultiplayerRequestModels.cs.meta

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

package/Runtime/Entity/Models/MultiplayerResponseModels.cs.meta

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

package/Runtime/GNNetworkMultiplayerApi.cs.meta

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

package/Runtime/Helper/ConverterService.cs

@@ -149,12 +149,18 @@
 
                 if (declaredField.gnFieldType == GNFieldDataType.String)
                 {
-                    if (value == null) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                    if (value == null)
+                    {
+                        if (declaredField.defaultValue != null) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                    }
                     else if (value is string) declaredField.fieldInfo.SetValue(answer, value);
                 }
                 else if (declaredField.gnFieldType == GNFieldDataType.Boolean)
                 {
-                    if (value == null) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
+                    if (value == null)
+                    {
+                        if (declaredField.defaultValue != null) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(declaredField.defaultValue, declaredField.fieldInfo.FieldType));
+                    }
                     else if (value is bool) declaredField.fieldInfo.SetValue(answer, value);
                 }
                 else if (declaredField.gnFieldType == GNFieldDataType.GNHashtable)
@@ -163,15 +169,15 @@
                     {
                         if (declaredField.defaultValue != null)
                         {
-                            if (declaredField.fieldInfo.FieldType == typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, ((GNHashtable)(declaredField.defaultValue)).toData());
+                            if (declaredField.fieldInfo.FieldType == typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(declaredField.defaultValue, declaredField.fieldInfo.FieldType));
+                            else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(((GNHashtable)(declaredField.defaultValue)).toData(), declaredField.fieldInfo.FieldType));
                             else declaredField.fieldInfo.SetValue(answer, this.deserializeObject((GNHashtable)declaredField.defaultValue, declaredField.cls));
                         }
                     }
                     else
                     {
-                        if (declaredField.fieldInfo.FieldType == typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, ((IGNData)value).toData());
+                        if (declaredField.fieldInfo.FieldType == typeOfGNHashtable) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(value, declaredField.fieldInfo.FieldType));
+                        else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IDictionary)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(((IGNData)value).toData(), declaredField.fieldInfo.FieldType));
                         else declaredField.fieldInfo.SetValue(answer, this.deserializeObject((GNHashtable)value, declaredField.cls));
                     }
                 }
@@ -181,20 +187,23 @@
                     {
                         if (declaredField.defaultValue != null)
                         {
-                            if (declaredField.fieldInfo.FieldType == typeOfGNArray) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                            else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, ((GNArray)declaredField.defaultValue).toData());
+                            if (declaredField.fieldInfo.FieldType == typeOfGNArray) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(declaredField.defaultValue, declaredField.fieldInfo.FieldType));
+                            else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(((GNArray)declaredField.defaultValue).toData(), declaredField.fieldInfo.FieldType));
                         }
                     }
                     else
                     {
-                        if (declaredField.fieldInfo.FieldType == typeOfGNArray) declaredField.fieldInfo.SetValue(answer, value);
-                        else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, ((IGNData)value).toData());
+                        if (declaredField.fieldInfo.FieldType == typeOfGNArray) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(value, declaredField.fieldInfo.FieldType));
+                        else if (declaredField.fieldInfo.FieldType == typeof(System.Collections.IList)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(((IGNData)value).toData(), declaredField.fieldInfo.FieldType));
                     }
                 }
                 else if (declaredField.gnFieldType == GNFieldDataType.Number)
                 {
-                    if (value == null) declaredField.fieldInfo.SetValue(answer, declaredField.defaultValue);
-                    else if (ConverterService.isNumber(value)) declaredField.fieldInfo.SetValue(answer, value);
+                    if (value == null)
+                    {
+                        if (declaredField.defaultValue != null) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(declaredField.defaultValue, declaredField.fieldInfo.FieldType));
+                    }
+                    else if (ConverterService.isNumber(value)) declaredField.fieldInfo.SetValue(answer, CustomConvert.ChangeType(value, declaredField.fieldInfo.FieldType));
                 }
                 else
                 {
@@ -385,6 +394,26 @@
         }
     }
 
+    internal class CustomConvert
+    {
+        public static object ChangeType(object value, Type conversion)
+        {
+            var t = conversion;
+
+            if (t.IsGenericType && t.GetGenericTypeDefinition().Equals(typeof(Nullable<>)))
+            {
+                if (value == null)
+                {
+                    return null;
+                }
+
+                t = Nullable.GetUnderlyingType(t);
+            }
+
+            return Convert.ChangeType(value, t);
+        }
+    }
+
     public class ConverterService
     {
         private static SerializeConverter serializeConverter;

package/Runtime/Networking/Http/HttpPeer.cs

@@ -59,8 +59,12 @@
             this.isUse = gnServerSettings.isUseHttp();
 
             var httpRequestType = gnServerSettings.getHttpRequestType();
-            if (httpRequestType == HttpRequestType.HTTPRequest) this.networkingHttpPeerBase = new NetworkingPeerHttpRequest();
-            else this.networkingHttpPeerBase = new NetworkingPeerUnityWebRequest();
+
+#if UNITY_USING_BEST_HTTP
+            if (httpRequestType == HttpRequestType.HTTPRequest) this.networkingHttpPeerBase = new NetworkingPeerHttpRequest(); else
+#endif
+            if (httpRequestType == HttpRequestType.UnityWebRequest) this.networkingHttpPeerBase = new NetworkingPeerUnityWebRequest();
+            else if (httpRequestType == HttpRequestType.HttpWebRequest) this.networkingHttpPeerBase = new NetworkingPeerHttpWebRequest();
 
             var httpUrl = gnServerSettings.getHttpUrl();
             var userAgent = "GN-unity-" + GNNetwork.getPlatform() + "@" + GNNetwork.getClientSdkVersion();