Browse Source

修改yooAssets collect配置

大爷 2 years ago
parent
commit
425eccef35

+ 2 - 3
Unity/Assets/AssetBundleBuilderSetting.asset

@@ -12,11 +12,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09788b4733bab2d4792fdd5d28e7653c, type: 3}
   m_Name: AssetBundleBuilderSetting
   m_EditorClassIdentifier: 
+  BuildVersion: 1
   BuildPipeline: 0
   BuildMode: 0
-  BuildPackage: ABPack
+  BuildTags: 
   CompressOption: 2
   OutputNameStyle: 4
-  CopyBuildinFileOption: 0
-  CopyBuildinFileTags: 
   EncyptionClassName: 

+ 78 - 102
Unity/Assets/AssetBundleCollectorSetting.asset

@@ -12,114 +12,90 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 185f6993d5150494d98da50e26cb1c25, type: 3}
   m_Name: AssetBundleCollectorSetting
   m_EditorClassIdentifier: 
-  ShowPackageView: 0
   EnableAddressable: 1
-  UniqueBundleName: 1
-  ShowEditorAlias: 1
-  Packages:
-  - PackageName: ABPack
-    PackageDesc: "\u6240\u6709AB\u8D44\u6E90"
-    Groups:
-    - GroupName: Code
-      GroupDesc: "\u4EE3\u7801\u70ED\u66F4\u65B0dll"
+  AutoCollectShaders: 1
+  ShadersBundleName: projects_shaders
+  Groups:
+  - GroupName: Code
+    GroupDesc: "\u70ED\u66F4\u4EE3\u7801dll"
+    AssetTags: 
+    ActiveRuleName: EnableGroup
+    Collectors:
+    - CollectPath: Assets/Res/CodeDll
+      CollectorType: 0
+      AddressRuleName: AddressByGroupAndFileName
+      PackRuleName: PackRawFile
+      FilterRuleName: CollectAll
       AssetTags: 
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Res/CodeDll
-        CollectorGUID: da757dced9011254ba04f3974c789071
-        CollectorType: 0
-        AddressRuleName: AddressByGroupAndFileName
-        PackRuleName: PackRawFile
-        FilterRuleName: CollectAll
-        AssetTags: 
-    - GroupName: Config
-      GroupDesc: "\u914D\u7F6E\u8868"
+  - GroupName: Config
+    GroupDesc: "\u914D\u7F6E"
+    AssetTags: 
+    ActiveRuleName: EnableGroup
+    Collectors:
+    - CollectPath: Assets/Res/Config
+      CollectorType: 0
+      AddressRuleName: AddressByGroupAndFileName
+      PackRuleName: PackDirectory
+      FilterRuleName: CollectAll
       AssetTags: 
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Res/Config
-        CollectorGUID: e3ee806e88634b941962f665fd74f7ce
-        CollectorType: 0
-        AddressRuleName: AddressByGroupAndFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-    - GroupName: Scene
-      GroupDesc: "\u573A\u666F"
+  - GroupName: Scene
+    GroupDesc: "\u573A\u666F"
+    AssetTags: 
+    ActiveRuleName: EnableGroup
+    Collectors:
+    - CollectPath: Assets/Scenes
+      CollectorType: 0
+      AddressRuleName: AddressByGroupAndFileName
+      PackRuleName: PackDirectory
+      FilterRuleName: CollectScene
       AssetTags: 
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Scenes
-        CollectorGUID: 921727de139ab454b8a316139a2ed5fa
-        CollectorType: 0
-        AddressRuleName: AddressByGroupAndFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectScene
-        AssetTags: 
-    - GroupName: LightingMap
-      GroupDesc: "\u5149\u7167\u6570\u636E"
+  - GroupName: LightingMap
+    GroupDesc: "\u5149\u7167\u6570\u636E"
+    AssetTags: 
+    ActiveRuleName: EnableGroup
+    Collectors:
+    - CollectPath: Assets/Scenes/Map1
+      CollectorType: 0
+      AddressRuleName: AddressByCollectorAndFileName
+      PackRuleName: PackDirectory
+      FilterRuleName: CollectAll
       AssetTags: 
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Scenes/Map1
-        CollectorGUID: 86d4b5ebfc9e14543a2c898bbe5f3094
-        CollectorType: 0
-        AddressRuleName: AddressByCollectorAndFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-      - CollectPath: Assets/Scenes/Map2
-        CollectorGUID: ce30d988559d293409ac5c52fed873fe
-        CollectorType: 0
-        AddressRuleName: AddressByCollectorAndFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-    - GroupName: FGUI
-      GroupDesc: "FGUI\u8D44\u6E90"
+    - CollectPath: Assets/Scenes/Map2
+      CollectorType: 0
+      AddressRuleName: AddressByCollectorAndFileName
+      PackRuleName: PackDirectory
+      FilterRuleName: CollectAll
       AssetTags: 
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Res/FGUI
-        CollectorGUID: 457c69392f04f5347bc16afd31a42788
-        CollectorType: 0
-        AddressRuleName: AddressByCollectorAndFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-    - GroupName: Shader
-      GroupDesc: "Shader\u6253\u5305"
+  - GroupName: FGUI
+    GroupDesc: "FGUI\u8D44\u6E90"
+    AssetTags: 
+    ActiveRuleName: EnableGroup
+    Collectors:
+    - CollectPath: Assets/Res/FGUI
+      CollectorType: 0
+      AddressRuleName: AddressByGroupAndFileName
+      PackRuleName: PackDirectory
+      FilterRuleName: CollectAll
       AssetTags: 
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Res/Shader
-        CollectorGUID: 9b984ced9cda7a247aabcb97fc1d44d1
-        CollectorType: 0
-        AddressRuleName: AddressByCollectorAndFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectShaderVariants
-        AssetTags: 
-    - GroupName: Material
-      GroupDesc: "\u6750\u8D28\u7403"
+  - GroupName: Shader
+    GroupDesc: 
+    AssetTags: 
+    ActiveRuleName: EnableGroup
+    Collectors:
+    - CollectPath: Assets/Res/Shader
+      CollectorType: 0
+      AddressRuleName: AddressByCollectorAndFileName
+      PackRuleName: PackShaderVariants
+      FilterRuleName: CollectAll
       AssetTags: 
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Res/Mat
-        CollectorGUID: faf34db9a0adfa5479844f8588715832
-        CollectorType: 0
-        AddressRuleName: AddressByFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 
-    - GroupName: Unit
-      GroupDesc: "\u5404\u79CD\u5355\u4F4D\u6A21\u578B"
+  - GroupName: Material
+    GroupDesc: "\u6750\u8D28\u7403"
+    AssetTags: 
+    ActiveRuleName: EnableGroup
+    Collectors:
+    - CollectPath: Assets/Res/Mat
+      CollectorType: 0
+      AddressRuleName: AddressByFileName
+      PackRuleName: PackDirectory
+      FilterRuleName: CollectAll
       AssetTags: 
