diff --git a/Assets/00.StaryEvo/Editor/BuildAsset/BuildAssetDataSetting.cs b/Assets/00.StaryEvo/Editor/BuildAsset/BuildAssetDataSetting.cs index 0fa8af5..5980a83 100644 --- a/Assets/00.StaryEvo/Editor/BuildAsset/BuildAssetDataSetting.cs +++ b/Assets/00.StaryEvo/Editor/BuildAsset/BuildAssetDataSetting.cs @@ -132,24 +132,28 @@ namespace Stary.Evo.Editor public string GetBuildPackageVersion(bool isUpdate = false) { + string version = ""; if (environmentType == EnvironmentType.Debug) { - return "Simulate"; + EditorUtility.SetDirty(this); + AssetDatabase.SaveAssets(); + version= "Simulate"; } if (environmentType == EnvironmentType.Release) { - string version = + version = $"{packageVersionX}.{packageVersionY}.{packageVersionZ}"; if (isUpdate) packageVersionZ++; packageVersion = $"{packageVersionX}.{packageVersionY}.{packageVersionZ}"; - return version; + } - - return null; + EditorUtility.SetDirty(this); + AssetDatabase.SaveAssets(); + return version; } public void GetPackageVersion() diff --git a/Assets/00.StaryEvo/Editor/BuildAsset/BuildAssetWindow.cs b/Assets/00.StaryEvo/Editor/BuildAsset/BuildAssetWindow.cs index 2e8eb0b..bcb9221 100644 --- a/Assets/00.StaryEvo/Editor/BuildAsset/BuildAssetWindow.cs +++ b/Assets/00.StaryEvo/Editor/BuildAsset/BuildAssetWindow.cs @@ -236,6 +236,8 @@ namespace Stary.Evo.Editor { Debug.LogError($"UnityEvo:BuildAssetDataSetting 不存在,请检查路径{buildAssetDataSettingPath}"); } + + GetHostBuildPackageVersion(buildAssetDataSetting); } /// @@ -384,7 +386,7 @@ namespace Stary.Evo.Editor string fileId = data["id"].ToString(); ResDmainAddRequst resDmainAddRequst = new ResDmainAddRequst() { - ProductName = Application.productName, + ProductName = Application.identifier, DomainName = setting.packageName, Platform = EditorUserBuildSettings.activeBuildTarget.ToString(), PackageVersion = setting.packageVersion, @@ -421,7 +423,43 @@ namespace Stary.Evo.Editor EditorUtility.ClearProgressBar(); return; } - + /// + /// 获取服务器上版本号 + /// + private async void GetHostBuildPackageVersion(BuildAssetDataSetting setting) + { + var resDmainAddRequst = new ResDmainRequst() + { + ProductName = Application.identifier, + DomainName = selectedPackageNames, + Platform = EditorUserBuildSettings.activeBuildTarget.ToString(), + }; + var resResultMessage = await WebRequestSystem.Post(ip + "/ResDomain/GetResDomainByDomain", + JsonConvert.SerializeObject(resDmainAddRequst)); + //如果低于服务器版本,更新版本号 + if (resResultMessage.code != 1011) + { + ResDmainResponse domainResponse = + JsonConvert.DeserializeObject(resResultMessage.data + .ToString()); + string[] versions = domainResponse.PackageVersion.Split('.'); + setting.packageVersionX = int.Parse(versions[0]); + setting.packageVersionY = int.Parse(versions[1]); + setting.packageVersionZ = int.Parse(versions[2]); + setting.GetBuildPackageVersion(true); + } + else + { + EditorUtility.DisplayDialog("提示", + $"{resResultMessage.message},默认1.0.0版本 ", "确定"); + setting.packageVersionX = 1; + setting.packageVersionY = 0; + setting.packageVersionZ = 0; + setting.GetBuildPackageVersion(false); + } + + + } #endregion protected void Init() diff --git a/Assets/00.StaryEvo/Editor/BuildAsset/OneKeyBuildWindow.cs b/Assets/00.StaryEvo/Editor/BuildAsset/OneKeyBuildWindow.cs index 9e5d1b3..2d98ca7 100644 --- a/Assets/00.StaryEvo/Editor/BuildAsset/OneKeyBuildWindow.cs +++ b/Assets/00.StaryEvo/Editor/BuildAsset/OneKeyBuildWindow.cs @@ -71,7 +71,7 @@ namespace Stary.Evo.Editor string url = $"{ip}/ResDomain/GetResDomainByDomain"; var resDmainRequst = new ResDmainRequst() { - ProductName = Application.productName, + ProductName = Application.identifier, DomainName = oneKeyBUildEntity.DomainName, Platform = UnityEditor.EditorUserBuildSettings.activeBuildTarget.ToString(), }; diff --git a/Assets/00.StaryEvo/Runtime/PlayerSettings/HotfixMainResDomain.cs b/Assets/00.StaryEvo/Runtime/PlayerSettings/HotfixMainResDomain.cs index 53b23dc..eb4faff 100644 --- a/Assets/00.StaryEvo/Runtime/PlayerSettings/HotfixMainResDomain.cs +++ b/Assets/00.StaryEvo/Runtime/PlayerSettings/HotfixMainResDomain.cs @@ -18,6 +18,5 @@ namespace Stary.Evo public string mainDomainVersion =""; public string username="UnityHot"; public string password="Unity1234"; - public string productName="UnityEvo"; } } \ No newline at end of file diff --git a/Assets/00.StaryEvo/package.json b/Assets/00.StaryEvo/package.json index e00aace..d3d4673 100644 --- a/Assets/00.StaryEvo/package.json +++ b/Assets/00.StaryEvo/package.json @@ -1,6 +1,6 @@ { "name": "com.staryevo.main", - "version": "1.2.11", + "version": "1.2.12", "displayName": "00.StaryEvo", "description": "This is an Framework package(后台服务器版本,端口9527)", "unity": "2021.3",