chore: bump version to 1.1.9

sync with upstream

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zzz-signal-search-export",
-  "version": "1.1.4",
+  "version": "1.1.9",
   "autoUpdateActive": true,
   "autoUpdateFrom": "1.1.0",
   "main": "./dist/electron/main/main.js",
@@ -110,7 +110,7 @@
     "tailwindcss": "^3.0.16",
     "vite": "2.7.13",
     "vue": "^3.2.29",
-    "winreg": "^1.2.4",
+    "winreg": "1.2.4",
     "yauzl": "^2.10.0"
   },
   "keywords": [

src/i18n/English.json

@@ -3,7 +3,7 @@
   "ui.button.load": "Load data",
   "ui.button.update": "Update",
   "ui.button.directUpdate": "Direct update",
-  "ui.button.files": "Export Files",
+  "ui.button.files": "Import/Export",
   "ui.button.excel": "Export Excel",
   "ui.button.uigf": "Export UIGF",
   "ui.button.import": "Import UIGF",
@@ -57,6 +57,7 @@
   "ui.setting.fetchFullHistoryHint": "When this option is enabled, click the \"Update Data\" button to get all the card draw records within 6 months. When there are incorrect data within 6 months, this function can be used to repair.",
   "ui.setting.closeProxy": "Disable system proxy",
   "ui.setting.closeProxyHint": "When you choose proxy mode, if the program crashes it can cause unwanted results that may affect your system. You can click this button to clear the system proxy settings.",
+  "ui.setting.idVersion": "ID database version",
   "ui.about.title": "About",
   "ui.about.license": "This software is opensource using MIT license.",
   "ui.urlDialog.title": "Input URL manually",

src/i18n/简体中文.json

@@ -3,7 +3,7 @@
   "ui.button.load": "加载数据",
   "ui.button.update": "更新数据",
   "ui.button.directUpdate": "直接更新",
-  "ui.button.files": "导出文件",
+  "ui.button.files": "导入/导出",
   "ui.button.excel": "导出Excel",
   "ui.button.uigf":"导出UIGF",
   "ui.button.import":"导入UIGF",
@@ -56,6 +56,7 @@
   "ui.setting.fetchFullHistoryHint": "开启时点击“更新数据”按钮会完整获取6个月内所有的抽卡记录，当记录里有6个月范围以内的错误数据时可以通过这个功能修复。",
   "ui.setting.closeProxy": "关闭系统代理",
   "ui.setting.closeProxyHint": "如果使用过代理模式时工具非正常关闭，可能导致系统代理设置没能清除，可以通过这个按钮来清除设置过的系统代理。",
+  "ui.setting.idVersion": "ID 数据库版本",
   "ui.about.title": "关于",
   "ui.about.license": "本工具为开源软件，源代码使用 MIT 协议授权",
   "ui.urlDialog.title": "手动输入URL",

src/i18n/繁體中文.json

@@ -3,7 +3,7 @@
   "ui.button.load": "加載數據",
   "ui.button.update": "更新數據",
   "ui.button.directUpdate": "直接更新",
-  "ui.button.files": "導出文件",
+  "ui.button.files": "導入/匯出",
   "ui.button.excel": "導出Excel",
   "ui.button.uigf":"導出UIGF",
   "ui.button.import":"導入UIGF",
@@ -55,6 +55,7 @@
   "ui.setting.fetchFullHistoryHint": "開啟時點擊「更新數據」按鈕會完整獲取6個月內所有的抽卡記錄，當記錄裏有6個月範圍以內的錯誤數據時可以通過這個功能修復。",
   "ui.setting.closeProxy": "關閉系統代理",
   "ui.setting.closeProxyHint": "如果使用過代理模式時工具非正常關閉，可能導致系統代理設置沒能清除，可以通過這個按鈕來清除設置過的系統代理。",
+  "ui.setting.idVersion": "ID 數據庫版本",
   "ui.about.title": "關於",
   "ui.about.license": "本工具為開源軟件，源代碼使用 MIT 協議授權",
   "ui.urlDialog.title": "手動輸入URL",

src/idJson.json

@@ -15,6 +15,11 @@
       "item_type": "音擎",
       "rank_type": 2
     },
