diff --git a/Assets/00.StaryEvoTools/Editor/Build/AutoBuildPackage.cs b/Assets/00.StaryEvoTools/Editor/Build/AutoBuildPackage.cs index bbda032..60b804c 100644 --- a/Assets/00.StaryEvoTools/Editor/Build/AutoBuildPackage.cs +++ b/Assets/00.StaryEvoTools/Editor/Build/AutoBuildPackage.cs @@ -1,3 +1,4 @@ +using System; using System.Collections.Generic; using System.Threading.Tasks; using HybridCLR.Editor.Commands; @@ -47,16 +48,16 @@ namespace Stary.Evo.Editor #endif } - public static void OneShaderMark() + public static void OneShaderMark(Action complete) { - OneShaderMark(GetOneKeyBuildEntities()); + OneShaderMark(GetOneKeyBuildEntities(),complete); } /// /// (一键)收集shader【材质异常或资源修改】 /// /// - public static void OneShaderMark(List oneKeyBuildEntities) + public static void OneShaderMark(List oneKeyBuildEntities,Action complete) { #if HotUpdate //标记全部资源 @@ -65,7 +66,10 @@ namespace Stary.Evo.Editor if (oneKeyBUildEntity.isRaw) { MarkAdressable.CollectSvc(MarkAdressable.DomainRoot, oneKeyBUildEntity.DomainName, - () => { EditorUtility.DisplayDialog("收集shader【材质异常或资源修改】", "收集成功", "确定"); }); + () => + { + complete?.Invoke(oneKeyBUildEntity.DomainName); + }); } } diff --git a/Assets/00.StaryEvoTools/Editor/Build/BuildApkWindow.cs b/Assets/00.StaryEvoTools/Editor/Build/BuildApkWindow.cs index 724c522..615a6fc 100644 --- a/Assets/00.StaryEvoTools/Editor/Build/BuildApkWindow.cs +++ b/Assets/00.StaryEvoTools/Editor/Build/BuildApkWindow.cs @@ -70,6 +70,7 @@ namespace Stary.Evo.Editor StreamingAssetsFilter.KeepFiles=new string[0]; StreamingAssetsFilter.OnPreprocessBuild(); } + ShowNotification(new GUIContent("拷贝完成!"), 2f); } [ButtonGroup] [Button("$GetBuildAPKName", ButtonSizes.Large, ButtonStyle.FoldoutButton)] diff --git a/Assets/00.StaryEvoTools/Editor/Build/StreamingAssetsFilter.cs b/Assets/00.StaryEvoTools/Editor/Build/StreamingAssetsFilter.cs index cc559bd..f945738 100644 --- a/Assets/00.StaryEvoTools/Editor/Build/StreamingAssetsFilter.cs +++ b/Assets/00.StaryEvoTools/Editor/Build/StreamingAssetsFilter.cs @@ -44,7 +44,8 @@ public static class StreamingAssetsFilter // 移动到临时目录 string backupPath = Path.Combine(tempBackupPath, relativePath); Directory.CreateDirectory(Path.GetDirectoryName(backupPath)); - File.Move(file, backupPath); + File.Copy(file, backupPath,true); + File.Delete(file); } } @@ -72,7 +73,12 @@ public static class StreamingAssetsFilter string relativePath = file.Replace(tempBackupPath + Path.DirectorySeparatorChar, "") .Replace(tempBackupPath, ""); string originalPath = Path.Combine(streamingAssetsPath, relativePath); - + // 检查目标文件是否已存在 + if (File.Exists(originalPath)) + { + Debug.Log($"跳过恢复: {originalPath} (文件已存在)"); + return; + } Directory.CreateDirectory(Path.GetDirectoryName(originalPath)); File.Move(file, originalPath); } diff --git a/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangeHotUpdateMode.cs b/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangeHotUpdateMode.cs index aab0fa8..9ff6bd4 100644 --- a/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangeHotUpdateMode.cs +++ b/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangeHotUpdateMode.cs @@ -52,7 +52,6 @@ namespace Stary.Evo.Editor // 添加新模式 defines.Add(mode.ToString()); PlayerSettings.SetScriptingDefineSymbolsForGroup(currentTarget, string.Join(";", defines)); - Debug.Log($"当前编译符号: {string.Join(";", defines)}"); // 添加调试日志 _hotUpdate = mode; CustomEditorPrefs.SetString("ChangeHotUpdateSchema", _hotUpdate.ToString()); @@ -61,9 +60,8 @@ namespace Stary.Evo.Editor // 添加解决方案文件重新生成逻辑 EditorApplication.delayCall += () => { - EditorApplication.ExecuteMenuItem("Assets/Open C# Project"); UnityEditor.Compilation.CompilationPipeline.RequestScriptCompilation(); - Debug.Log("已强制重新生成解决方案文件"); + Debug.Log($"当前编译符号: {string.Join(";", defines)}"); // 添加调试日志 }; } } diff --git a/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangePlayerMode.cs b/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangePlayerMode.cs index 3509525..37d3d41 100644 --- a/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangePlayerMode.cs +++ b/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangePlayerMode.cs @@ -55,7 +55,6 @@ namespace Stary.Evo.Editor // 添加新模式 defines.Add(mode.ToString()); PlayerSettings.SetScriptingDefineSymbolsForGroup(currentTarget, string.Join(";", defines)); - Debug.Log($"当前编译符号: {string.Join(";", defines)}"); // 添加调试日志 _pLayerMode = mode; CustomEditorPrefs.SetString("ChangePlayerSchema", _pLayerMode.ToString()); ValidateModeMenu(); @@ -65,7 +64,7 @@ namespace Stary.Evo.Editor { //EditorApplication.ExecuteMenuItem("Assets/Open C# Project"); UnityEditor.Compilation.CompilationPipeline.RequestScriptCompilation(); - Debug.Log("已强制重新生成解决方案文件"); + Debug.Log($"当前编译符号: {string.Join(";", defines)}"); // 添加调试日志 }; } } diff --git a/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangePointClondMode.cs b/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangePointClondMode.cs index 2ab0fea..bcf0636 100644 --- a/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangePointClondMode.cs +++ b/Assets/00.StaryEvoTools/Editor/BuildAsset/ChangePlayerMode/ChangePointClondMode.cs @@ -52,7 +52,6 @@ namespace Stary.Evo.Editor // 添加新模式 defines.Add(mode.ToString()); PlayerSettings.SetScriptingDefineSymbolsForGroup(currentTarget, string.Join(";", defines)); - Debug.Log($"当前编译符号: {string.Join(";", defines)}"); // 添加调试日志 _pointClondMode = mode; CustomEditorPrefs.SetString("ChangePoindClondSchema", _pointClondMode.ToString()); @@ -61,9 +60,8 @@ namespace Stary.Evo.Editor // 添加解决方案文件重新生成逻辑 EditorApplication.delayCall += () => { - EditorApplication.ExecuteMenuItem("Assets/Open C# Project"); UnityEditor.Compilation.CompilationPipeline.RequestScriptCompilation(); - Debug.Log("已强制重新生成解决方案文件"); + Debug.Log($"当前编译符号: {string.Join(";", defines)}"); // 添加调试日志 }; } } diff --git a/Assets/00.StaryEvoTools/Editor/BuildAsset/OneKeyBuildWindow.cs b/Assets/00.StaryEvoTools/Editor/BuildAsset/OneKeyBuildWindow.cs index 9d80c13..0d8ad35 100644 --- a/Assets/00.StaryEvoTools/Editor/BuildAsset/OneKeyBuildWindow.cs +++ b/Assets/00.StaryEvoTools/Editor/BuildAsset/OneKeyBuildWindow.cs @@ -64,9 +64,8 @@ namespace Stary.Evo.Editor { #if HotUpdate EditorTools.ClearUnityConsole(); - AutoBuildPackage.OneShaderMark(OneKeyBuildEntities); - - EditorUtility.DisplayDialog("提示", $"标记所有shader完成!", "确定"); + AutoBuildPackage.OneShaderMark(OneKeyBuildEntities,(domainName)=> + ShowNotification(new GUIContent($"收集【{domainName}】的shader【材质异常或资源修改】!"), 2f)); #endif } diff --git a/Assets/00.StaryEvoTools/package.json b/Assets/00.StaryEvoTools/package.json index 28c07bc..59d5144 100644 --- a/Assets/00.StaryEvoTools/package.json +++ b/Assets/00.StaryEvoTools/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.tools", - "version": "1.3.25", + "version": "1.3.26", "displayName": "00.StaryEvo.Tools", "description": "This is an Framework package(后台服务器版本,端口9527)", "unity": "2021.3",