From 93ab6fe56b327576fcaebbc7caa3ee8ea0fe3ff3 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期五, 26 十月 2018 10:36:33 +0800
Subject: [PATCH] 4334 【前端】随包资源支持热更
---
Core/ResModule/AssetBundle/AssetBundleUtility.cs | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/Core/ResModule/AssetBundle/AssetBundleUtility.cs b/Core/ResModule/AssetBundle/AssetBundleUtility.cs
index 92f0e3c..6b41e18 100644
--- a/Core/ResModule/AssetBundle/AssetBundleUtility.cs
+++ b/Core/ResModule/AssetBundle/AssetBundleUtility.cs
@@ -16,7 +16,7 @@
public void InitBuiltInAsset()
{
- var path = AssetVersionUtility.GetAssetFilePath("builtin_assetbundle");
+ var path = AssetVersionUtility.GetBuiltInAssetFilePath("builtin_assetbundle");
var assetBundle = AssetBundle.LoadFromFile(path);
if (assetBundle == null)
{
@@ -142,7 +142,8 @@
yield return Co_LoadAssetBundleDependenice(_assetBundleInfo);
}
- var filePath = AssetVersionUtility.GetAssetFilePath(assetBundleName);
+ var isBuiltin = assetBundleName.Contains("builtin");
+ var filePath = isBuiltin?AssetVersionUtility.GetBuiltInAssetFilePath(assetBundleName) : AssetVersionUtility.GetAssetFilePath(assetBundleName);
DebugEx.LogFormat("Co_LoadAssetBundle(): 灏嗚鍔犺浇鐨刟ssetBundle鍖呰矾寰� => {0}", filePath);
var assetBundle = AssetBundle.LoadFromFile(filePath);
@@ -316,7 +317,8 @@
Sync_LoadAssetBundleDependenice(_assetBundleInfo);
- string _path = AssetVersionUtility.GetAssetFilePath(assetBundleName);
+ var isBuiltin = assetBundleName.Contains("builtin");
+ string _path = isBuiltin ? AssetVersionUtility.GetBuiltInAssetFilePath(assetBundleName) : AssetVersionUtility.GetAssetFilePath(assetBundleName);
AssetBundle _assetBundle = AssetBundle.LoadFromFile(_path);
CacheAssetBundle(assetBundleName, _assetBundle);
--
Gitblit v1.8.0