+    "14107": {
+      "name": "奔袭獠牙",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
     "13103": {
       "name": "聚宝箱",
       "item_type": "音擎",
@@ -110,6 +115,11 @@
       "item_type": "音擎",
       "rank_type": 4
     },
+    "14117": {
+      "name": "灼心摇壶",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
     "14124": {
       "name": "防暴者Ⅵ型",
       "item_type": "音擎",
@@ -181,7 +191,7 @@
       "rank_type": 3
     },
     "13013": {
-      "name": "鸢尾秘藏",
+      "name": "鎏金花信",
       "item_type": "音擎",
       "rank_type": 3
     },
@@ -291,9 +301,9 @@
       "rank_type": 3
     },
     "1071": {
-      "name": "...",
+      "name": "凯撒",
       "item_type": "代理人",
-      "rank_type": null
+      "rank_type": 4
     },
     "2021": {
       "name": "铃",
@@ -355,6 +365,11 @@
       "item_type": "代理人",
       "rank_type": 4
     },
+    "1351": {
+      "name": "波可娜",
+      "item_type": "代理人",
+      "rank_type": null
+    },
     "1151": {
       "name": "露西",
       "item_type": "代理人",
@@ -376,9 +391,9 @@
       "rank_type": 3
     },
     "1171": {
-      "name": "...",
+      "name": "柏妮思",
       "item_type": "代理人",
-      "rank_type": null
+      "rank_type": 4
     },
     "1191": {
       "name": "艾莲",
@@ -494,6 +509,11 @@
       "name": "艾米莉安",
       "item_type": "邦布",
       "rank_type": 4
+    },
+    "54011": {
+      "name": "赤红莫库斯",
+      "item_type": "邦布",
+      "rank_type": 4
     }
   },
   "zh-tw": {
@@ -512,6 +532,11 @@
       "item_type": "音擎",
       "rank_type": 2
     },
+    "14107": {
+      "name": "奔襲獠牙",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
     "13103": {
       "name": "聚寶箱",
       "item_type": "音擎",
@@ -607,6 +632,11 @@
       "item_type": "音擎",
       "rank_type": 4
     },
+    "14117": {
+      "name": "灼心搖壺",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
     "14124": {
       "name": "防暴者Ⅵ型",
       "item_type": "音擎",
@@ -678,7 +708,7 @@
       "rank_type": 3
     },
     "13013": {
-      "name": "鳶尾祕藏",
+      "name": "鎏金花信",
       "item_type": "音擎",
       "rank_type": 3
     },
@@ -788,9 +818,9 @@
       "rank_type": 3
     },
     "1071": {
-      "name": "...",
+      "name": "凱撒",
       "item_type": "代理人",
-      "rank_type": null
+      "rank_type": 4
     },
     "2021": {
       "name": "鈴",
@@ -852,6 +882,11 @@
       "item_type": "代理人",
       "rank_type": 4
     },
+    "1351": {
+      "name": "波可娜",
+      "item_type": "代理人",
+      "rank_type": null
+    },
     "1151": {
       "name": "露西",
       "item_type": "代理人",
@@ -873,9 +908,9 @@
       "rank_type": 3
     },
     "1171": {
-      "name": "...",
+      "name": "柏妮思",
       "item_type": "代理人",
-      "rank_type": null
+      "rank_type": 4
     },
     "1191": {
       "name": "艾蓮",
@@ -991,6 +1026,11 @@
       "name": "艾米莉安",
       "item_type": "邦布",
       "rank_type": 4
+    },
+    "54011": {
+      "name": "赤紅莫庫斯",
+      "item_type": "邦布",
+      "rank_type": 4
     }
   },
   "en-us": {
@@ -1009,6 +1049,11 @@
       "item_type": "W-Engines",
       "rank_type": 2
     },
