[change]:移除资源清单的游戏版本号字段

CatImmortal · Mar 27, 2023 · ca4a837 · ca4a837
1 parent 6f66baf
commit ca4a837
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 20 deletions.
diff --git a/Assets/CatAsset/Editor/BuildPipeline/Task/BuildManifest.cs b/Assets/CatAsset/Editor/BuildPipeline/Task/BuildManifest.cs
@@ -62,18 +62,16 @@ public ReturnCode Run()
             //创建资源清单
             CatAssetManifest manifest = new CatAssetManifest
             {
-                GameVersion = Application.version,
                 ManifestVersion = configParam.Config.ManifestVersion,
                 Platform = configParam.TargetPlatform.ToString(),
                 Bundles = new List<BundleManifestInfo>(),
             };
 
             //增加内置Shader资源包的构建信息
-            string builtInShadersBundleName = "UnityBuiltInShaders.bundle";
-            if (results.BundleInfos.ContainsKey(builtInShadersBundleName))
+            if (results.BundleInfos.ContainsKey(RuntimeUtil.BuiltInShaderBundleName))
             {
                 BundleBuildInfo bundleBuildInfo =
-                    new BundleBuildInfo(string.Empty, builtInShadersBundleName, GroupInfo.DefaultGroup, false,
+                    new BundleBuildInfo(string.Empty, RuntimeUtil.BuiltInShaderBundleName, GroupInfo.DefaultGroup, false,
                         configParam.Config.GlobalCompress,configParam.Config.GlobalEncrypt);
                 infoParam.NormalBundleBuilds.Add(bundleBuildInfo);
             }
@@ -98,7 +96,7 @@ public ReturnCode Run()
                     bundleManifestInfo.IsScene = bundleBuildInfo.Assets[0].Name.EndsWith(".unity");
                 }
                 BundleDetails details = results.BundleInfos[bundleManifestInfo.BundleIdentifyName];
-                if (details.Dependencies.Contains(builtInShadersBundleName))
+                if (details.Dependencies.Contains(RuntimeUtil.BuiltInShaderBundleName))
                 {
                     //依赖内置Shader资源包
                     bundleManifestInfo.IsDependencyBuiltInShaderBundle = true;

diff --git a/Assets/CatAsset/Runtime/Database/ManifestInfo/CatAssetManifest.cs b/Assets/CatAsset/Runtime/Database/ManifestInfo/CatAssetManifest.cs
@@ -25,12 +25,7 @@ public class CatAssetManifest
         /// <summary>
         /// 序列化版本
         /// </summary>
-        public const int SerializeVersion = 0;
-
-        /// <summary>
-        /// 游戏版本号
-        /// </summary>
-        public string GameVersion;
+        private const int serializeVersion = 0;
 
         /// <summary>
         /// 清单版本号
@@ -77,8 +72,7 @@ public byte[] SerializeToBinary()
             {
                 using (BinaryWriter writer = new BinaryWriter(ms,Encoding.UTF8))
                 {
-                    writer.Write(SerializeVersion);
-                    writer.Write(GameVersion);
+                    writer.Write(serializeVersion);
                     writer.Write(ManifestVersion);
                     writer.Write(Platform);
 
@@ -109,7 +103,6 @@ public static CatAssetManifest DeserializeFromBinary(byte[] bytes)
                     CatAssetManifest manifest = new CatAssetManifest();
 
                     int serializeVersion = reader.ReadInt32();
-                    manifest.GameVersion = reader.ReadString();
                     manifest.ManifestVersion = reader.ReadInt32();
                     manifest.Platform = reader.ReadString();
 

diff --git a/Assets/CatAsset/Runtime/TaskSystem/Task/LoadTask/LoadBundleTask.cs b/Assets/CatAsset/Runtime/TaskSystem/Task/LoadTask/LoadBundleTask.cs
@@ -340,15 +340,15 @@ protected virtual void LoadDone()
         /// </summary>
         private void CallFinished(bool success)
         {
-            if (!success)
-            {
-                Debug.LogError($"资源包加载失败：{BundleRuntimeInfo.Manifest}");
-            }
-
             foreach (LoadBundleTask task in MergedTasks)
             {
                 if (!task.IsCanceled)
                 {
+                    if (!success)
+                    {
+                        Debug.LogError($"资源包加载失败：{BundleRuntimeInfo.Manifest}");
+                    }
+
                     task.OnFinishedCallback?.Invoke(success);
                 }
             }

diff --git a/Assets/CatAsset/Runtime/Updatable/CatAssetUpdater.cs b/Assets/CatAsset/Runtime/Updatable/CatAssetUpdater.cs
@@ -27,7 +27,6 @@ internal static void GenerateReadWriteManifest()
             //创建 CatAssetManifest
             CatAssetManifest manifest = new CatAssetManifest
             {
-                GameVersion = Application.version,
                 Platform = Application.platform.ToString()
             };