diff --git a/Assets/00.BuildOriginality/Editor/ArtBuild/BuildArtAssetWindow.cs b/Assets/00.BuildOriginality/Editor/ArtBuild/BuildArtAssetWindow.cs index 222d75b..80e18cb 100644 --- a/Assets/00.BuildOriginality/Editor/ArtBuild/BuildArtAssetWindow.cs +++ b/Assets/00.BuildOriginality/Editor/ArtBuild/BuildArtAssetWindow.cs @@ -414,31 +414,27 @@ namespace Stary.Evo.Editor var resResultMessage = await WebRequestSystem.Post(ip + "/ResDomain/AddResDomain", JsonConvert.SerializeObject(resDmainAddRequst)); //如果低于服务器版本,更新版本号 - if (resResultMessage.code == 1009) + if (resResultMessage.code == 4100) { ResDmainVersionResponse dmainVersionResponse = JsonConvert.DeserializeObject(resResultMessage.data .ToString()); - - bool isEndWithDigit = - System.Text.RegularExpressions.Regex.IsMatch(dmainVersionResponse.PackageVersion, - @"\d$"); - if (isEndWithDigit) + if (dmainVersionResponse.PackageVersion == _packageVersion) { - // 提取版本号结尾的数字部分 - string versionEndDigits = System.Text.RegularExpressions.Regex - .Match(dmainVersionResponse.PackageVersion, @"(\d+)$").Groups[1].Value; - int versionEndDigit = int.Parse(versionEndDigits) + 1; - // 或者移除版本号结尾的数字 - string versionWithoutEndDigits = - System.Text.RegularExpressions.Regex.Replace(dmainVersionResponse.PackageVersion, - @"\d+$", ""); - PackageVersion = versionWithoutEndDigits + versionEndDigit; + EditorUtility.DisplayDialog("提示", + $"上传失败,版本号{_packageVersion}跟服务器版本重复,请修改版本号后,重新打包上传", + "确定"); + EditorUtility.ClearProgressBar(); + return; } + + } else if (resResultMessage.code == 200) + + { EditorUtility.DisplayDialog("提示", - $"{resResultMessage.message + $"\n{resResultMessage.data.ToString()},已更新为{_packageVersion},请重新打包上传"}", + $"上传成功,已更新为{_packageVersion}", "确定"); } } diff --git a/Assets/00.BuildOriginality/Editor/ScriptableBuildPipelineViewer.cs b/Assets/00.BuildOriginality/Editor/ScriptableBuildPipelineViewer.cs index 002bb52..0021ca4 100644 --- a/Assets/00.BuildOriginality/Editor/ScriptableBuildPipelineViewer.cs +++ b/Assets/00.BuildOriginality/Editor/ScriptableBuildPipelineViewer.cs @@ -52,6 +52,9 @@ namespace Stary.Evo.Editor Debug.Log($"Build Success! 【{buildResult.OutputPackageDirectory}】"); // EditorUtility.RevealInFinder(buildResult.OutputPackageDirectory); base.ExecuteBuild(); + if (EditorUtility.DisplayDialog("提示", + $"打包完成[{buildResult.OutputPackageDirectory}],版本号为[{packageVersion}]!", "确定")) ; + } } diff --git a/Assets/00.BuildOriginality/package.json b/Assets/00.BuildOriginality/package.json index a6dbfb9..bf46b17 100644 --- a/Assets/00.BuildOriginality/package.json +++ b/Assets/00.BuildOriginality/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.buildoriginality", - "version": "1.0.4", + "version": "1.0.5", "displayName": "00.StaryEvo.BuildOriginality", "description": "美术打包工具", "unity": "2021.3",