修改资源检查更新

Author: coding2233

Assets/Game/Scripts/Editor/Module/ResourceModuleEditor.cs

@@ -16,16 +16,33 @@ namespace GameFramework.Taurus
 {
 	public class ResourceModuleEditor : ModuleEditorBase
 	{
+		private BuildTargetGroup _lastBuildTargetGroup;
+		private string _lastScriptingDefineSymbols;
+
 		public ResourceModuleEditor(string name, Color mainColor, GameMode gameMode)
 			: base(name, mainColor, gameMode)
 		{
-
+			//获取当前的BuildTargetGroup
+			_lastBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
+			_lastScriptingDefineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(_lastBuildTargetGroup);
 		}
 
 		public override void OnDrawGUI()
 		{
 			GUILayout.BeginVertical("HelpBox");
 
+			GUILayout.BeginHorizontal("HelpBox");
+			GUILayout.Label("Define",GUILayout.Width(50));
+			string scriptingDefineSymbols = PlayerSettings.GetScriptingDefineSymbolsForGroup(_lastBuildTargetGroup);
+			_lastScriptingDefineSymbols = GUILayout.TextArea(_lastScriptingDefineSymbols);
+			if (GUILayout.Button("OK",GUILayout.Width(40))&&!_lastScriptingDefineSymbols.Equals(scriptingDefineSymbols))
+			{
+				_lastBuildTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
+				PlayerSettings.SetScriptingDefineSymbolsForGroup(_lastBuildTargetGroup, _lastScriptingDefineSymbols);
+			}
+			GUILayout.EndHorizontal();
+
+
 			_gameMode.ResUpdateType =
 					(ResourceUpdateType)EditorGUILayout.EnumPopup("Resource Update Type", _gameMode.ResUpdateType);
 			if (_gameMode.ResUpdateType != ResourceUpdateType.Editor)

Assets/Game/Scripts/State/CheckResourceState.cs

@@ -106,7 +106,7 @@ private void OnHttpReadTextSuccess(object sender, IEventArgs e)
             {
                 if (ne.Url == Path.Combine(GameMode.Resource.ResUpdatePath, _assetPlatformVersionText))
                 {
-                    AssetPlatformVersionInfo assetPlatform= JsonUtility.FromJson<AssetPlatformVersionInfo>(ne.Content);
+                    PlatformVersionInfo assetPlatform= JsonUtility.FromJson<PlatformVersionInfo>(ne.Content);
                     string platformName = GetPlatformName();
                     if (assetPlatform.Platforms.Contains(platformName))
                     {
@@ -202,10 +202,10 @@ private bool CompareVersion()
         private void UpdateResource()
         {
 
-			foreach (var item in _remoteVersion.Resources)
+			foreach (var item in _remoteVersion.AssetHashInfos)
             {
                 //本地有响应文件则跳过
-                if (_localVersion!=null&& _localVersion.Resources!=null&&_localVersion.Resources.Contains(item))
+                if (_localVersion!=null&& _localVersion.AssetHashInfos!=null&&_localVersion.AssetHashInfos.Contains(item))
                     continue;
                 string remoteUrl = Path.Combine(GameMode.Resource.ResUpdatePath, item.Name);
                 //获取本地文件的路径

Assets/GameFramework/Config/AssetBundleVersionInfo.cs

@@ -9,41 +9,47 @@
 
 using System;
 using System.Collections.Generic;
-
-[Serializable]
-public class AssetPlatformVersionInfo
-{
-    public int Version;
-    public List<string> Platforms;
-}
-
-[Serializable]
-public class AssetBundleVersionInfo
-{
-    public int Version;
-    public bool IsEncrypt;
-    public string ManifestAssetBundle;
-    public List<ResourcesInfo> Resources;
-}
-
-[Serializable]
-public class ResourcesInfo
+namespace  GameFramework.Taurus
 {
-    public string Name;
-    public string MD5;
-
-    public override bool Equals(object obj)
-    {
-        ResourcesInfo other = obj as ResourcesInfo;
-        if (other.Name.Equals(Name) && other.MD5.Equals(MD5))
-            return true;
-
-        return false;
-    }
-
-    public override int GetHashCode()
-    {
-        return (Name + MD5).GetHashCode();
-    }
-
-}
+	
+	//平台资源信息
+	[System.Serializable]
+	public class PlatformVersionInfo
+	{
+		public int Version;
+		public List<string> Platforms=new List<string>();
+	}
+
+	//资源版本信息
+	[System.Serializable]
+	public class AssetBundleVersionInfo
+	{
+		public int Version=0;
+		public bool IsEncrypt=false;
+        public string ManifestAssetBundle;
+		public List<AssetHashInfo> AssetHashInfos=new List<AssetHashInfo>();
+	}
+	
+	//资源hash值
+	[System.Serializable]
+	public class AssetHashInfo
+	{
+		public string Name;
+		public string Hash;
+
+         public override bool Equals(object obj)
+        {
+            AssetHashInfo other = obj as AssetHashInfo;
+            if (other.Name.Equals(Name) && other.Hash.Equals(Hash))
+                return true;
+
+            return false;
+        }
+
+        public override int GetHashCode()
+        {
+            return (Name + Hash).GetHashCode();
+        }
+
+	}
+}

Assets/GameFramework/Editor/AssetBundleEditor/AssetBundleBuildEditor.cs

@@ -5,9 +5,14 @@
 using System.IO;
 using System;
 
+namespace GameFramework.Taurus
+{
+	
 public class AssetBundleBuildEditor :EditorWindow {
 
-	private static string _configPath="ProjectSettings/AssetBundleEditorConifg.json";
+	//资源信息文本名称
+   	private const string _assetVersionTxt = "AssetVersion.txt";
+	private const string _configPath="ProjectSettings/AssetBundleEditorConifg.json";
 	private static AssetBundleConifgInfo _config;
 	private static List<string> _buildTargets;
 	private static string _outPutPath="";
@@ -183,29 +188,46 @@ private static void BuildTarget(BuildTarget target,BuildAssetBundleOptions optio
 	//保存资源版本信息
 	private static void SaveAssetVersion(string buildPath,BuildTarget target)
 	{
-		AssetVersionInfo assetVersionInfo=new  AssetVersionInfo();
+		string targetBundlePath=Path.Combine(buildPath,target.ToString());
+		if(!File.Exists(targetBundlePath))
+			return;
+
+		AssetBundleVersionInfo assetVersionInfo=new  AssetBundleVersionInfo();
 		assetVersionInfo.Version=_config.Version;
+		assetVersionInfo.ManifestAssetBundle=target.ToString();
 		assetVersionInfo.AssetHashInfos=new List<AssetHashInfo>();
 
-		AssetBundle targetBundle=AssetBundle.LoadFromFile(Path.Combine(buildPath,target.ToString()));
+		AssetBundle targetBundle=AssetBundle.LoadFromFile(targetBundlePath);
 		AssetBundleManifest manifest=targetBundle.LoadAsset<AssetBundleManifest>("AssetBundleManifest");
-		string[] assetNames=manifest.GetAllAssetBundles();
-		for (int i = 0; i < assetNames.Length; i++)
+		List<string> assetNames=new List<string>();
+		assetNames.Add(target.ToString());
+		assetNames.AddRange(manifest.GetAllAssetBundles());
+		for (int i = 0; i < assetNames.Count; i++)
 		{
 			AssetHashInfo assetHashInfo=new AssetHashInfo();
 			assetHashInfo.Name=assetNames[i];
-			assetHashInfo.Hash=manifest.GetAssetBundleHash(assetNames[i]).ToString();
+			//AssetBundleManifest的hashcode 获取一直为00000000000000000000000000000000 于是用版本号代替
+			assetHashInfo.Hash=i==0?_config.Version.ToString():manifest.GetAssetBundleHash(assetNames[i]).ToString();
 			assetVersionInfo.AssetHashInfos.Add(assetHashInfo);
+			//删除manifest文件
+			string manifestPath=Path.Combine(buildPath,assetNames[i],".manifeset");
+			if(File.Exists(manifestPath))
+			{
+				File.Delete(manifestPath);
+			}
 		}
 
 		string json=JsonUtility.ToJson(assetVersionInfo);
-		File.WriteAllText(Path.Combine(buildPath,"version.txt"),json);
+		File.WriteAllText(Path.Combine(buildPath,_assetVersionTxt),json);
 		targetBundle.Unload(true);
 	}
 
 	//保存平台版本信息
 	private static void SavePlatformVersion(List<BuildTarget> targets)
 	{
+		if(targets==null||targets.Count==0)
+			return;
+
 		PlatformVersionInfo platformInfo=new PlatformVersionInfo();
 		platformInfo.Version=_config.Version;
 		platformInfo.Platforms=new List<string>();
@@ -215,7 +237,7 @@ private static void SavePlatformVersion(List<BuildTarget> targets)
 		}
 		string json=JsonUtility.ToJson(platformInfo);
 		//保存平台信息
-		File.WriteAllText(Path.Combine(_config.BuildPath,"version.txt"),json);
+		File.WriteAllText(Path.Combine(_config.BuildPath,_assetVersionTxt),json);
 		//更新资源版本号 -- 保存配置文件
 		_config.Version++;
 		SaveConfig();
@@ -232,30 +254,6 @@ public class AssetBundleConifgInfo
 		public List<int> BuildTargets=new List<int>();
 
 	}
-
-	//平台资源信息
-	[System.Serializable]
-	public class PlatformVersionInfo
-	{
-		public int Version;
-		public List<string> Platforms=new List<string>();
-	}
-
-	//资源版本信息
-	[System.Serializable]
-	public class AssetVersionInfo
-	{
-		public int Version=0;
-		public List<AssetHashInfo> AssetHashInfos=new List<AssetHashInfo>();
-	}
 
-	//资源hash值
-	[System.Serializable]
-	public class AssetHashInfo
-	{
-		public string Name;
-		public string Hash;
 	}
-
-	
-}
+}

ProjectSettings/AssetBundleEditorConifg.json

@@ -1 +1 @@
-{"Version":4,"BuildPath":"Assets","BuildTargets":[24]}
+{"Version":0,"BuildPath":"","BuildTargets":[]}