fix(global): 1. scale model to 150%. 2. update for Genshin v3.4

ArtScanner/ArtsInfo.py

@@ -2,7 +2,7 @@
 import json
 
 current_path = os.path.dirname(os.path.abspath(__file__))
-char_data = json.load(open(os.path.join(current_path, 'rcc/char_map_v30.json'), encoding='utf-8'))
+char_data = json.load(open(os.path.join(current_path, 'rcc/char_map_v34.json'), encoding='utf-8'))
 
 UsersCHS = char_data['CHS']
 UsersEN = char_data['EN']
@@ -114,6 +114,8 @@
     ['生灵之华', '潜光片羽', '阳辔之遗', '结契之刻', '虺雷之姿'],  # 辰砂往生录
     ['迷宫的游人', '翠蔓的智者', '贤智的定期', '迷误者之灯', '月桂的宝冠'],  # 深林的记忆
     ['梦中的铁花', '裁断的翎羽', '沉金的岁月', '如蜜的终宴', '沙王的投影'],  # 饰金之梦
+    ['月女的华彩', '谢落的筵席', '凝结的时刻', '守秘的魔瓶', '紫晶的花冠'],  # 乐园遗落之花
+    ['众王之都的开端', '黄金邦国的结末', '失落迷途的机芯', '迷醉长梦的守护', '流沙贵嗣的遗宝'],    # 沙上楼阁史话
     ["祝圣精华", "祝圣油膏"],  # 强化材料
 ]
 
@@ -181,7 +183,9 @@
     "EchoesOfAnOffering",  # 来歆余响
     "VermillionHereafter",  # 辰砂往生录
     "DeepwoodMemories",  # 深林的记忆
-    "GildedDreams"  # 饰金之梦
+    "GildedDreams",  # 饰金之梦
+    "FlowerOfParadiseLost",  # 乐园遗落之花
+    "DesertPavilionChronicle",  # 沙上楼阁史话
 ]
 
 TypeNamesMingyuLab = ['flower', 'plume', 'eon', 'goblet', 'circlet']
@@ -249,7 +253,9 @@
     "echoes_of_an_offering",    # 来歆余响
     "vermillion_hereafter",      # 辰砂往生录
     "deepwood_memories",        # 深林的记忆
-    "gilded_dreams"             # 饰金之梦
+    "gilded_dreams",             # 饰金之梦
+    "flower_of_paradise_lost",  # 乐园遗落之花
+    "desert_pavilion_chronicle" # 沙上楼阁史话
 ]
 
 TypeNamesGOOD = ['flower', 'plume', 'sands', 'goblet', 'circlet']
@@ -294,7 +300,9 @@
     "EchoesOfAnOffering",   # 来歆余响
     "VermillionHereafter",   # 辰砂往生录
     "DeepwoodMemories",     # 深林的记忆
-    "GildedDreams"          # 饰金之梦
+    "GildedDreams",          # 饰金之梦
+    "FlowerOfParadiseLost",  # 乐园遗落之花
+    "DesertPavilionChronicle",  # 沙上楼阁史话
 ]
 
 MainAttrValue = {
@@ -562,6 +570,10 @@
      'Lamp of the Lost', 'Laurel Coronet'],     # Deepwood Memories
     ['Dreaming Steelbloom', 'Feather of Judgment', 'The Sunken Years',
      'Honeyed Final Feast', 'Shadow of the Sand King'],  # Gilded Dreams
+    ["Ay-Khanoum's Myriad", 'Wilting Feast', 'A Moment Congealed',
+     "Secret-Keeper's Magic Bottle", 'Amethyst Crown'],
+    ["The First Days of the City of Kings", 'End of the Golden Realm', 'Timepiece of the Lost Path',
+     'Defender of the Enchanting Dream', 'Legacy of the Desert High-Born'],
 
     ['Sanctifying Unction', 'Sanctifying Essence']  # keep the two at last
 ]
@@ -607,7 +619,9 @@
     "来歆余响",
     "辰砂往生录",
     "深林的记忆",
-    "饰金之梦"
+    "饰金之梦",
+    "乐园遗落之花",
+    "沙上楼阁史话"
 ]
 
 Setnames_EN = [
@@ -635,5 +649,7 @@
     "Echoes of an Offering",
     'Vermillion Hereafter',
     'Deepwood Memories',
-    'Gilded Dreams'
+    'Gilded Dreams',
+    'Flower of Paradise Lost',
+    'Desert Pavilion Chronicle'
 ]

ArtScanner/MaterialInfo.py

@@ -2,7 +2,7 @@
 import os
 
 current_path = os.path.dirname(os.path.abspath(__file__))
