Merge branch 'master' into ILRuntime

Author: coding2233

Assets/Game/Scripts/State/CheckResourceState.cs

@@ -180,14 +180,14 @@ private void UpdateResource()
             foreach (var item in _remoteVersion.Resources)
             {
                 //本地有响应文件则跳过
-                if (_localVersion.Resources.Contains(item))
+                if (_localVersion!=null&& _localVersion.Resources!=null&&_localVersion.Resources.Contains(item))
                     continue;
                 string remoteUrl = Path.Combine(GameMode.Resource.ResUpdatePath, item.Name);
                 //获取本地文件的路径
                 string localPath = Path.Combine(GameMode.Resource.LocalPath, item.Name);
-                //创建文件夹
-                int index = localPath.LastIndexOf("/", StringComparison.Ordinal);
-                string localDir = localPath.Substring(0, index);
+	           
+				//创建文件夹
+                string localDir = Path.GetDirectoryName(localPath);
                 if (!Directory.Exists(localDir))
                     Directory.CreateDirectory(localDir);
 

Assets/GameFramework/Resource/ResourceManager.cs

@@ -67,11 +67,7 @@ public string LocalPath
                 return "";
             }
         }
-
-        /// <summary>
-	    /// ab资源默认包名称
-	    /// </summary>
-		public string RootAssetBundle = "AssetBundles/AssetBundles";
+		
 		/// 资源更新的路径
 		/// </summary>
 		public string ResUpdatePath="";
@@ -113,7 +109,7 @@ public void SetResourceHelper(IResourceHelper resourceHelper)
         /// <param name="mainfestName"></param>
         public void SetMainfestAssetBundle(string mainfestName, bool isEncrypt = false)
         {
-            _resourceHelper?.SetResourcePath(LocalPathType, RootAssetBundle, isEncrypt);
+            _resourceHelper?.SetResourcePath(LocalPathType, mainfestName, isEncrypt);
         }
 
         /// <summary>