Merge branch 'master' of http://10.108.64.190:3000/gfg/client

GameClient/Assets/Game/Launcher/LauncherConfig.cs

@@ -79,7 +79,7 @@ namespace GFGGame
         {
             var result = JsonMapper.ToObject<Result>(json);
             LauncherConfig.CDN_ROOT = result.cdnRoot;
-            CDN_ROOT = "http://10.108.64.111/";
+            //CDN_ROOT = "http://10.108.64.127/";
             LauncherConfig.logApiRootUrl = result.logApiUrl;
             //LauncherConfig.logApiRootUrl = "http://10.108.64.106:8080/api/Log/";
             LauncherConfig.logApiReportLauncherUrl = LauncherConfig.logApiRootUrl + "ReportNode";

GameClient/Assets/Resources/PlayerSettings.asset

@@ -13,9 +13,9 @@ MonoBehaviour:
   m_Name: PlayerSettings
   m_EditorClassIdentifier: 
   assets:
-  - privacypolicy_e461d2650407bfd62eed05528a42a930
-  - privacypolicychildren_a17f5598281df0170822d3dcee83535c
-  - serviceprotocal_0c71ba09ca81c447e69fed2f73917c27
+  - privacypolicy_e619923224a05b27c6edbab55b2afbf7
+  - privacypolicychildren_4b4c084ab06cd5a3370e845b1479a003
+  - serviceprotocal_c45e9bb36af2e000bbfa833337c6c345
   - Manifest.version
   - Manifest
   offlineMode: 0

GameClient/Assets/StreamingAssets/Bundles/Manifest

@@ -1 +1 @@
-{"version":1,"appVersion":"1.3","bundles":[{"id":0,"name":"privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":9314,"crc":572161448,"nameWithAppendHash":"privacypolicy_e461d2650407bfd62eed05528a42a930","dependencies":[]},{"id":1,"name":"privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":12857,"crc":2519968594,"nameWithAppendHash":"privacypolicychildren_a17f5598281df0170822d3dcee83535c","dependencies":[]},{"id":2,"name":"serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":14562,"crc":72902517,"nameWithAppendHash":"serviceprotocal_0c71ba09ca81c447e69fed2f73917c27","dependencies":[]}]}
+{"version":1,"appVersion":"1.4","bundles":[{"id":0,"name":"privacypolicy","assets":["Assets/ResIn/Txt/privacyPolicy.txt"],"size":9314,"crc":65622739,"nameWithAppendHash":"privacypolicy_e619923224a05b27c6edbab55b2afbf7","dependencies":[]},{"id":1,"name":"privacypolicychildren","assets":["Assets/ResIn/Txt/privacyPolicyChildren.txt"],"size":12857,"crc":2147024475,"nameWithAppendHash":"privacypolicychildren_4b4c084ab06cd5a3370e845b1479a003","dependencies":[]},{"id":2,"name":"serviceprotocal","assets":["Assets/ResIn/Txt/serviceProtocal.txt"],"size":14562,"crc":952260727,"nameWithAppendHash":"serviceprotocal_c45e9bb36af2e000bbfa833337c6c345","dependencies":[]}]}

GameClient/Assets/StreamingAssets/Bundles/Manifest.version

@@ -1 +1 @@
-{"crc":77799902,"size":664,"version":1,"appVersion":"1.3"}
+{"crc":2604006040,"size":664,"version":1,"appVersion":"1.4"}

GameClient/Assets/StreamingAssets/Bundles/privacypolicychildren_a17f5598281df0170822d3dcee83535c.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: 17c718991dc526a47a48d0af3263a820
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Unity-Logs-Viewer/Reporter/Reporter.cs

@@ -1850,7 +1850,7 @@ public class Reporter : MonoBehaviour
 #endif
 
 		calculateStartIndex();
-		if (!show && isGestureDone()) {
+		if (!show && isGestureDone() && GFGGame.LauncherConfig.onDebug > 0) {
 			doShow();
 		}
 

GameClient/ProjectSettings/ProjectSettings.asset

@@ -145,7 +145,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.4
+  bundleVersion: 1.6
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0