Merge branch 'Scighost:main' into main

Eric-Joker · Sep 15, 2024 · 27e409c · 27e409c
2 parents 1ff3f8b + 58337a5
commit 27e409c
Show file tree

Hide file tree

Showing 30 changed files with 608 additions and 157 deletions.
diff --git a/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterRoundsData.cs b/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterRoundsData.cs
@@ -55,6 +55,12 @@ public class ImaginariumTheaterRoundsData
     [JsonPropertyName("enemies")]
     public List<ImaginariumTheaterEnemy> Enemies { get; set; }
 
+    /// <summary>
+    /// 辉彩祝福
+    /// </summary>
+    [JsonPropertyName("splendour_buff")]
+    public ImaginariumTheaterSplendourBuff SplendourBuff { get; set; }
+
 
     [JsonExtensionData]
     public Dictionary<string, object>? ExtensionData { get; set; }

diff --git a/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSplendourBuff.cs b/src/Starward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSplendourBuff.cs
@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Starward.Core.GameRecord.Genshin.ImaginariumTheater;
+
+public class ImaginariumTheaterSplendourBuff
+{
+
+    [JsonPropertyName("summary")]
+    public ImaginariumTheaterSplendourBuffSummary Summary { get; set; }
+
+
+    [JsonPropertyName("buffs")]
+    public List<ImaginariumTheaterSplendourBuffItem> Buffs { get; set; }
+
+}
diff --git a/...rward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSplendourBuffEffect.cs b/...rward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSplendourBuffEffect.cs
@@ -0,0 +1,19 @@
+using System.Text.Json.Serialization;
+
+namespace Starward.Core.GameRecord.Genshin.ImaginariumTheater;
+
+public class ImaginariumTheaterSplendourBuffEffect
+{
+
+    [JsonPropertyName("icon")]
+    public string Icon { get; set; }
+
+
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+
+    [JsonPropertyName("desc")]
+    public string Desc { get; set; }
+
+}
diff --git a/...tarward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSplendourBuffItem.cs b/...tarward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSplendourBuffItem.cs
@@ -0,0 +1,25 @@
+using System.Text.Json.Serialization;
+
+namespace Starward.Core.GameRecord.Genshin.ImaginariumTheater;
+
+public class ImaginariumTheaterSplendourBuffItem
+{
+
+    [JsonPropertyName("name")]
+    public string Name { get; set; }
+
+
+    [JsonPropertyName("icon")]
+    public string Icon { get; set; }
+
+
+    [JsonPropertyName("level")]
+    public int Level { get; set; }
+
+    /// <summary>
+    /// 祝福不同等级的效果
+    /// </summary>
+    [JsonPropertyName("level_effect")]
+    public List<ImaginariumTheaterSplendourBuffEffect> LevelEffect { get; set; }
+
+}
diff --git a/...ward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSplendourBuffSummary.cs b/...ward.Core/GameRecord/Genshin/ImaginariumTheater/ImaginariumTheaterSplendourBuffSummary.cs
@@ -0,0 +1,15 @@
+using System.Text.Json.Serialization;
+
+namespace Starward.Core.GameRecord.Genshin.ImaginariumTheater;
+
+public class ImaginariumTheaterSplendourBuffSummary
+{
+
+    [JsonPropertyName("total_level")]
+    public int TotalLevel { get; set; }
+
+
+    [JsonPropertyName("desc")]
+    public string Desc { get; set; }
+
+}
diff --git a/src/Starward.Core/Launcher/LauncherClient.cs b/src/Starward.Core/Launcher/LauncherClient.cs
@@ -213,9 +213,9 @@ public async Task<bool> IsNoticesAlertAsync(GameBiz biz, long uid, string? lang
         {
             GameBiz.hk4e_cn or GameBiz.hk4e_cloud or GameBiz.hk4e_bilibili => $"https://hk4e-api.mihoyo.com/common/hk4e_cn/announcement/api/getAlertAnn?bundle_id=hk4e_cn&channel_id=1&game=hk4e&game_biz=hk4e_cn&lang={lang}&level=60&platform=pc&region=cn_gf01&uid={uid}",
             GameBiz.hk4e_global => $"https://sg-hk4e-api.hoyoverse.com/common/hk4e_global/announcement/api/getAlertAnn?game=hk4e&game_biz=hk4e_global&lang={lang}&bundle_id=hk4e_global&channel_id=1&level=60&platform=pc&region=os_asia&uid={uid}",
-            GameBiz.hkrpg_cn or GameBiz.hkrpg_bilibili => $"https://hkrpg-api.mihoyo.com/common/hkrpg_cn/announcement/api/getAlertAnn?bundle_id=hkrpg_cn&channel_id=1&game=hkrpg&game_biz=hkrpg_cn&lang={lang}&level=70&platform=pc&region=prod_gf_cn&uid={uid}",
+            GameBiz.hkrpg_cn or GameBiz.hkrpg_bilibili => $"https://hkrpg-ann-api.mihoyo.com/common/hkrpg_cn/announcement/api/getAlertAnn?bundle_id=hkrpg_cn&channel_id=1&game=hkrpg&game_biz=hkrpg_cn&lang={lang}&level=70&platform=pc&region=prod_gf_cn&uid={uid}",
             GameBiz.hkrpg_global => $"https://sg-hkrpg-api.hoyoverse.com/common/hkrpg_global/announcement/api/getAlertAnn?bundle_id=hkrpg_global&channel_id=1&game=hkrpg&game_biz=hkrpg_global&lang={lang}&level=1&platform=pc&region=prod_official_asia&uid={uid}",
-            GameBiz.bh3_cn => $"https://api-takumi.mihoyo.com/common/bh3_cn/announcement/api/getAlertAnn?game=bh3&game_biz=bh3_cn&lang={lang}&bundle_id=bh3_cn&platform=pc&region=android01&level=88&channel_id=1&uid={uid}",
+            GameBiz.bh3_cn => $"https://ann-api.mihoyo.com/common/bh3_cn/announcement/api/getAlertAnn?game=bh3&game_biz=bh3_cn&lang={lang}&bundle_id=bh3_cn&platform=pc&region=android01&level=88&channel_id=1&uid={uid}",
             GameBiz.bh3_global or GameBiz.bh3_jp or GameBiz.bh3_kr or GameBiz.bh3_overseas or GameBiz.bh3_tw => $"https://sg-public-api.hoyoverse.com/common/bh3_global/announcement/api/getAlertAnn?game=bh3&game_biz=bh3_global&lang={lang}&bundle_id=bh3_os&platform=pc&region=overseas01&level=88&channel_id=1&uid={uid}",
             GameBiz.nap_cn or GameBiz.hk4e_bilibili => $"https://announcement-api.mihoyo.com/common/nap_cn/announcement/api/getAlertAnn?bundle_id=nap_cn&channel_id=1&game=nap&game_biz=nap_cn&lang=zh-cn&level=60&platform=pc&region=prod_gf_cn&uid={uid}",
             GameBiz.nap_global => $"https://sg-announcement-api.hoyoverse.com/common/nap_global/announcement/api/getAlertAnn?bundle_id=nap_global&channel_id=1&game=nap&game_biz=nap_global&lang={lang}&level=60&platform=pc&region=prod_gf_jp&uid={uid}",

diff --git a/src/Starward.Core/Localization/CoreLang.zh-TW.resx b/src/Starward.Core/Localization/CoreLang.zh-TW.resx
@@ -274,4 +274,22 @@
   <data name="GachaType_BangbooChannel" xml:space="preserve">
     <value>邦布頻道</value>
   </data>
+  <data name="ZZZQueryType_Monochrome" xml:space="preserve">
+    <value>菲林底片</value>
+  </data>
+  <data name="ZZZQueryType_Ploychrome" xml:space="preserve">
+    <value>菲林</value>
+  </data>
+  <data name="ZZZQueryType_Bundle" xml:space="preserve">
+    <value>禮包</value>
+  </data>
+  <data name="ZZZQueryType_BatteryCharge" xml:space="preserve">
+    <value>電量</value>
+  </data>
+  <data name="ZZZQueryType_WEngine" xml:space="preserve">
+    <value>音擎</value>
+  </data>
+  <data name="ZZZQueryType_DriveDisc" xml:space="preserve">
+    <value>驅動光碟</value>
+  </data>
 </root>
diff --git a/src/Starward.Core/SelfQuery/SelfQueryClient.cs b/src/Starward.Core/SelfQuery/SelfQueryClient.cs
@@ -95,7 +95,7 @@ public async Task<SelfQueryUserInfo> InitializeAsync(string url, GameBiz gameBiz
             }
             if (url.StartsWith("https://cs.hoyoverse.com/csc-service-center-fe/index.html"))
             {
-                prefixUrl = "https://api-os-takumi.hoyoverse.com";
+                prefixUrl = "https://public-operation-hkrpg-sg.hoyoverse.com";
             }
             if (string.IsNullOrWhiteSpace(prefixUrl))
             {

diff --git a/src/Starward.Language/Lang.Designer.cs b/src/Starward.Language/Lang.Designer.cs
diff --git a/src/Starward.Language/Lang.de-DE.resx b/src/Starward.Language/Lang.de-DE.resx
@@ -1571,4 +1571,13 @@ Wenn Sie das Programm während der Dekomprimierung schließen, wird die Spieldat
   <data name="ImaginariumTheaterPage_MysteryCache" xml:space="preserve">
     <value>Mystery Cache</value>
   </data>
+  <data name="ImaginariumTheaterPage_VisionaryMode" xml:space="preserve">
+    <value>Visionary Mode</value>
+  </data>
+  <data name="ImaginariumTheaterPage_BrilliantBlessing" xml:space="preserve">
+    <value>Brilliant Blessing</value>
+  </data>
+  <data name="GameLauncherPage_RemovableStorageDeviceNotConnected" xml:space="preserve">
+    <value>Removable storage device not connected.</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.es-ES.resx b/src/Starward.Language/Lang.es-ES.resx
@@ -1573,4 +1573,13 @@ Do you accept the risk and continue to use it?</value>
   <data name="ImaginariumTheaterPage_MysteryCache" xml:space="preserve">
     <value>Mystery Cache</value>
   </data>
+  <data name="ImaginariumTheaterPage_VisionaryMode" xml:space="preserve">
+    <value>Visionary Mode</value>
+  </data>
+  <data name="ImaginariumTheaterPage_BrilliantBlessing" xml:space="preserve">
+    <value>Brilliant Blessing</value>
+  </data>
+  <data name="GameLauncherPage_RemovableStorageDeviceNotConnected" xml:space="preserve">
+    <value>Removable storage device not connected.</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.it-IT.resx b/src/Starward.Language/Lang.it-IT.resx
@@ -1573,4 +1573,13 @@ Do you accept the risk and continue to use it?</value>
   <data name="ImaginariumTheaterPage_MysteryCache" xml:space="preserve">
     <value>Mystery Cache</value>
   </data>
+  <data name="ImaginariumTheaterPage_VisionaryMode" xml:space="preserve">
+    <value>Visionary Mode</value>
+  </data>
+  <data name="ImaginariumTheaterPage_BrilliantBlessing" xml:space="preserve">
+    <value>Brilliant Blessing</value>
+  </data>
+  <data name="GameLauncherPage_RemovableStorageDeviceNotConnected" xml:space="preserve">
+    <value>Removable storage device not connected.</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.ja-JP.resx b/src/Starward.Language/Lang.ja-JP.resx
@@ -1533,7 +1533,7 @@
     <value>ハードモード</value>
   </data>
   <data name="ImaginariumTheaterPage_Act0" xml:space="preserve">
-    <value>第 {0} 章</value>
+    <value>第 {0} 幕</value>
     <comment>Imaginarium Theater Act {0}</comment>
   </data>
   <data name="ImaginariumTheaterPage_PastPerformances" xml:space="preserve">
@@ -1555,21 +1555,30 @@
     <value>サポートキャストがほかのプレーヤーを支援した回数</value>
   </data>
   <data name="ImaginariumTheaterPage_TotalPerformanceDuration" xml:space="preserve">
-    <value>Total Performance Duration</value>
+    <value>総パフォーマンス時間</value>
   </data>
   <data name="ImaginariumTheaterPage_HighestDamageDealt" xml:space="preserve">
-    <value>Highest Damage Dealt</value>
+    <value>最高ダメージ</value>
   </data>
   <data name="ImaginariumTheaterPage_MostOpponentsDefeated" xml:space="preserve">
-    <value>Most Opponents Defeated</value>
+    <value>最も多くの対戦相手を撃破</value>
   </data>
   <data name="ImaginariumTheaterPage_TeamThatCompletedThePerformanceFastest" xml:space="preserve">
-    <value>Team that Completed the Performance Fastest</value>
+    <value>最も早くパフォーマンスを完了したチーム</value>
   </data>
   <data name="ImaginariumTheaterPage_WondrousBoon" xml:space="preserve">
     <value>ワンダーサポート</value>
   </data>
   <data name="ImaginariumTheaterPage_MysteryCache" xml:space="preserve">
     <value>ミステリーボーナス</value>
   </data>
+  <data name="ImaginariumTheaterPage_VisionaryMode" xml:space="preserve">
+    <value>ビジョナリーモード</value>
+  </data>
+  <data name="ImaginariumTheaterPage_BrilliantBlessing" xml:space="preserve">
+    <value>輝彩の祝福</value>
+  </data>
+  <data name="GameLauncherPage_RemovableStorageDeviceNotConnected" xml:space="preserve">
+    <value>リムーバブルストレージデバイスが接続されていません。</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.ko-KR.resx b/src/Starward.Language/Lang.ko-KR.resx
@@ -1573,4 +1573,13 @@
   <data name="ImaginariumTheaterPage_MysteryCache" xml:space="preserve">
     <value>Mystery Cache</value>
   </data>
+  <data name="ImaginariumTheaterPage_VisionaryMode" xml:space="preserve">
+    <value>Visionary Mode</value>
+  </data>
+  <data name="ImaginariumTheaterPage_BrilliantBlessing" xml:space="preserve">
+    <value>Brilliant Blessing</value>
+  </data>
+  <data name="GameLauncherPage_RemovableStorageDeviceNotConnected" xml:space="preserve">
+    <value>Removable storage device not connected.</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.resx b/src/Starward.Language/Lang.resx
@@ -1573,4 +1573,13 @@ Do you accept the risk and continue to use it?</value>
   <data name="ImaginariumTheaterPage_MysteryCache" xml:space="preserve">
     <value>Mystery Cache</value>
   </data>
+  <data name="ImaginariumTheaterPage_VisionaryMode" xml:space="preserve">
+    <value>Visionary Mode</value>
+  </data>
+  <data name="ImaginariumTheaterPage_BrilliantBlessing" xml:space="preserve">
+    <value>Brilliant Blessing</value>
+  </data>
+  <data name="GameLauncherPage_RemovableStorageDeviceNotConnected" xml:space="preserve">
+    <value>Removable storage device not connected.</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.ru-RU.resx b/src/Starward.Language/Lang.ru-RU.resx
@@ -1574,4 +1574,13 @@
   <data name="ImaginariumTheaterPage_MysteryCache" xml:space="preserve">
     <value>Таинственные приобретения</value>
   </data>
+  <data name="ImaginariumTheaterPage_VisionaryMode" xml:space="preserve">
+    <value>Превосходный режим</value>
+  </data>
+  <data name="ImaginariumTheaterPage_BrilliantBlessing" xml:space="preserve">
+    <value>Сияющее благословение</value>
+  </data>
+  <data name="GameLauncherPage_RemovableStorageDeviceNotConnected" xml:space="preserve">
+    <value>Съемное устройство хранения не подключено.</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.th-TH.resx b/src/Starward.Language/Lang.th-TH.resx
@@ -1572,4 +1572,13 @@
   <data name="ImaginariumTheaterPage_MysteryCache" xml:space="preserve">
     <value>Mystery Cache</value>
   </data>
+  <data name="ImaginariumTheaterPage_VisionaryMode" xml:space="preserve">
+    <value>Visionary Mode</value>
+  </data>
+  <data name="ImaginariumTheaterPage_BrilliantBlessing" xml:space="preserve">
+    <value>Brilliant Blessing</value>
+  </data>
+  <data name="GameLauncherPage_RemovableStorageDeviceNotConnected" xml:space="preserve">
+    <value>Removable storage device not connected.</value>
+  </data>
 </root>
diff --git a/src/Starward.Language/Lang.vi-VN.resx b/src/Starward.Language/Lang.vi-VN.resx
@@ -1573,4 +1573,13 @@ Bạn có chấp nhận rủi ro và tiếp tục?</value>
   <data name="ImaginariumTheaterPage_MysteryCache" xml:space="preserve">
     <value>Quà Thần Bí</value>
   </data>
+  <data name="ImaginariumTheaterPage_VisionaryMode" xml:space="preserve">
+    <value>Visionary Mode</value>
+  </data>
+  <data name="ImaginariumTheaterPage_BrilliantBlessing" xml:space="preserve">
+    <value>Chúc Phúc Rực Rỡ</value>
+  </data>
+  <data name="GameLauncherPage_RemovableStorageDeviceNotConnected" xml:space="preserve">
+    <value>Removable storage device not connected.</value>
+  </data>
 </root>