Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit2b676ed

Browse files
committed
alpha release notes for 2023.3 and laterfixes#31
1 parent710e14d commit2b676ed

File tree

2 files changed

+38
-23
lines changed

2 files changed

+38
-23
lines changed

‎UnityLauncherPro/GetUnityUpdates.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,12 @@ public static class GetUnityUpdates
2020
publicstaticasyncTask<List<UnityVersion>>FetchAll()
2121
{
2222
varcachedVersions=LoadCachedVersions();
23-
Console.WriteLine("cachedVersions: "+cachedVersions);
23+
//Console.WriteLine("cachedVersions: "+ cachedVersions);
2424
varlatestCachedVersion=cachedVersions.FirstOrDefault();
2525

26-
Console.WriteLine("FetchAll "+latestCachedVersion);
26+
//Console.WriteLine("FetchAll "+ latestCachedVersion);
2727
varnewVersions=awaitFetchNewVersions(latestCachedVersion);
28-
Console.WriteLine("newVersions "+newVersions);
28+
//Console.WriteLine("newVersions " + newVersions);
2929

3030
varallVersions=newVersions.Concat(cachedVersions).ToList();
3131

@@ -34,7 +34,7 @@ public static async Task<List<UnityVersion>> FetchAll()
3434
SaveCachedVersions(allVersions);
3535
}
3636

37-
Console.WriteLine("all "+allVersions);
37+
//Console.WriteLine("all "+ allVersions);
3838

3939
returnallVersions;
4040
}

‎UnityLauncherPro/Tools.cs‎

Lines changed: 34 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -531,6 +531,7 @@ public static string GetUnityReleaseURL(string version)
531531

532532
varcleanVersion=CleanVersionNumber(version);
533533
stringurl=$"https://unity.com/releases/editor/whats-new/{cleanVersion}#notes";
534+
534535
//if (VersionIsArchived(version) == true)
535536
//{
536537
// // remove f#, TODO should remove c# from china version ?
@@ -608,15 +609,17 @@ public static bool OpenReleaseNotes(string version)
608609
{
609610
boolresult=false;
610611
if(string.IsNullOrEmpty(version))returnfalse;
612+
611613
stringurl=null;
612614
if(Properties.Settings.Default.useAlphaReleaseNotes&&HasAlphaReleaseNotes(version))
613615
{
614616
url=GetAlphaReleaseNotesURL(version);
615617
}
616618
else
617619
{
618-
url=Tools.GetUnityReleaseURL(version);
620+
url=GetUnityReleaseURL(version);
619621
}
622+
620623
if(string.IsNullOrEmpty(url))returnfalse;
621624

622625
OpenURL(url);
@@ -847,8 +850,20 @@ public static string DownloadHTML(string url)
847850
publicstaticstringCleanVersionNumber(stringversion)
848851
{
849852
if(string.IsNullOrEmpty(version))returnnull;
850-
// note old patch versions still contains p## in the end
851-
returnRegex.Replace(version,@"[f|a|b][0-9]{1,2}","",RegexOptions.IgnoreCase);
853+
854+
varsplit=version.Split('.');
855+
floatparsedVersion=float.Parse($"{split[0]}.{split[1]}");
856+
// 2023.3 and newer Alpha releases, no replace
857+
if(IsAlpha(version)&&parsedVersion>=2023.3)
858+
{
859+
// do nothing
860+
}
861+
else
862+
{
863+
// note old patch versions still contains p## in the end
864+
version=Regex.Replace(version,@"[f|a|b][0-9]{1,2}","",RegexOptions.IgnoreCase);
865+
}
866+
returnversion;
852867
}
853868

854869
privatestaticstringFetchUnityVersionNumberFromHTML(stringurl)
@@ -2216,7 +2231,7 @@ internal static void OpenCustomAssetPath()
22162231
}
22172232
}
22182233
}
2219-
2234+
22202235
privatestaticasyncTask<bool>DownloadFileAsync(stringfileUrl,stringdestinationPath)
22212236
{
22222237
varcancellationTokenSource=newCancellationTokenSource();
@@ -2229,25 +2244,25 @@ private static async Task<bool> DownloadFileAsync(string fileUrl, string destina
22292244
using(varclient=newHttpClient())
22302245
using(varresponse=awaitclient.GetAsync(fileUrl,HttpCompletionOption.ResponseHeadersRead,cancellationTokenSource.Token))
22312246
{
2232-
response.EnsureSuccessStatusCode();
2247+
response.EnsureSuccessStatusCode();
22332248

2234-
vartotalBytes=response.Content.Headers.ContentLength??1;
2235-
varbuffer=newbyte[8192];
2236-
vartotalRead=0;
2249+
vartotalBytes=response.Content.Headers.ContentLength??1;
2250+
varbuffer=newbyte[8192];
2251+
vartotalRead=0;
22372252

2238-
using(varcontentStream=awaitresponse.Content.ReadAsStreamAsync())
2239-
using(varfileStream=newFileStream(destinationPath,FileMode.Create,FileAccess.Write,
2240-
FileShare.None,buffer.Length,true))
2253+
using(varcontentStream=awaitresponse.Content.ReadAsStreamAsync())
2254+
using(varfileStream=newFileStream(destinationPath,FileMode.Create,FileAccess.Write,
2255+
FileShare.None,buffer.Length,true))
2256+
{
2257+
intbytesRead;
2258+
while((bytesRead=awaitcontentStream.ReadAsync(buffer,0,buffer.Length,cancellationTokenSource.Token))>0)
22412259
{
2242-
intbytesRead;
2243-
while((bytesRead=awaitcontentStream.ReadAsync(buffer,0,buffer.Length,cancellationTokenSource.Token))>0)
2244-
{
2245-
awaitfileStream.WriteAsync(buffer,0,bytesRead,cancellationTokenSource.Token);
2246-
totalRead+=bytesRead;
2247-
progressWindow.UpdateProgress(newDownloadProgress(totalRead,totalBytes));
2248-
}
2249-
result=true;
2260+
awaitfileStream.WriteAsync(buffer,0,bytesRead,cancellationTokenSource.Token);
2261+
totalRead+=bytesRead;
2262+
progressWindow.UpdateProgress(newDownloadProgress(totalRead,totalBytes));
22502263
}
2264+
result=true;
2265+
}
22512266
}
22522267
}
22532268
catch(TaskCanceledException)

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp