1
This commit is contained in:
@@ -100,12 +100,13 @@ namespace Stary.Evo.Editor
|
|||||||
EditorUtility.DisplayProgressBar("提示", $"登陆中~", 0f);
|
EditorUtility.DisplayProgressBar("提示", $"登陆中~", 0f);
|
||||||
bool islogin = await WebRequestSystem.Login(url, userName, password);
|
bool islogin = await WebRequestSystem.Login(url, userName, password);
|
||||||
float progress = 0f;
|
float progress = 0f;
|
||||||
while (progress>=1f)
|
while (progress >= 1f)
|
||||||
{
|
{
|
||||||
progress += 0.1f;
|
progress += 0.1f;
|
||||||
EditorUtility.DisplayProgressBar("提示", $"登陆中~", progress);
|
EditorUtility.DisplayProgressBar("提示", $"登陆中~", progress);
|
||||||
await Task.Delay(TimeSpan.FromSeconds(0.2f));
|
await Task.Delay(TimeSpan.FromSeconds(0.2f));
|
||||||
}
|
}
|
||||||
|
|
||||||
EditorUtility.ClearProgressBar();
|
EditorUtility.ClearProgressBar();
|
||||||
UpdateMessage(islogin);
|
UpdateMessage(islogin);
|
||||||
}
|
}
|
||||||
@@ -222,9 +223,11 @@ namespace Stary.Evo.Editor
|
|||||||
{
|
{
|
||||||
//PlayerPrefs.SetString("BuildPackageNames", selectedPackageNames);
|
//PlayerPrefs.SetString("BuildPackageNames", selectedPackageNames);
|
||||||
// DataSetting.packageName = selectedPackageNames;
|
// DataSetting.packageName = selectedPackageNames;
|
||||||
packageName = selectedPackageNames;
|
|
||||||
|
|
||||||
// DataSetting = Resources.Load<BuildAssetDataSetting>("BuildAssetDataSetting");
|
// DataSetting = Resources.Load<BuildAssetDataSetting>("BuildAssetDataSetting");
|
||||||
string buildAssetDataSettingPath = $"Assets/Domain/{selectedPackageNames}/Conf/BuildAssetDataSetting.asset";
|
string buildAssetDataSettingPath =
|
||||||
|
$"Assets/Domain/{selectedPackageNames}/Conf/BuildAssetDataSetting.asset";
|
||||||
BuildAssetDataSetting buildAssetDataSetting =
|
BuildAssetDataSetting buildAssetDataSetting =
|
||||||
AssetDatabase.LoadAssetAtPath<BuildAssetDataSetting>(buildAssetDataSettingPath);
|
AssetDatabase.LoadAssetAtPath<BuildAssetDataSetting>(buildAssetDataSettingPath);
|
||||||
if (buildAssetDataSetting != null)
|
if (buildAssetDataSetting != null)
|
||||||
@@ -237,7 +240,11 @@ namespace Stary.Evo.Editor
|
|||||||
Debug.LogError($"UnityEvo:BuildAssetDataSetting 不存在,请检查路径{buildAssetDataSettingPath}");
|
Debug.LogError($"UnityEvo:BuildAssetDataSetting 不存在,请检查路径{buildAssetDataSettingPath}");
|
||||||
}
|
}
|
||||||
|
|
||||||
GetHostBuildPackageVersion(buildAssetDataSetting);
|
if (selectedPackageNames != packageName)
|
||||||
|
{
|
||||||
|
GetHostBuildPackageVersion(buildAssetDataSetting);
|
||||||
|
}
|
||||||
|
packageName = selectedPackageNames;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -310,7 +317,7 @@ namespace Stary.Evo.Editor
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
public static string BuildZip(BuildAssetDataSetting setting)
|
public static string BuildZip(BuildAssetDataSetting setting)
|
||||||
{
|
{
|
||||||
EditorUtility.DisplayProgressBar("提示", $"开始上传{setting.packageName}(打包zip)", 0.0f);
|
EditorUtility.DisplayProgressBar("提示", $"开始上传{setting.packageName}(打包zip)", 0.0f);
|
||||||
@@ -321,9 +328,9 @@ namespace Stary.Evo.Editor
|
|||||||
$"{AssetBundleBuilderHelper.GetDefaultBuildOutputRoot()}/{EditorUserBuildSettings.activeBuildTarget}/{setting.packageName}";
|
$"{AssetBundleBuilderHelper.GetDefaultBuildOutputRoot()}/{EditorUserBuildSettings.activeBuildTarget}/{setting.packageName}";
|
||||||
//拷贝目录
|
//拷贝目录
|
||||||
string outFilePath = $"{outputPackageDirectory}/{setting.packageVersion}";
|
string outFilePath = $"{outputPackageDirectory}/{setting.packageVersion}";
|
||||||
|
|
||||||
DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(setting.packageName, outFilePath);
|
DefaultBuildinFileSystemBuild.CreateBuildinCatalogFile(setting.packageName, outFilePath);
|
||||||
|
|
||||||
//输出目录
|
//输出目录
|
||||||
string zipFilePath = Path.Combine(outputPackageDirectory, zipFileName);
|
string zipFilePath = Path.Combine(outputPackageDirectory, zipFileName);
|
||||||
try
|
try
|
||||||
@@ -423,6 +430,7 @@ namespace Stary.Evo.Editor
|
|||||||
EditorUtility.ClearProgressBar();
|
EditorUtility.ClearProgressBar();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// 获取服务器上版本号
|
/// 获取服务器上版本号
|
||||||
/// </summary>
|
/// </summary>
|
||||||
@@ -457,9 +465,8 @@ namespace Stary.Evo.Editor
|
|||||||
setting.packageVersionZ = 0;
|
setting.packageVersionZ = 0;
|
||||||
setting.GetBuildPackageVersion(false);
|
setting.GetBuildPackageVersion(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#endregion
|
#endregion
|
||||||
|
|
||||||
protected void Init()
|
protected void Init()
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "com.staryevo.main",
|
"name": "com.staryevo.main",
|
||||||
"version": "1.2.12",
|
"version": "1.2.13",
|
||||||
"displayName": "00.StaryEvo",
|
"displayName": "00.StaryEvo",
|
||||||
"description": "This is an Framework package(后台服务器版本,端口9527)",
|
"description": "This is an Framework package(后台服务器版本,端口9527)",
|
||||||
"unity": "2021.3",
|
"unity": "2021.3",
|
||||||
|
|||||||
Reference in New Issue
Block a user