+    "14107": {
+      "name": "Tusks of Fury",
+      "item_type": "W-Engines",
+      "rank_type": 4
+    },
     "13103": {
       "name": "The Vault",
       "item_type": "W-Engines",
@@ -1104,6 +1149,11 @@
       "item_type": "W-Engines",
       "rank_type": 4
     },
+    "14117": {
+      "name": "Flamemaker Shaker",
+      "item_type": "W-Engines",
+      "rank_type": 4
+    },
     "14124": {
       "name": "Riot Suppressor Mark VI",
       "item_type": "W-Engines",
@@ -1145,7 +1195,7 @@
       "rank_type": 3
     },
     "13127": {
-      "name": "Item_Weapon_A_1271_Name",
+      "name": "Peacekeeper - Specialized",
       "item_type": "W-Engines",
       "rank_type": 3
     },
@@ -1175,7 +1225,7 @@
       "rank_type": 3
     },
     "13013": {
-      "name": "...",
+      "name": "Gilded Blossom",
       "item_type": "W-Engines",
       "rank_type": 3
     },
@@ -1185,7 +1235,7 @@
       "rank_type": 2
     },
     "14126": {
-      "name": "Item_Weapon_S_1261_Name",
+      "name": "Sharpened Stinger",
       "item_type": "W-Engines",
       "rank_type": 4
     },
@@ -1210,7 +1260,7 @@
       "rank_type": 3
     },
     "14125": {
-      "name": "Item_Weapon_S_1251_Name",
+      "name": "Ice-Jade Teapot",
       "item_type": "W-Engines",
       "rank_type": 4
     },
@@ -1250,7 +1300,7 @@
       "rank_type": 4
     },
     "1261": {
-      "name": "...",
+      "name": "Jane",
       "item_type": "Agents",
       "rank_type": 4
     },
@@ -1285,9 +1335,9 @@
       "rank_type": 3
     },
     "1071": {
-      "name": "...",
+      "name": "Caesar",
       "item_type": "Agents",
-      "rank_type": null
+      "rank_type": 4
     },
     "2021": {
       "name": "Belle",
@@ -1349,6 +1399,11 @@
       "item_type": "Agents",
       "rank_type": 4
     },
+    "1351": {
+      "name": "Pulchra",
+      "item_type": "Agents",
+      "rank_type": null
+    },
     "1151": {
       "name": "Lucy",
       "item_type": "Agents",
@@ -1370,9 +1425,9 @@
       "rank_type": 3
     },
     "1171": {
-      "name": "...",
+      "name": "Burnice",
       "item_type": "Agents",
-      "rank_type": null
+      "rank_type": 4
     },
     "1191": {
       "name": "Ellen",
@@ -1450,7 +1505,7 @@
       "rank_type": 3
     },
     "54012": {
-      "name": "...",
+      "name": "Officer Cui",
       "item_type": "Bangboo",
       "rank_type": 4
     },
@@ -1488,6 +1543,11 @@
       "name": "Amillion",
       "item_type": "Bangboo",
       "rank_type": 4
+    },
+    "54011": {
+      "name": "Red Moccus",
+      "item_type": "Bangboo",
+      "rank_type": 4
     }
   },
   "ja-jp": {
@@ -1506,6 +1566,11 @@
       "item_type": "音動機",
       "rank_type": 2
     },
+    "14107": {
+      "name": "猛進するキバ",
+      "item_type": "音動機",
+      "rank_type": 4
+    },
     "13103": {
       "name": "ザ・ボールト",
       "item_type": "音動機",
@@ -1601,6 +1666,11 @@
       "item_type": "音動機",
       "rank_type": 4
     },
+    "14117": {
+      "name": "バーニング・シェイカー",
+      "item_type": "音動機",
+      "rank_type": 4
+    },
     "14124": {
       "name": "サプレッサーⅥ型",
       "item_type": "音動機",
@@ -1642,7 +1712,7 @@
       "rank_type": 3
     },
     "13127": {
-      "name": "Item_Weapon_A_1271_Name",
+      "name": "秩序の守り手・特化型",
       "item_type": "音動機",
       "rank_type": 3
     },