-      ActiveRuleName: EnableGroup
-      Collectors:
-      - CollectPath: Assets/Res/Unit
-        CollectorGUID: 20054f3f410561544a8b77946c75836d
-        CollectorType: 0
-        AddressRuleName: AddressByGroupAndFileName
-        PackRuleName: PackDirectory
-        FilterRuleName: CollectAll
-        AssetTags: 

+ 1 - 1
Unity/Assets/Plugins/Animancer/Read Me v7.3.asset

@@ -13,4 +13,4 @@ MonoBehaviour:
   m_Name: Read Me v7.3
   m_EditorClassIdentifier: 
   _ExamplesFolder: {fileID: 102900000, guid: 833bcac93994ed2459b0b7f61940e220, type: 3}
-  _DontShowOnStartup: 0
+  _DontShowOnStartup: 1

+ 3 - 1
Unity/Assets/Resources/GlobalConfig.asset

@@ -12,5 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 36527db572638af47b03c805671cba75, type: 3}
   m_Name: GlobalConfig
   m_EditorClassIdentifier: 
-  LoadMode: 1
   CodeMode: 3
+  PlayMode: 2
+  Version: v0.0.1
+  HotfixResUrl: https://star-escort.oss-cn-hangzhou.aliyuncs.com

+ 2 - 2
Unity/Assets/Scripts/Loader/CodeLoader.cs

@@ -51,7 +51,7 @@ namespace ET
             await YooAssetProxy.StartYooAssetEngine(YooAssets.EPlayMode.HostPlayMode);
 
             // Shader Warm Up
-            ShaderVariantCollection shaderVariantCollection =
+            /*ShaderVariantCollection shaderVariantCollection =
                 (await YooAssetProxy.LoadAssetAsync<ShaderVariantCollection>(
                     YooAssetProxy.GetYooAssetFormatResPath("ProjectSShaderVariant",
                         YooAssetProxy.YooAssetResType.Shader)))
@@ -60,7 +60,7 @@ namespace ET
             Stopwatch stopwatch = Stopwatch.StartNew();
             shaderVariantCollection.WarmUp();
             stopwatch.Stop();
-            Log.Info($"Shader Warm Up完成, 耗时: {stopwatch.ElapsedMilliseconds}ms,shaderCount: {shaderVariantCollection.shaderCount} variantCount: {shaderVariantCollection.variantCount}");
+            Log.Info($"Shader Warm Up完成, 耗时: {stopwatch.ElapsedMilliseconds}ms,shaderCount: {shaderVariantCollection.shaderCount} variantCount: {shaderVariantCollection.variantCount}");*/
 
 #if !UNITY_EDITOR
             //给mscorlib.dll等AOT补充元数据