-data = json.load(open(os.path.join(current_path, 'rcc/material_names_v30.json'),
+data = json.load(open(os.path.join(current_path, 'rcc/material_names_v34.json'),
                       encoding='utf-8'))
 
 MaterialsNameCHS = data['CHS']

ArtScanner/build_ui_dir.cmd

@@ -1,11 +1,14 @@
+set TARGET_VERSION=3.4.0
+set DICT_TARGET_VERSION=v34
+
 pyinstaller -w -D ^
---add-data "rcc/models_CHS/artifact_model_3.0.0.h5;./rcc/models_CHS" ^
---add-data "rcc/models_CHS/material_model_3.0.0.h5;./rcc/models_CHS" ^
+--add-data "rcc/models_CHS/artifact_model_%TARGET_VERSION%.h5;./rcc/models_CHS" ^
+--add-data "rcc/models_CHS/material_model_%TARGET_VERSION%.h5;./rcc/models_CHS" ^
 --add-data "Tools/ReliquaryLevelExcelConfigData.json;./Tools" ^
 --add-data "Tools/ReliquaryAffixExcelConfigData.json;./Tools" ^
 --add-data "rcc/genshin.ttf;./rcc" ^
---add-data "rcc/material_names_v30.json;./rcc" ^
---add-data "rcc/char_map_v30.json;./rcc" ^
+--add-data "rcc/material_names_%DICT_TARGET_VERSION%.json;./rcc" ^
+--add-data "rcc/char_map_%DICT_TARGET_VERSION%.json;./rcc" ^
 --hidden-import=h5py ^
 --hidden-import=h5py.defs ^
 --hidden-import=h5py.utils ^

ArtScanner/build_ui_dir_EN.cmd

@@ -1,11 +1,14 @@
+set TARGET_VERSION=3.4.0
+set DICT_TARGET_VERSION=v34
+
 pyinstaller -w -D ^
---add-data "rcc/models_EN/artifact_model_EN_3.0.0.h5;./rcc/models_EN" ^
---add-data "rcc/models_EN/material_model_EN_3.0.0.h5;./rcc/models_EN" ^
+--add-data "rcc/models_EN/artifact_model_EN_%TARGET_VERSION%.h5;./rcc/models_EN" ^
+--add-data "rcc/models_EN/material_model_EN_%TARGET_VERSION%.h5;./rcc/models_EN" ^
 --add-data "Tools/ReliquaryLevelExcelConfigData.json;./Tools" ^
 --add-data "Tools/ReliquaryAffixExcelConfigData.json;./Tools" ^
 --add-data "rcc/genshin.ttf;./rcc" ^
---add-data "rcc/material_names_v30.json;./rcc" ^
---add-data "rcc/char_map_v30.json;./rcc" ^
+--add-data "rcc/material_names_%DICT_TARGET_VERSION%.json;./rcc" ^
+--add-data "rcc/char_map_%DICT_TARGET_VERSION%.json;./rcc" ^
 --hidden-import=h5py ^
 --hidden-import=h5py.defs ^
 --hidden-import=h5py.utils ^

ArtScanner/build_ui_onefile.cmd

@@ -1,11 +1,14 @@
+set TARGET_VERSION=3.4.0
+set DICT_TARGET_VERSION=v34
+
 pyinstaller -w -F ^
---add-data "rcc/models_CHS/artifact_model_3.0.0.h5;./rcc/models_CHS" ^
---add-data "rcc/models_CHS/material_model_3.0.0.h5;./rcc/models_CHS" ^
+--add-data "rcc/models_CHS/artifact_model_%TARGET_VERSION%.h5;./rcc/models_CHS" ^
+--add-data "rcc/models_CHS/material_model_%TARGET_VERSION%.h5;./rcc/models_CHS" ^
 --add-data "Tools/ReliquaryLevelExcelConfigData.json;./Tools" ^
 --add-data "Tools/ReliquaryAffixExcelConfigData.json;./Tools" ^
 --add-data "rcc/genshin.ttf;./rcc" ^
---add-data "rcc/material_names_v30.json;./rcc" ^
---add-data "rcc/char_map_v30.json;./rcc" ^
+--add-data "rcc/material_names_%DICT_TARGET_VERSION%.json;./rcc" ^
+--add-data "rcc/char_map_%DICT_TARGET_VERSION%.json;./rcc" ^
 --hidden-import=h5py ^
 --hidden-import=h5py.defs ^
 --hidden-import=h5py.utils ^

ArtScanner/build_ui_onefile_EN.cmd

@@ -1,11 +1,14 @@
+set TARGET_VERSION=3.4.0
+set DICT_TARGET_VERSION=v34
+
 pyinstaller -w -F ^
---add-data "rcc/models_EN/artifact_model_EN_3.0.0.h5;./rcc/models_EN" ^
---add-data "rcc/models_EN/material_model_EN_3.0.0.h5;./rcc/models_EN" ^
+--add-data "rcc/models_EN/artifact_model_EN_%TARGET_VERSION%.h5;./rcc/models_EN" ^
+--add-data "rcc/models_EN/material_model_EN_%TARGET_VERSION%.h5;./rcc/models_EN" ^
 --add-data "Tools/ReliquaryLevelExcelConfigData.json;./Tools" ^
 --add-data "Tools/ReliquaryAffixExcelConfigData.json;./Tools" ^
 --add-data "rcc/genshin.ttf;./rcc" ^
---add-data "rcc/material_names_v30.json;./rcc" ^
---add-data "rcc/char_map_v30.json;./rcc" ^
+--add-data "rcc/material_names_%DICT_TARGET_VERSION%.json;./rcc" ^
+--add-data "rcc/char_map_%DICT_TARGET_VERSION%.json;./rcc" ^
 --hidden-import=h5py ^
 --hidden-import=h5py.defs ^
 --hidden-import=h5py.utils ^

ArtScanner/config.py

@@ -1 +1 @@
-TARGET_VERSION = "3.0.0"
+TARGET_VERSION = "3.4.0"

ArtScanner/rcc/About_Dialog.py

@@ -190,7 +190,7 @@ def retranslateUi(self, Dialog):
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:\'HYWenHei-85W\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
 "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">「天目」 -- Amenoma</p>\n"
-"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">3.0.2</p>\n"
+"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">3.4.0</p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
 "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" color:#636399;\">「天目流的诀窍就是滴水穿石的耐心和全力以赴的意志」</span></p>\n"
 "<p align=\"center\" style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
@@ -205,7 +205,7 @@ def retranslateUi(self, Dialog):
 "<p align=\"center\" style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
 "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">QQ 群: 910549414</p>\n"
 "<p align=\"center\" style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
-"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Copyright 2021-2022 夏至</p>\n"
+"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Copyright 2021-2023 夏至</p>\n"
 "<p align=\"center\" style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">-- LICENSE --</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version.<br />This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br />You should have received a copy of the GNU General Public License along with this program. If not, see </span><a href=\"https://www.gnu.org/licenses\"><span style=\" font-family:\'SimSun\'; text-decoration: underline; color:#0000ff;\">https://www.gnu.org/licenses</span></a><span style=\" font-family:\'SimHei\';\">.</span></p></body></html>"))
         self.pushButton.setText(_translate("Dialog", "关闭"))