@@ -1672,7 +1742,7 @@
       "rank_type": 3
     },
     "13013": {
-      "name": "...",
+      "name": "金メッキの花信",
       "item_type": "音動機",
       "rank_type": 3
     },
@@ -1682,7 +1752,7 @@
       "rank_type": 2
     },
     "14126": {
-      "name": "Item_Weapon_S_1261_Name",
+      "name": "磨き抜かれた切っ先",
       "item_type": "音動機",
       "rank_type": 4
     },
@@ -1707,7 +1777,7 @@
       "rank_type": 3
     },
     "14125": {
-      "name": "Item_Weapon_S_1251_Name",
+      "name": "玉壺青氷",
       "item_type": "音動機",
       "rank_type": 4
     },
@@ -1747,7 +1817,7 @@
       "rank_type": 4
     },
     "1261": {
-      "name": "...",
+      "name": "ジェーン",
       "item_type": "エージェント",
       "rank_type": 4
     },
@@ -1782,9 +1852,9 @@
       "rank_type": 3
     },
     "1071": {
-      "name": "...",
+      "name": "シーザー",
       "item_type": "エージェント",
-      "rank_type": null
+      "rank_type": 4
     },
     "2021": {
       "name": "リン",
@@ -1846,6 +1916,11 @@
       "item_type": "エージェント",
       "rank_type": 4
     },
+    "1351": {
+      "name": "プルクラ",
+      "item_type": "エージェント",
+      "rank_type": null
+    },
     "1151": {
       "name": "ルーシー",
       "item_type": "エージェント",
@@ -1867,9 +1942,9 @@
       "rank_type": 3
     },
     "1171": {
-      "name": "...",
+      "name": "バーニス",
       "item_type": "エージェント",
-      "rank_type": null
+      "rank_type": 4
     },
     "1191": {
       "name": "エレン",
@@ -1947,7 +2022,7 @@
       "rank_type": 3
     },
     "54012": {
-      "name": "...",
+      "name": "ツェイ巡査",
       "item_type": "ボンプ",
       "rank_type": 4
     },
@@ -1985,6 +2060,11 @@
       "name": "アミリオン",
       "item_type": "ボンプ",
       "rank_type": 4
+    },
+    "54011": {
+      "name": "真紅のモックス",
+      "item_type": "ボンプ",
+      "rank_type": 4
     }
   },
   "ko-kr": {
@@ -2003,6 +2083,11 @@
       "item_type": "W-엔진",
       "rank_type": 2
     },
+    "14107": {
+      "name": "저돌적인 송곳니",
+      "item_type": "W-엔진",
+      "rank_type": 4
+    },
     "13103": {
       "name": "보물함",
       "item_type": "W-엔진",
@@ -2098,6 +2183,11 @@
       "item_type": "W-엔진",
       "rank_type": 4
     },
+    "14117": {
+      "name": "타오르는 셰이커",
+      "item_type": "W-엔진",
+      "rank_type": 4
+    },
     "14124": {
       "name": "서프레서 Ⅵ형",
       "item_type": "W-엔진",
@@ -2139,7 +2229,7 @@
       "rank_type": 3
     },
     "13127": {
-      "name": "Item_Weapon_A_1271_Name",
+      "name": "평화 수호자-특화형",
       "item_type": "W-엔진",
       "rank_type": 3
     },
@@ -2159,7 +2249,7 @@
       "rank_type": 2
     },
     "13115": {
-      "name": "용맹한 꽝꽝이",
+      "name": "호전적인 꽝꽝이",
       "item_type": "W-엔진",
       "rank_type": 3
     },
@@ -2169,7 +2259,7 @@
       "rank_type": 3
     },
     "13013": {
-      "name": "...",
+      "name": "도금된 화신풍",
       "item_type": "W-엔진",
       "rank_type": 3
     },
