内网打包

GameClient/Assets/BuildSetting.asset

@@ -22,9 +22,16 @@ MonoBehaviour:
   - Assets/ResIn/Dll
   dirTypeList:
   - texture_dressup_es_
+  - texture_dressup_zr_
+  - texture_dressup_xz_
   - texture_dressup_js_
-  - texture_dressup_ss_
   - texture_dressup_ts_
-  - texture_dressup_xz_
-  - texture_dressup_zr_
+  - texture_dressup_ss_
   - prefab_
+  - txt_
+  - material_effect_
+  - texture_icon_
+  - fight_
+  - texture_fieldguide_icon_
+  - font_
+  - model_

GameClient/Assets/BuildSetting.asset.meta

@@ -2,7 +2,7 @@ fileFormatVersion: 2
 guid: fc6938ed19702ef4ea62d58dc96bd923
 NativeFormatImporter:
   externalObjects: {}
-  mainObjectFileID: 11400000
+  mainObjectFileID: 0
   userData: 
   assetBundleName: 
   assetBundleVariant: 

GameClient/Assets/BuildSetting1.asset

@@ -1,35 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
---- !u!114 &11400000
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: e5e55fcd4ab13e0499f04a829427db8b, type: 3}
-  m_Name: BuildSetting1
-  m_EditorClassIdentifier: 
-  dirBundleList:
-  - Assets/Res/Animation/Card
-  - Assets/Res/Animation/DressUp
-  - Assets/Res/Effect/DressUp
-  - Assets/Res/Effect/DressUpAni
-  - Assets/Res/Effect/UI
-  - Assets/ResIn/UI
-  - Assets/ResIn/Dll
-  dirTypeList:
-  - texture_dressup_es_
-  - texture_dressup_zr_
-  - texture_dressup_xz_
-  - texture_dressup_js_
-  - texture_dressup_ts_
-  - texture_dressup_ss_
-  - prefab_
-  - txt_
-  - material_effect_
-  - texture_icon_
-  - fight_
-  - texture_fieldguide_icon_

GameClient/Assets/BuildSetting1.asset.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: 3d6745b5d6c6c494db20611090156808
-NativeFormatImporter:
-  externalObjects: {}
-  mainObjectFileID: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

GameClient/Assets/Editor/ArtsRes/ImportArtResTool.cs

@@ -263,7 +263,7 @@ namespace GFGEditor
             }
             foreach (string dir in sourceDirs)
             {
-                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader", ".tga", ".FBX", ".max" }, ragule);
+                files = FileUtil.CopyFilesTo(dir, targetDir, saveName, new string[] { ".png", ".jpg", ".mp3", ".meta", ".mat", ".shader", ".tga", ".FBX"}, ragule);
                 foreach (var file in files)
                 {
                     Debug.LogFormat("更新{0}", file);

GameClient/Assets/Editor/ToolsMenu.cs

@@ -314,7 +314,7 @@ namespace GFGEditor
         [MenuItem("Tools/Build/Build Bundles Res Init")]
         public static void BuildBundlesResIn()
         {
-            BuildScript.BuildCustomBundles(new string[] { "ResIn/Txt" }, "BuildSetting");
+            BuildScript.BuildCustomBundles(new string[] { "ResIn/Font" }, "BuildSetting");
         }
 
         [MenuItem("Tools/Build/Build Bundles All")]

GameClient/Assets/Resources/PlayerSettings.asset

@@ -13,9 +13,15 @@ MonoBehaviour:
   m_Name: PlayerSettings
   m_EditorClassIdentifier: 
   assets:
-  - privacypolicy_ed19a0cca9d07246eb1d85aa4bd69bbe
-  - privacypolicychildren_679f2f31989b3002daf503519fd771c5
-  - serviceprotocal_4a2a3eefdbec744df05fd8a503579d37
+  - fangzhengheitijianti-1_5a14c373cf8452ddb058c03bbe7254cd
+  - fzktjw--gb1-0_3abd4ead28ccd67e822cb1e278ca6da6
+  - sourcehanserifcn-bold-2_2a652db9af485f8969860f57a504dcb5
+  - sourcehanserifcn-extralight-3_d1ce9cf695002588d362057b69bb614c
+  - sourcehanserifcn-heavy-4_8be11de7b62ae116a5801e84c2295978
+  - sourcehanserifcn-light-5_71b6c1ff99427e71c9dd7598a155f9e2
+  - sourcehanserifcn-medium-6_c5d87031dac408fecddf9bfd42bafb09
+  - sourcehanserifcn-regular-1_827f0b7e3653035229eaa26ebaff940e
+  - sourcehanserifcn-semibold-7_ba893df23d35cb2a2fea13defe7da3a8
   - Manifest.version
   - Manifest
   offlineMode: 0

GameClient/Assets/StreamingAssets/Bundles/Manifest.version

@@ -1 +1 @@
-{"crc":2591188714,"size":666,"version":1,"appVersion":"1.6"}
+{"crc":426557319,"size":2183,"version":1,"appVersion":"1.6"}

GameClient/ProjectSettings/ProjectSettings.asset

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