ArtScanner/rcc/About_Dialog_EN.py

@@ -190,7 +190,7 @@ def retranslateUi(self, Dialog):
 "p, li { white-space: pre-wrap; }\n"
 "</style></head><body style=\" font-family:\'HYWenHei-85W\'; font-size:9pt; font-weight:400; font-style:normal;\">\n"
 "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">「天目」 -- Amenoma</p>\n"
-"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">3.0.2</p>\n"
+"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">3.4.0</p>\n"
 "<p style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
 "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" color:#636399;\">The essence of Amenoma Art is to have the patience to move mountains and unrelenting willpower.</span></p>\n"
 "<p align=\"center\" style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
@@ -203,7 +203,7 @@ def retranslateUi(self, Dialog):
 "<p align=\"center\" style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; text-decoration: underline; color:#0000ff;\"><br /></p>\n"
 "<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">discord: <a href=\"https://discord.gg/5e3WyFNG9A\"><span style=\" text-decoration: underline; color:#0000ff;\">https://discord.gg/sxyU6FJbtq</span></a></p>\n"
 "<p align=\"center\" style=\"-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><br /></p>\n"
-"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Copyright 2021-2022 夏至</p>\n"
+"<p align=\"center\" style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">Copyright 2021-2023 夏至</p>\n"
 "<p align=\"center\" style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">-- LICENSE --</p>\n"
 "<p style=\" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\"><span style=\" font-family:\'SimSun\';\">This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or any later version.<br />This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.<br />You should have received a copy of the GNU General Public License along with this program. If not, see </span><a href=\"https://www.gnu.org/licenses\"><span style=\" font-family:\'SimSun\'; text-decoration: underline; color:#0000ff;\">https://www.gnu.org/licenses</span></a><span style=\" font-family:\'SimHei\';\">.</span></p></body></html>"))
         self.pushButton.setText(_translate("Dialog", "close"))

ArtScanner/rcc/MainWindow.py

@@ -411,7 +411,7 @@ def setupUi(self, MainWindow):
 
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
-        MainWindow.setWindowTitle(_translate("MainWindow", "天目--Amenoma 3.0.2"))
+        MainWindow.setWindowTitle(_translate("MainWindow", "天目--Amenoma 3.4.0"))
         self.pushButton_3.setText(_translate("MainWindow", "帮助..."))
         self.pushButton_6.setText(_translate("MainWindow", "关于..."))
         self.pushButton_4.setText(_translate("MainWindow", "打开导出文件..."))