@@ -2179,7 +2269,7 @@
       "rank_type": 2
     },
     "14126": {
-      "name": "Item_Weapon_S_1261_Name",
+      "name": "예리한 집게칼",
       "item_type": "W-엔진",
       "rank_type": 4
     },
@@ -2204,7 +2294,7 @@
       "rank_type": 3
     },
     "14125": {
-      "name": "Item_Weapon_S_1251_Name",
+      "name": "맑은 옥주전자",
       "item_type": "W-엔진",
       "rank_type": 4
     },
@@ -2244,7 +2334,7 @@
       "rank_type": 4
     },
     "1261": {
-      "name": "...",
+      "name": "제인",
       "item_type": "에이전트",
       "rank_type": 4
     },
@@ -2279,9 +2369,9 @@
       "rank_type": 3
     },
     "1071": {
-      "name": "...",
+      "name": "카이사르",
       "item_type": "에이전트",
-      "rank_type": null
+      "rank_type": 4
     },
     "2021": {
       "name": "벨",
@@ -2343,6 +2433,11 @@
       "item_type": "에이전트",
       "rank_type": 4
     },
+    "1351": {
+      "name": "펄크라",
+      "item_type": "에이전트",
+      "rank_type": null
+    },
     "1151": {
       "name": "루시",
       "item_type": "에이전트",
@@ -2364,9 +2459,9 @@
       "rank_type": 3
     },
     "1171": {
-      "name": "...",
+      "name": "버니스",
       "item_type": "에이전트",
-      "rank_type": null
+      "rank_type": 4
     },
     "1191": {
       "name": "엘렌",
@@ -2444,7 +2539,7 @@
       "rank_type": 3
     },
     "54012": {
-      "name": "...",
+      "name": "최 순찰대원",
       "item_type": "「Bangboo」",
       "rank_type": 4
     },
@@ -2482,6 +2577,12 @@
       "name": "에밀리온",
       "item_type": "「Bangboo」",
       "rank_type": 4
+    },
+    "54011": {
+      "name": "레드모쿠스",
+      "item_type": "「Bangboo」",
+      "rank_type": 4
     }
-  }
+  },
+  "version": "1.2"
 }

src/renderer/App.vue

@@ -4,7 +4,7 @@
       <div class="space-x-3">
         <el-button type="primary" :icon="state.status === 'init' ? 'milk-tea': 'refresh-right'" class="focus:outline-none" :disabled="!allowClick()" plain @click="fetchData()" :loading="state.status === 'loading'">{{state.status === 'init' ? ui.button.load: ui.button.update}}</el-button>
         <el-dropdown :disabled="!gachaData" @command="exportCommand">
-          <el-button :disabled="!gachaData" icon="download" class="focus:outline-none" type="success" plain>
+          <el-button :disabled="!gachaData" icon="folder-opened" class="focus:outline-none" type="success" plain>
             {{ui.button.files}}
             <el-icon class="el-icon--right"><arrow-down /></el-icon>
           </el-button>
@@ -12,10 +12,10 @@
             <el-dropdown-menu>
               <el-dropdown-item command="excel">{{ui.button.excel}}</el-dropdown-item>
               <el-dropdown-item command="uigf-json">{{ui.button.uigf}}</el-dropdown-item>
+              <el-dropdown-item command="import-json" divided>{{ui.button.import}}</el-dropdown-item>
             </el-dropdown-menu>
           </template>
         </el-dropdown>
-        <el-button @click="importData()" icon="upload" class="focus:outline-none" type="success" plain>{{ui.button.import}}</el-button>
         <el-tooltip v-if="detail && state.status !== 'loading'" :content="ui.hint.newAccount" placement="bottom">
           <el-button @click="newUser()" plain icon="plus"  class="focus:outline-none"></el-button>
         </el-tooltip>
