diff --git a/Assets/00.StaryEvo/Editor/BuildAsset/OneKeyBuildWindow.cs b/Assets/00.StaryEvo/Editor/BuildAsset/OneKeyBuildWindow.cs index 1dc72bb..109f60e 100644 --- a/Assets/00.StaryEvo/Editor/BuildAsset/OneKeyBuildWindow.cs +++ b/Assets/00.StaryEvo/Editor/BuildAsset/OneKeyBuildWindow.cs @@ -24,13 +24,9 @@ namespace Stary.Evo.Editor ChangeHotUpdateSchema.SetHotUpdateMode(HotUpdateMode.HotUpdate); } #elif HotUpdate - var window = (OneKeyBuildWindow)EditorWindow.GetWindow(typeof(OneKeyBuildWindow)); + var window = (OneKeyBuildWindow)EditorWindow.GetWindow(typeof(OneKeyBuildWindow)); window.Show(); #endif - - - - } [Title("全选"), OnValueChanged("OneKeyBuildEvent"), HideLabel] @@ -68,6 +64,23 @@ namespace Stary.Evo.Editor #endif } + [Button("(一键)收集shader【材质异常或资源修改】", ButtonSizes.Large)] + public void OneShaderMark() + { +#if HotUpdate + //标记全部资源 + foreach (var oneKeyBUildEntity in OneKeyBuildEntities) + { + if (oneKeyBUildEntity.isRaw) + { + MarkAdressable.CollectSVC(oneKeyBUildEntity.DomainName); + } + } + + EditorUtility.DisplayDialog("提示", $"标记所有shader完成!", "确定"); +#endif + } + [Button("(一键)获取服务器版本", ButtonSizes.Large)] public async void OneUpdatePackageVersion() { @@ -83,12 +96,14 @@ namespace Stary.Evo.Editor if (buildAssetDataSetting != null) { //初始化读取资源配置表 - HotfixMainResDomain hotfixMainResDomain = Resources.Load("HotfixMainResDomain"); + HotfixMainResDomain hotfixMainResDomain = + Resources.Load("HotfixMainResDomain"); if (hotfixMainResDomain == null) { Debug.LogError($"UnityEvo:读取资源配置表失败【HotfixMainResDomain】...表不存在"); continue; } + var ip = hotfixMainResDomain.hotfixMainResDomainEntity.ipconfig; string url = $"{ip}/ResDomain/GetResDomainByDomain"; var resDmainRequst = new ResDmainRequst() @@ -111,7 +126,7 @@ namespace Stary.Evo.Editor buildAssetDataSetting.packageVersionZ++; EditorUtility.SetDirty(buildAssetDataSetting); } - else if (resDmainMessageEntity.code == 1011) + else if (resDmainMessageEntity.code == 1011) { buildAssetDataSetting.packageVersionX = 1; buildAssetDataSetting.packageVersionY = 0; @@ -178,7 +193,7 @@ namespace Stary.Evo.Editor if (buildAssetDataSetting != null) { string zipFilePath = BuildAssetWindow.BuildZip(buildAssetDataSetting); - await BuildAssetWindow.UpdateFileDataResDomain(buildAssetDataSetting, zipFilePath); + await BuildAssetWindow.UpdateFileDataResDomain(buildAssetDataSetting, zipFilePath); await Task.Delay(1000); EditorUtility.ClearProgressBar(); } @@ -188,6 +203,7 @@ namespace Stary.Evo.Editor } } } + EditorUtility.DisplayDialog("提示", $"服务器上传完成", "确定"); } diff --git a/Assets/00.StaryEvo/Editor/MarkAdressable/MarkAdressable.cs b/Assets/00.StaryEvo/Editor/MarkAdressable/MarkAdressable.cs index 4e8f72d..800eb4a 100644 --- a/Assets/00.StaryEvo/Editor/MarkAdressable/MarkAdressable.cs +++ b/Assets/00.StaryEvo/Editor/MarkAdressable/MarkAdressable.cs @@ -127,7 +127,7 @@ namespace Stary.Evo.Editor $"{DomainRoot}/{oneKeyBUildEntity.DomainName}/AddressableRes", $"{DomainRoot}/{oneKeyBUildEntity.DomainName}/HotUpdate"); - CollectSVC(oneKeyBUildEntity.DomainName); + } } } diff --git a/Assets/00.StaryEvo/package.json b/Assets/00.StaryEvo/package.json index 3eaa791..fbe78df 100644 --- a/Assets/00.StaryEvo/package.json +++ b/Assets/00.StaryEvo/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.main", - "version": "1.3.21", + "version": "1.3.22", "displayName": "00.StaryEvo", "description": "This is an Framework package(后台服务器版本,端口9527)", "unity": "2021.3",