ArtScanner/rcc/MainWindow_EN.py

@@ -407,7 +407,7 @@ def setupUi(self, MainWindow):
 
     def retranslateUi(self, MainWindow):
         _translate = QtCore.QCoreApplication.translate
-        MainWindow.setWindowTitle(_translate("MainWindow", "天目--Amenoma 3.0.2"))
+        MainWindow.setWindowTitle(_translate("MainWindow", "天目--Amenoma 3.4.0"))
         self.pushButton_2.setText(_translate("MainWindow", "Capture\n"
 "Window"))
         self.pushButton.setText(_translate("MainWindow", "Start\n"

ArtScanner/rcc/char_map_v30.json → ArtScanner/rcc/char_map_v34.json

@@ -2,18 +2,22 @@
   "EN": {
     "Aether": "Aether",
     "Albedo": "Albedo",
+    "Alhaitham": "Alhaitham",
     "Aloy": "Aloy",
     "Amber": "Amber",
     "Arataki Itto": "AratakiItto",
     "Barbara": "Barbara",
     "Beidou": "Beidou",
     "Bennett": "Bennett",
+    "Candace": "Candace",
     "Chongyun": "Chongyun",
     "Collei": "Collei",
+    "Cyno": "Cyno",
     "Diluc": "Diluc",
     "Diona": "Diona",
     "Dori": "Dori",
     "Eula": "Eula",
+    "Faruzan": "Faruzan",
     "Fischl": "Fischl",
     "Ganyu": "Ganyu",
     "Gorou": "Gorou",
@@ -27,9 +31,12 @@
     "Klee": "Klee",
     "Kujou Sara": "KujouSara",
     "Kuki Shinobu": "KukiShinobu",
+    "Layla": "Layla",
     "Lisa": "Lisa",
     "Lumine": "Lumine",
     "Mona": "Mona",
+    "Nahida": "Nahida",
+    "Nilou": "Nilou",
     "Ningguang": "Ningguang",
     "Noelle": "Noelle",
     "Qiqi": "Qiqi",
@@ -45,12 +52,14 @@
     "Thoma": "Thoma",
     "Tighnari": "Tighnari",
     "Venti": "Venti",
+    "Wanderer": "Wanderer",
     "Xiangling": "Xiangling",
     "Xiao": "Xiao",
     "Xingqiu": "Xingqiu",
     "Xinyan": "Xinyan",
     "Yae Miko": "YaeMiko",
     "Yanfei": "Yanfei",
+    "Yaoyao": "Yaoyao",
     "Yelan": "Yelan",
     "Yoimiya": "Yoimiya",
     "Yun Jin": "YunJin",
@@ -59,18 +68,22 @@
   "CHS": {
     "空": "Aether",
     "阿贝多": "Albedo",
+    "艾尔海森": "Alhaitham",
     "埃洛伊": "Aloy",
     "安柏": "Amber",
     "荒泷一斗": "AratakiItto",
     "芭芭拉": "Barbara",
     "北斗": "Beidou",
     "班尼特": "Bennett",
+    "坎蒂丝": "Candace",
     "重云": "Chongyun",
     "柯莱": "Collei",
+    "赛诺": "Cyno",
     "迪卢克": "Diluc",
     "迪奥娜": "Diona",
     "多莉": "Dori",
     "优菈": "Eula",
+    "珐露珊": "Faruzan",
     "菲谢尔": "Fischl",
     "甘雨": "Ganyu",
     "五郎": "Gorou",
@@ -84,9 +97,12 @@
     "可莉": "Klee",
     "九条裟罗": "KujouSara",
     "久岐忍": "KukiShinobu",
+    "莱依拉": "Layla",
     "丽莎": "Lisa",
     "荧": "Lumine",
     "莫娜": "Mona",
+    "纳西妲": "Nahida",
+    "妮露": "Nilou",
     "凝光": "Ningguang",
     "诺艾尔": "Noelle",
     "七七": "Qiqi",
@@ -102,12 +118,14 @@
     "托马": "Thoma",
     "提纳里": "Tighnari",
     "温迪": "Venti",
+    "流浪者": "Wanderer",
     "香菱": "Xiangling",
     "魈": "Xiao",
     "行秋": "Xingqiu",
     "辛焱": "Xinyan",
     "八重神子": "YaeMiko",
     "烟绯": "Yanfei",
+    "瑶瑶": "Yaoyao",
     "夜兰": "Yelan",
     "宵宫": "Yoimiya",
     "云堇": "YunJin",