@@ -290,6 +290,8 @@ const exportCommand = (type) => {
     saveExcel()
   } else if (type === 'uigf-json') {
     exportUIGFJSON()
+  } else if (type === 'import-json') {
+    importData()
   }
 }
 const openCacheFolder = async () => {

src/renderer/components/PieChart.vue

@@ -32,7 +32,7 @@ const props = defineProps({
 
 const chart = ref(null);
 
-const colors = ["#eeaa66", "#fac858", "#ee6666", "#5470c6", "#ba66ee", "#91cc75", "#73c0de"];
+const colors = ["#fac858", "#fac858", "#ee6666", "#5470c6", "#5470c6", "#91cc75", "#73c0de"];
 
 const parseData = (detail, type) => {
   const text = props.i18n.ui.data;

src/renderer/components/Setting.vue

@@ -47,6 +47,7 @@
       </el-form-item>
     </el-form>
     <h3 class="text-lg my-4">{{about.title}}</h3>
+    <p class="text-gray-600 text-xs mt-1">{{text.idVersion}} {{idJson.version}}</p>
     <p class="text-gray-600 text-xs mt-1">{{about.license}}</p>
     <p class="text-gray-600 text-xs mt-1">GitHub: <a @click="openGithub" class="cursor-pointer text-blue-400">https://github.com/earthjasonlin/zzz-signal-search-export</a></p>
     <p class="text-gray-600 text-xs mt-1 pb-6">UIGF: <a @click="openUIGF" class="cursor-pointer text-blue-400">https://uigf.org/</a></p>
@@ -82,6 +83,7 @@
 
 <script setup>
 const { ipcRenderer, shell } = require('electron')
+import idJson from '../../idJson.json'
 import { reactive, onMounted, computed } from 'vue'
 
 const emit = defineEmits(['close', 'changeLang', 'refreshData'])

tools/getIdMap.py

@@ -12,6 +12,7 @@ cc = OpenCC('s2t')
 weapon_url = 'https://api.hakush.in/zzz/data/weapon.json'
 character_url = 'https://api.hakush.in/zzz/data/character.json'
 bangboo_url = 'https://api.hakush.in/zzz/data/bangboo.json'
+version_url = 'https://api.hakush.in/zzz/new.json'
 
 # 语言映射配置
 language_map = {
@@ -53,9 +54,12 @@ def main():
         weapon_data = fetch_json(weapon_url)
         character_data = fetch_json(character_url)
         bangboo_data = fetch_json(bangboo_url)
+        version_data = fetch_json(version_url)
 
         transformed_data = {lang: {} for lang in language_map.keys()}
 
+        transformed_data["version"] = version_data["version"]
+
         weapon_transformed = transform_data(weapon_data, "weapon")
         character_transformed = transform_data(character_data, "character")
         bangboo_transformed = transform_data(bangboo_data, "bangboo")

yarn.lock

@@ -5205,10 +5205,10 @@ window-size@^1.1.1:
     define-property "^1.0.0"
     is-number "^3.0.0"
 
-winreg@^1.2.4:
+winreg@1.2.4:
   version "1.2.4"
   resolved "https://registry.yarnpkg.com/winreg/-/winreg-1.2.4.tgz#ba065629b7a925130e15779108cf540990e98d1b"
-  integrity sha1-ugZWKbepJRMOFXeRCM9UCZDpjRs=
+  integrity sha512-IHpzORub7kYlb8A43Iig3reOvlcBJGX9gZ0WycHhghHtA65X0LYnMRuJs+aH1abVnMJztQkvQNlltnbPi5aGIA==
 
 "wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
   version "7.0.0"
@@ -5326,4 +5326,4 @@ zrender@5.2.1:
   resolved "https://registry.npmmirror.com/zrender/download/zrender-5.2.1.tgz#5f4bbda915ba6d412b0b19dc2431beaad05417bb"
   integrity sha1-X0u9qRW6bUErCxncJDG+qtBUF7s=
   dependencies:
-    tslib "2.3.0"
+    tslib "2.3.0"