打包优化

# Conflicts:
#	GameClient/Assets/Plugins/Android/AndroidManifest.xml

GameClient/Assets/Editor/Excel/ExcelConfig.cs

@@ -5,14 +5,16 @@ namespace GFGEditor
 {
     public class ExcelConfig
     {
+        public static string excelsRootDirNameDressUp = "Config";
         /// <summary>
         /// 存放excel表文件夹的的路径
         /// </summary>
-        public const string excelsFolderPath = "../../../gfg/tools/Config";
+        //public const string excelsFolderPath = "../../../gfg/tools/Config";
+        public static string excelsFolderPath { get { return $"../../../gfg/tools/{excelsRootDirNameDressUp}/"; } }
         /// <summary>
         /// 存放临时excel表文件夹的的路径
         /// </summary>
-        public const string excelsCacheFolderPath = "../../../gfg/tools/Config/CacheConfig/";
+        public static string excelsCacheFolderPath = excelsFolderPath + "/ CacheConfig/";
 
         /// <summary>
         /// 共享库中存放sqlite文件的的路径

GameClient/Assets/Editor/ToolsMenu.cs

@@ -270,7 +270,22 @@ namespace GFGEditor
                 CommitWhenRelease = true;
             }
         }
-
+        [MenuItem("Tools/BuildTest/导入临时版本配置")]
+        public static void SetBundlesExcelTestDir()
+        {
+            try
+            {
+                ImportArtResTool.ResRootDirNameDressUp = "Config-demo1";
+                CommitWhenRelease = false;
+                UpdateAndImportExcel();
+            }
+            catch (Exception e)
+            {
+                Log.Error(e.ToString());
+                ExcelConfig.excelsRootDirNameDressUp = "Config";
+                CommitWhenRelease = true;
+            }
+        }
         [MenuItem("Tools/BuildTest/发布临时版本", false, (int)TOOL_MENU_PRIORITY.BuildBundlesRes)]
         public static void BuildBundlesResTemp()
         {

GameClient/Assets/Editor/Xasset/MenuItems.cs

@@ -29,7 +29,8 @@ namespace VEngine.Editor
             BuildScript.BuildPlayer();
         }
 
-        [MenuItem("XAssets/Versions/Copy To StreamingAssets")]
+        //[MenuItem("XAssets/Versions/Copy To StreamingAssets")]
+        [MenuItem("Tools/BuildTest/Copy To StreamingAssets")]
         public static void CopyToStreamingAssets()
         {
             BuildScript.CopyToStreamingAssets();

GameClient/Assets/Game/HotUpdate/Controller/LogServerHelper.cs

@@ -23,7 +23,7 @@ namespace GFGGame
             var logStr = zoneScene.GetComponent<LogSplicingComponent>().LogObjectToStr(logData);
             //HttpTool.Instance.Post(GameConfig.logApiReportUrl, logStr);
             var body = $"?logStr={logStr}";
-            HttpTool.Instance.Get(GameConfig.logApiReportUrl + body, null);
+            HttpTool.Instance.Get(GameConfig.logApiReportUrl + body, null,false);
         }
         /// <summary>
         /// 发送玩法参与度
@@ -45,7 +45,7 @@ namespace GFGGame
             var logStr = zoneScene.GetComponent<LogSplicingComponent>().LogObjectToStr(logData);
             //HttpTool.Instance.Post(GameConfig.logApiReportUrl, logStr);
             var body = $"?logStr={logStr}";
-            HttpTool.Instance.Get(GameConfig.logApiReportUrl + body, null);
+            HttpTool.Instance.Get(GameConfig.logApiReportUrl + body, null,false);
         }
     }
 }

GameClient/Assets/Game/Launcher/GameLauncher.cs

@@ -3,13 +3,13 @@ using GFGGame;
 using GFGGame.Launcher;
 using FairyGUI;
 using System;
+using System.Collections.Generic;
 
 public class GameLauncher : MonoBehaviour
 {
     private void Awake()
     {
         DontDestroyOnLoad(gameObject);
-
     }
 
     // Start is called before the first frame update
@@ -22,7 +22,7 @@ public class GameLauncher : MonoBehaviour
         HealthAdviceView.Instance.Open();
         InitBugly();
 
-        int time = LauncherConfig.netType == LauncherConfig.EnumNetType.LOCAL ? 1 : 10;
+        int time = LauncherConfig.netType == LauncherConfig.EnumNetType.TISHEN ? 10 : 1;
         Timers.inst.Add(time, 1, (object param) =>
         {
             HealthAdviceView.Instance.Close();
@@ -108,7 +108,7 @@ public class GameLauncher : MonoBehaviour
         {
             BuglyAgent.InitWithAppId("766c5bdb0f");
         }
-        else if (LauncherConfig.netType == LauncherConfig.EnumNetType.DEV)
+        else if (LauncherConfig.netType == LauncherConfig.EnumNetType.TEMP)
         {
             BuglyAgent.InitWithAppId("b6d0b1b8c5");
         }

GameClient/Assets/Game/Launcher/Log/LogServerHelperHttp.cs

@@ -13,7 +13,7 @@ namespace GFGGame
         public static void SendNodeLog(int node, int serverId = 1)
         {
             var body = $"?logStr={LauncherConfig.platformId}|{SystemInfo.deviceUniqueIdentifier}|{node}";
-            HttpTool.Instance.Get(LauncherConfig.logApiReportLauncherUrl + body, null);
+            HttpTool.Instance.Get(LauncherConfig.logApiReportLauncherUrl + body, null,false);
         }
     }
 }

GameClient/Assets/Plugins/Android/AndroidManifest.xml

@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- GENERATED BY UNITY. REMOVE THIS COMMENT TO PREVENT OVERWRITING WHEN EXPORTING AGAIN-->
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player"
-    xmlns:tools="http://schemas.android.com/tools" android:installLocation="preferExternal">
-    <application android:networkSecurityConfig="@xml/network_security_config">
-
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.unity3d.player"
+    xmlns:tools="http://schemas.android.com/tools"
+	android:installLocation="preferExternal">
+	
+    <supports-screens
+        android:smallScreens="true"
+        android:normalScreens="true"
+        android:largeScreens="true"
+        android:xlargeScreens="true"
+        android:anyDensity="true"/>
+    <application>
+        <activity
+			android:name="com.taptap.sdk.TapTapActivity"
+			android:configChanges="keyboard|keyboardHidden|screenLayout|screenSize|orientation"
+			android:exported="false"
+			android:theme="@android:style/Theme.Translucent.NoTitleBar.Fullscreen" />
     </application>
 
     <!--bugly配置权限start-->