From fd16521c94ebc6630e20be7e6ff8c658e2727849 Mon Sep 17 00:00:00 2001
From: Lightczx <1686188646@qq.com>
Date: Thu, 7 Sep 2023 13:33:52 +0800
Subject: [PATCH] update metadata models

---
 .../Snap.Hutao/IdentityStructs.json           |  6 +++++
 .../Snap.Hutao/Model/Intrinsic/Arkhe.cs       | 25 +++++++++++++++++++
 .../Model/Metadata/Avatar/SkillDepot.cs       |  6 +++++
 .../Model/Metadata/Monster/Monster.cs         | 10 ++++++++
 .../Model/Metadata/Tower/TowerLevel.cs        |  4 +--
 src/Snap.Hutao/Snap.Hutao/NativeMethods.txt   |  4 +--
 .../Snap.Hutao/Properties/launchSettings.json |  2 +-
 .../ViewModel/Wiki/WikiMonsterViewModel.cs    |  2 +-
 8 files changed, 52 insertions(+), 7 deletions(-)
 create mode 100644 src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/Arkhe.cs

diff --git a/src/Snap.Hutao/Snap.Hutao/IdentityStructs.json b/src/Snap.Hutao/Snap.Hutao/IdentityStructs.json
index 8d57f038..b0d28680 100644
--- a/src/Snap.Hutao/Snap.Hutao/IdentityStructs.json
+++ b/src/Snap.Hutao/Snap.Hutao/IdentityStructs.json
@@ -65,6 +65,12 @@
     "Equatable": true,
     "EqualityOperators": true
   },
+  {
+    "Name": "MonsterRelationshipId",
+    "Documentation": "怪物关系 Id",
+    "Equatable": true,
+    "EqualityOperators": true
+  },
   {
     "Name": "PromoteId",
     "Documentation": "角色突破提升 Id",
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/Arkhe.cs b/src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/Arkhe.cs
new file mode 100644
index 00000000..cd236288
--- /dev/null
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Intrinsic/Arkhe.cs
@@ -0,0 +1,25 @@
+// Copyright (c) DGP Studio. All rights reserved.
+// Licensed under the MIT license.
+
+namespace Snap.Hutao.Model.Intrinsic;
+
+/// <summary>
+/// 始基力
+/// </summary>
+internal enum Arkhe
+{
+    /// <summary>
+    /// 无
+    /// </summary>
+    None,
+
+    /// <summary>
+    /// 芒性
+    /// </summary>
+    Ousia,
+
+    /// <summary>
+    /// 荒性
+    /// </summary>
+    Pneuma,
+}
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/SkillDepot.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/SkillDepot.cs
index 2d2e0df0..a810098d 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/SkillDepot.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Avatar/SkillDepot.cs
@@ -1,6 +1,7 @@
 // Copyright (c) DGP Studio. All rights reserved.
 // Licensed under the MIT license.
 
+using Snap.Hutao.Model.Intrinsic;
 using System.Runtime.InteropServices;
 
 namespace Snap.Hutao.Model.Metadata.Avatar;
@@ -14,6 +15,11 @@ internal sealed class SkillDepot
     private List<ProudableSkill>? compositeSkills;
     private List<ProudableSkill>? compositeSkillsNoInherents;
 
+    /// <summary>
+    /// 始基力
+    /// </summary>
+    public Arkhe Arkhe { get; set; }
+
     /// <summary>
     /// 技能天赋
     /// </summary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Monster/Monster.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Monster/Monster.cs
index b7af48ea..b8d37778 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Monster/Monster.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Monster/Monster.cs
@@ -24,6 +24,11 @@ internal sealed class Monster
     /// </summary>
     public MonsterDescribeId DescribeId { get; set; }
 
+    /// <summary>
+    /// 关系 Id
+    /// </summary>
+    public MonsterRelationshipId RelationshipId { get; set; }
+
     /// <summary>
     /// 内部代号
     /// </summary>
@@ -49,6 +54,11 @@ internal sealed class Monster
     /// </summary>
     public MonsterType Type { get; set; }
 
+    /// <summary>
+    /// 始基力
+    /// </summary>
+    public Arkhe Arkhe { get; set; }
+
     /// <summary>
     /// 强化标签
     /// </summary>
diff --git a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Tower/TowerLevel.cs b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Tower/TowerLevel.cs
index 0848167f..40f3ddc6 100644
--- a/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Tower/TowerLevel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/Model/Metadata/Tower/TowerLevel.cs
@@ -33,10 +33,10 @@ internal sealed class TowerLevel
     /// <summary>
     /// 上半怪物预览
     /// </summary>
-    public List<MonsterId> FirstMonsters { get; set; } = default!;
+    public List<MonsterRelationshipId> FirstMonsters { get; set; } = default!;
 
     /// <summary>
     /// 下半怪物预览
     /// </summary>
-    public List<MonsterId> SecondMonsters { get; set; } = default!;
+    public List<MonsterRelationshipId> SecondMonsters { get; set; } = default!;
 }
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt b/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt
index 1230ae78..7c20f36a 100644
--- a/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt
+++ b/src/Snap.Hutao/Snap.Hutao/NativeMethods.txt
@@ -60,6 +60,4 @@ LPTHREAD_START_ROUTINE
 MINMAXINFO
 
 // System.Com
-CWMO_FLAGS
-
-D3D12CreateDevice
\ No newline at end of file
+CWMO_FLAGS
\ No newline at end of file
diff --git a/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json b/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json
index 7ae76b9e..a5fb2a14 100644
--- a/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json
+++ b/src/Snap.Hutao/Snap.Hutao/Properties/launchSettings.json
@@ -3,7 +3,7 @@
     "Snap.Hutao": {
       "commandName": "MsixPackage",
       "nativeDebugging": false,
-      "doNotLaunchApp": true,
+      "doNotLaunchApp": false,
       "allowLocalNetworkLoopbackProperty": true
     },
     "[Unpackaged] Snap.Hutao": {
diff --git a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs
index 926f9402..593f6d2d 100644
--- a/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs
+++ b/src/Snap.Hutao/Snap.Hutao/ViewModel/Wiki/WikiMonsterViewModel.cs
@@ -63,7 +63,7 @@ internal sealed partial class WikiMonsterViewModel : Abstraction.ViewModel
                 monster.DropsView ??= monster.Drops?.SelectList(i => idDisplayMap.GetValueOrDefault(i, Material.Default));
             }
 
-            List<Monster> ordered = monsters.SortBy(m => m.Id.Value);
+            List<Monster> ordered = monsters.SortBy(m => m.RelationshipId.Value);
             await taskContext.SwitchToMainThreadAsync();
 
             Monsters = new AdvancedCollectionView(ordered, true);