feat: Support 4.0

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yas_scanner"
-version = "0.1.13"
+version = "0.1.14"
 edition = "2018"
 build = "build.rs"
 description = "Genshin Impact item scanner"

src/artifact/internal_artifact.rs

@@ -84,6 +84,8 @@ pub enum ArtifactSetName {
     DesertPavilionChronicle,
     NymphsDream,
     VourukashasGlow,
+    MarechausseeHunter,
+    GoldenTroupe,
 }
 
 #[derive(Debug, Clone)]
@@ -230,6 +232,8 @@ pub fn get_real_artifact_name_chs(raw: &str) -> Option<String> {
         "众王之都的开端", "黄金邦国的结末", "失落迷途的机芯", "迷醉长梦的守护", "流沙贵嗣的遗宝",
         "恶龙的单片镜", "坏巫师的羽杖", "旅途中的鲜花", "水仙的时时刻刻", "勇者们的茶会",
         "灵光明烁之心", "琦色灵彩之羽", "灵光源起之蕊", "久远花落之时", "无边酣乐之筵",
+        "老兵的容颜", "杰作的序曲", "猎人的胸花", "裁判的时刻", "遗忘的容器",
+        "黄金剧团的奖赏", "黄金飞鸟的落羽", "黄金乐曲的变奏", "黄金时代的先声", "黄金之夜的喧嚣",
     ];
 
     let mut min_index = 0;
@@ -441,6 +445,8 @@ impl ArtifactSetName {
             "众王之都的开端" | "黄金邦国的结末" | "失落迷途的机芯" | "迷醉长梦的守护" | "流沙贵嗣的遗宝" => Some(ArtifactSetName::DesertPavilionChronicle),
             "恶龙的单片镜" | "坏巫师的羽杖" | "旅途中的鲜花" | "水仙的时时刻刻" | "勇者们的茶会" => Some(ArtifactSetName::NymphsDream),
             "灵光明烁之心" | "琦色灵彩之羽" | "灵光源起之蕊" | "久远花落之时" | "无边酣乐之筵" => Some(ArtifactSetName::VourukashasGlow),
+            "猎人的胸花" | "杰作的序曲" | "裁判的时刻" | "遗忘的容器" | "老兵的容颜" => Some(ArtifactSetName::MarechausseeHunter),
+            "黄金乐曲的变奏" | "黄金飞鸟的落羽" | "黄金时代的先声" | "黄金之夜的喧嚣" | "黄金剧团的奖赏" => Some(ArtifactSetName::GoldenTroupe),
             _ => None,
         }
     }
@@ -664,6 +670,16 @@ impl ArtifactSlot {
             "久远花落之时" => Some(ArtifactSlot::Sand),
             "无边酣乐之筵" => Some(ArtifactSlot::Goblet),
             "灵光明烁之心" => Some(ArtifactSlot::Head),
+            "猎人的胸花" => Some(ArtifactSlot::Flower),
+            "杰作的序曲" => Some(ArtifactSlot::Feather),
+            "裁判的时刻" => Some(ArtifactSlot::Sand),
+            "遗忘的容器" => Some(ArtifactSlot::Goblet),
+            "老兵的容颜" => Some(ArtifactSlot::Head),
+            "黄金乐曲的变奏" => Some(ArtifactSlot::Flower),
+            "黄金飞鸟的落羽" => Some(ArtifactSlot::Feather),
+            "黄金时代的先声" => Some(ArtifactSlot::Sand),
+            "黄金之夜的喧嚣" => Some(ArtifactSlot::Goblet),
+            "黄金剧团的奖赏" => Some(ArtifactSlot::Head),
             _ => None,
         }
     }

src/common/character_name.rs

@@ -73,6 +73,12 @@ lazy_static! {
         set.insert(String::from("艾尔海森"));
         set.insert(String::from("迪希雅"));
         set.insert(String::from("米卡"));
+        set.insert(String::from("琳妮特"));
+        set.insert(String::from("林尼"));
+        set.insert(String::from("菲米尼"));
+        set.insert(String::from("芙宁娜"));
+        set.insert(String::from("那维莱特"));
+        set.insert(String::from("娜维娅"));
 
         set
     };

src/expo/good.rs

@@ -155,6 +155,8 @@ impl ArtifactSetName {
             ArtifactSetName::DesertPavilionChronicle => "DesertPavilionChronicle",
             ArtifactSetName::NymphsDream => "NymphsDream",
             ArtifactSetName::VourukashasGlow => "VourukashasGlow",
+            ArtifactSetName::MarechausseeHunter => "MarechausseeHunter",
+            ArtifactSetName::GoldenTroupe => "GoldenTroupe",
         }
     }
 }

src/expo/mingyu_lab.rs

@@ -132,6 +132,8 @@ impl ArtifactSetName {
             ArtifactSetName::DesertPavilionChronicle => "desert_pavilion_chronicle",
             ArtifactSetName::NymphsDream => "nymphs_dream",
             ArtifactSetName::VourukashasGlow => "vourukashas_glow",
+            ArtifactSetName::MarechausseeHunter => "marechaussee_hunter",
+            ArtifactSetName::GoldenTroupe => "golden_troupe",
 
             // Not supported by Mingyulab
             ArtifactSetName::Adventurer => unreachable!(),

src/inference/inference.rs

@@ -26,8 +26,8 @@ impl CRNNModel {
         //     .with_input_fact(0, InferenceFact::dt_shape(f32::datum_type(), tvec!(1, 1, 32, 384))).unwrap()
         //     .into_optimized().unwrap()
         //     .into_runnable().unwrap();
-        let mut bytes = include_bytes!("../../models/model_acc100-epoch16.onnx");
-        // let mut bytes = include_bytes!("../../models/model_training.onnx");
+        // let mut bytes = include_bytes!("../../models/model_acc100-epoch16.onnx");
+        let mut bytes = include_bytes!("../../models/model_training.onnx");
 
         let model = tract_onnx::onnx()
             .model_for_read(&mut bytes.as_bytes()).unwrap()