diff --git a/src/Snap.Hutao/Snap.Hutao/Context/FileSystem/Location/HutaoLocation.cs b/src/Snap.Hutao/Snap.Hutao/Context/FileSystem/Location/HutaoLocation.cs index 27c201b7e0..b55817fbf0 100644 --- a/src/Snap.Hutao/Snap.Hutao/Context/FileSystem/Location/HutaoLocation.cs +++ b/src/Snap.Hutao/Snap.Hutao/Context/FileSystem/Location/HutaoLocation.cs @@ -2,6 +2,7 @@ // Licensed under the MIT license. using System.IO; +using Windows.ApplicationModel; namespace Snap.Hutao.Context.FileSystem.Location; @@ -19,7 +20,10 @@ public string GetPath() if (string.IsNullOrEmpty(path)) { string myDocument = Environment.GetFolderPath(Environment.SpecialFolder.MyDocuments); - path = Path.GetFullPath(Path.Combine(myDocument, "Hutao")); + + // 将测试版与正式版的文件目录分离 + string folderName = Package.Current.PublisherDisplayName == "DGP Studio CI" ? "HutaoAlpha" : "Hutao"; + path = Path.GetFullPath(Path.Combine(myDocument, folderName)); } return path; diff --git a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs index 007a0b4aff..57f624b06f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs +++ b/src/Snap.Hutao/Snap.Hutao/Core/LifeCycle/AppInstanceExtension.cs @@ -30,13 +30,11 @@ public static void RedirectActivationTo(this AppInstance appInstance, AppActivat }); ReadOnlySpan handles = new(in redirectEventHandle); - - // non-blocking CoWaitForMultipleObjects((uint)CWMO_FLAGS.CWMO_DEFAULT, INFINITE, handles, out uint _); } private static unsafe HANDLE UnsafeCreateEvent() { - return CreateEvent((SECURITY_ATTRIBUTES*)null, true, false, null); + return CreateEvent(default(SECURITY_ATTRIBUTES*), true, false, null); } } \ No newline at end of file diff --git a/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest index 0f77283457..fd6073a22a 100644 --- a/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest +++ b/src/Snap.Hutao/Snap.Hutao/Package.appxmanifest @@ -12,7 +12,7 @@ + Version="1.2.16.0" /> 胡桃 diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Overview.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Overview.cs index 2b3d0f909b..377562064f 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Overview.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Overview.cs @@ -23,11 +23,26 @@ public class Overview /// public int SpiralAbyssTotal { get; set; } + /// + /// 通关玩家总数 + /// + public int SpiralAbyssPassed { get; set; } + + /// + /// 总星数 + /// + public int SpiralAbyssStarTotal { get; set; } + /// /// 满星数 /// public int SpiralAbyssFullStar { get; set; } + /// + /// 总战斗次数 + /// + public long SpiralAbyssBattleTotal { get; set; } + /// /// 统计时间 /// diff --git a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleSpiralAbyss.cs b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleSpiralAbyss.cs index 5e2f90cf23..b73687ba47 100644 --- a/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleSpiralAbyss.cs +++ b/src/Snap.Hutao/Snap.Hutao/Web/Hutao/Model/Post/SimpleSpiralAbyss.cs @@ -17,6 +17,8 @@ public class SimpleSpiralAbyss public SimpleSpiralAbyss(SpiralAbyss spiralAbyss) { ScheduleId = spiralAbyss.ScheduleId; + TotalBattleTimes = spiralAbyss.TotalBattleTimes; + TotalWinTimes = spiralAbyss.TotalWinTimes; Damage = SimpleRank.FromRank(spiralAbyss.DamageRank.SingleOrDefault()); TakeDamage = SimpleRank.FromRank(spiralAbyss.TakeDamageRank.SingleOrDefault()); Floors = spiralAbyss.Floors.Select(f => new SimpleFloor(f)); @@ -27,6 +29,16 @@ public SimpleSpiralAbyss(SpiralAbyss spiralAbyss) /// public int ScheduleId { get; set; } + /// + /// 总战斗次数 + /// + public int TotalBattleTimes { get; set; } + + /// + /// 总战斗胜利次数 + /// + public int TotalWinTimes { get; set; } + /// /// 造成伤害 ///