chore: update idJson to 3.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zzz-signal-search-export",
-  "version": "1.1.17",
+  "version": "1.1.20",
   "autoUpdateActive": true,
   "autoUpdateFrom": "1.1.0",
   "main": "./dist/electron/main/main.js",

src/i18n/English.json

@@ -51,7 +51,7 @@
   "ui.setting.logTypeHint": "Choose which server generated logs to be used first when acquiring URL from game logs",
   "ui.setting.dataManagerHint": "Unnecessary data can be deleted",
   "ui.setting.autoUpdate": "Auto update",
-  "ui.setting.hideNovice": "Hide Starter Warp",
+  "ui.setting.hideStandard": "Hide Standard Banner",
   "ui.setting.proxyMode": "Proxy mode",
   "ui.setting.proxyModeHint": "When we fail to get the URL from system logs, use the system proxy",
   "ui.setting.fetchFullHistory": "Get complete data",

src/i18n/简体中文.json

@@ -51,6 +51,7 @@
   "ui.setting.logTypeHint": "使用游戏日志获取URL时，优先选择哪种服务器生成的日志文件。",
   "ui.setting.dataManagerHint": "可以删除不需要的数据。",
   "ui.setting.autoUpdate": "自动更新",
+  "ui.setting.hideStandard": "隐藏常驻池",
   "ui.setting.proxyMode": "代理模式",
   "ui.setting.proxyModeHint": "通过设置系统代理来获取URL，无法从日志中获取到有效的URL时才会启动代理服务器。",
   "ui.setting.fetchFullHistory": "获取完整数据",

src/i18n/繁體中文.json

@@ -50,6 +50,7 @@
   "ui.setting.logTypeHint": "使用遊戲日誌獲取URL時，優先選擇哪種服務器生成的日誌文件。",
   "ui.setting.dataManagerHint": "可以刪除不需要的數據。",
   "ui.setting.autoUpdate": "自動更新",
+  "ui.setting.hideStandard": "隱藏常駐池",
   "ui.setting.proxyMode": "代理模式",
   "ui.setting.proxyModeHint": "通過設置系統代理來獲取URL，無法從日誌中獲取到有效的URL時才會啟動代理服務器。",
   "ui.setting.fetchFullHistory": "獲取完整數據",

src/idJson.json

@@ -155,6 +155,11 @@
       "item_type": "音擎",
       "rank_type": 3
     },
+    "13018": {
+      "name": "咚哒回声",
+      "item_type": "音擎",
+      "rank_type": 3
+    },
     "13019": {
       "name": "青漪灵鼎",
       "item_type": "音擎",
@@ -435,6 +440,31 @@
       "item_type": "音擎",
       "rank_type": 4
     },
+    "14153": {
+      "name": "辉骑面铠",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
+    "14154": {
+      "name": "朔月裁霜",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
+    "14155": {
+      "name": "日冕遗蜕",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
+    "14156": {
+      "name": "琳琅鎏心",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
+    "14157": {
+      "name": "首席跟班",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
     "1011": {
       "name": "安比",
       "item_type": "代理人",
@@ -690,6 +720,36 @@
       "item_type": "代理人",
       "rank_type": 4
     },
+    "1531": {
+      "name": "星徽·比利",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1541": {
+      "name": "普罗米娅",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1551": {
+      "name": "佩洛伊斯",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1561": {
+      "name": "维琳娜",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1571": {
+      "name": "诺姆",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1581": {
+      "name": "蕾米埃尔",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
     "53001": {
       "name": "企鹅布",
       "item_type": "邦布",
@@ -780,6 +840,11 @@
       "item_type": "邦布",
       "rank_type": 3
     },
+    "53021": {
+      "name": "幽浮布",
+      "item_type": "邦布",
+      "rank_type": 3
+    },
     "54001": {
       "name": "鲨牙布",
       "item_type": "邦布",
@@ -879,6 +944,11 @@
       "name": "芽芽",
       "item_type": "邦布",
       "rank_type": 4
+    },
+    "54022": {
+      "name": "超极杰克",
+      "item_type": "邦布",
+      "rank_type": 4
     }
   },
   "zh-tw": {
@@ -1037,6 +1107,11 @@
       "item_type": "音擎",
       "rank_type": 3
     },
+    "13018": {
+      "name": "咚噠回聲",
+      "item_type": "音擎",
+      "rank_type": 3
+    },
     "13019": {
       "name": "青漪靈鼎",
       "item_type": "音擎",
@@ -1317,6 +1392,31 @@
       "item_type": "音擎",
       "rank_type": 4
     },
+    "14153": {
+      "name": "輝騎面鎧",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
+    "14154": {
+      "name": "朔月裁霜",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
+    "14155": {
+      "name": "日冕遺蛻",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
+    "14156": {
+      "name": "琳琅鎏心",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
+    "14157": {
+      "name": "首席跟班",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
     "1011": {
       "name": "安比",
       "item_type": "代理人",
@@ -1572,6 +1672,36 @@
       "item_type": "代理人",
       "rank_type": 4
     },
+    "1531": {
+      "name": "星徽·比利",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1541": {
+      "name": "普羅米婭",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1551": {
+      "name": "佩洛伊斯",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1561": {
+      "name": "維琳娜",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1571": {
+      "name": "諾姆",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
+    "1581": {
+      "name": "蕾米埃爾",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
     "53001": {
       "name": "企鵝布",
       "item_type": "邦布",
@@ -1662,6 +1792,11 @@
       "item_type": "邦布",
       "rank_type": 3
     },
+    "53021": {
+      "name": "幽浮布",
+      "item_type": "邦布",
+      "rank_type": 3
+    },
     "54001": {
       "name": "鯊牙布",
       "item_type": "邦布",
@@ -1761,6 +1896,11 @@
       "name": "芽芽",
       "item_type": "邦布",
       "rank_type": 4
+    },
+    "54022": {
+      "name": "超極傑克",
+      "item_type": "邦布",
+      "rank_type": 4
     }
   },
   "en-us": {
@@ -1919,6 +2059,11 @@
       "item_type": "W-Engines",
       "rank_type": 3
     },
+    "13018": {
+      "name": "Boisterous Echoes",
+      "item_type": "W-Engines",
+      "rank_type": 3
+    },
     "13019": {
       "name": "Cauldron of Clarity",
       "item_type": "W-Engines",
@@ -2199,6 +2344,31 @@
       "item_type": "W-Engines",
       "rank_type": 4
     },
+    "14153": {
+      "name": "Starlight Rider Faceplate",
+      "item_type": "W-Engines",
+      "rank_type": 4
+    },
+    "14154": {
+      "name": "Frostfall Sickle",
+      "item_type": "W-Engines",
+      "rank_type": 4
+    },
+    "14155": {
+      "name": "Sol Exuvia",
+      "item_type": "W-Engines",
+      "rank_type": 4
+    },
+    "14156": {
+      "name": "Joyau Dore",
+      "item_type": "W-Engines",
+      "rank_type": 4
+    },
+    "14157": {
+      "name": "Chief Sidekick",
+      "item_type": "W-Engines",
+      "rank_type": 4
+    },
     "1011": {
       "name": "Anby",
       "item_type": "Agents",
@@ -2454,6 +2624,36 @@
       "item_type": "Agents",
       "rank_type": 4
     },
+    "1531": {
+      "name": "Starlight - Billy",
+      "item_type": "Agents",
+      "rank_type": 4
+    },
+    "1541": {
+      "name": "Promeia",
+      "item_type": "Agents",
+      "rank_type": 4
+    },
+    "1551": {
+      "name": "Pyrois",
+      "item_type": "Agents",
+      "rank_type": 4
+    },
+    "1561": {
+      "name": "Velina",
+      "item_type": "Agents",
+      "rank_type": 4
+    },
+    "1571": {
+      "name": "Norma",
+      "item_type": "Agents",
+      "rank_type": 4
+    },
+    "1581": {
+      "name": "Avatar_Female_Size02_Remielle",
+      "item_type": "Agents",
+      "rank_type": 4
+    },
     "53001": {
       "name": "Penguinboo",
       "item_type": "Bangboo",
@@ -2544,6 +2744,11 @@
       "item_type": "Bangboo",
       "rank_type": 3
     },
+    "53021": {
+      "name": "Booltergeist",
+      "item_type": "Bangboo",
+      "rank_type": 3
+    },
     "54001": {
       "name": "Sharkboo",
       "item_type": "Bangboo",
@@ -2643,6 +2848,11 @@
       "name": "Sprout",
       "item_type": "Bangboo",
       "rank_type": 4
+    },
+    "54022": {
+      "name": "Ultra Jake",
+      "item_type": "Bangboo",
+      "rank_type": 4
     }
   },
   "ja-jp": {
@@ -2801,6 +3011,11 @@
       "item_type": "音動機",
       "rank_type": 3
     },
+    "13018": {
+      "name": "ドンカツエコー",
+      "item_type": "音動機",
+      "rank_type": 3
+    },
     "13019": {
       "name": "蒼き波の霊器",
       "item_type": "音動機",
@@ -3081,6 +3296,31 @@
       "item_type": "音動機",
       "rank_type": 4
     },
+    "14153": {
+      "name": "スターライトバイザー",
+      "item_type": "音動機",
+      "rank_type": 4
+    },
+    "14154": {
+      "name": "フロスト・クレセント",
+      "item_type": "音動機",
+      "rank_type": 4
+    },
+    "14155": {
+      "name": "太陽の抜け殻",
+      "item_type": "音動機",
+      "rank_type": 4
+    },
+    "14156": {
+      "name": "金襴の心",
+      "item_type": "音動機",
+      "rank_type": 4
+    },
+    "14157": {
+      "name": "エースのオトモ",
+      "item_type": "音動機",
+      "rank_type": 4
+    },
     "1011": {
       "name": "アンビー",
       "item_type": "エージェント",
@@ -3222,7 +3462,7 @@
       "rank_type": 4
     },
     "1301": {
-      "name": "オルペウス＆「鬼火」",
+      "name": "オルペウス&「鬼火」",
       "item_type": "エージェント",
       "rank_type": 4
     },
@@ -3336,6 +3576,36 @@
       "item_type": "エージェント",
       "rank_type": 4
     },
+    "1531": {
+      "name": "スターライト･ビリー",
+      "item_type": "エージェント",
+      "rank_type": 4
+    },
+    "1541": {
+      "name": "プロメイア",
+      "item_type": "エージェント",
+      "rank_type": 4
+    },
+    "1551": {
+      "name": "ピュロイス",
+      "item_type": "エージェント",
+      "rank_type": 4
+    },
+    "1561": {
+      "name": "ヴェリナ",
+      "item_type": "エージェント",
+      "rank_type": 4
+    },
+    "1571": {
+      "name": "ノルムー",
+      "item_type": "エージェント",
+      "rank_type": 4
+    },
+    "1581": {
+      "name": "Avatar_Female_Size02_Remielle",
+      "item_type": "エージェント",
+      "rank_type": 4
+    },
     "53001": {
       "name": "ペンギンボンプ",
       "item_type": "ボンプ",
@@ -3426,6 +3696,11 @@
       "item_type": "ボンプ",
       "rank_type": 3
     },
+    "53021": {
+      "name": "ユウレイボンプ",
+      "item_type": "ボンプ",
+      "rank_type": 3
+    },
     "54001": {
       "name": "ガブットボンプ",
       "item_type": "ボンプ",
@@ -3525,6 +3800,11 @@
       "name": "メメ",
       "item_type": "ボンプ",
       "rank_type": 4
+    },
+    "54022": {
+      "name": "ウルトラネイヴ",
+      "item_type": "ボンプ",
+      "rank_type": 4
     }
   },
   "ko-kr": {
@@ -3683,6 +3963,11 @@
       "item_type": "W-엔진",
       "rank_type": 3
     },
+    "13018": {
+      "name": "둥둥 메아리",
+      "item_type": "W-엔진",
+      "rank_type": 3
+    },
     "13019": {
       "name": "푸른 물결의 솥",
       "item_type": "W-엔진",
@@ -3963,6 +4248,31 @@
       "item_type": "W-엔진",
       "rank_type": 4
     },
+    "14153": {
+      "name": "별빛 기사의 가면",
+      "item_type": "W-엔진",
+      "rank_type": 4
+    },
+    "14154": {
+      "name": "삭월에 끊어지는 서리",
+      "item_type": "W-엔진",
+      "rank_type": 4
+    },
+    "14155": {
+      "name": "태양의 유체",
+      "item_type": "W-엔진",
+      "rank_type": 4
+    },
+    "14156": {
+      "name": "영롱한 금빛 마음",
+      "item_type": "W-엔진",
+      "rank_type": 4
+    },
+    "14157": {
+      "name": "수석 조수",
+      "item_type": "W-엔진",
+      "rank_type": 4
+    },
     "1011": {
       "name": "엔비",
       "item_type": "에이전트",
@@ -4218,6 +4528,36 @@
       "item_type": "에이전트",
       "rank_type": 4
     },
+    "1531": {
+      "name": "스타라이트·빌리",
+      "item_type": "에이전트",
+      "rank_type": 4
+    },
+    "1541": {
+      "name": "프로미아",
+      "item_type": "에이전트",
+      "rank_type": 4
+    },
+    "1551": {
+      "name": "피로이스",
+      "item_type": "에이전트",
+      "rank_type": 4
+    },
+    "1561": {
+      "name": "벨리나",
+      "item_type": "에이전트",
+      "rank_type": 4
+    },
+    "1571": {
+      "name": "노르마",
+      "item_type": "에이전트",
+      "rank_type": 4
+    },
+    "1581": {
+      "name": "Avatar_Female_Size02_Remielle",
+      "item_type": "에이전트",
+      "rank_type": 4
+    },
     "53001": {
       "name": "펭귄부",
       "item_type": "「Bangboo」",
@@ -4308,6 +4648,11 @@
       "item_type": "「Bangboo」",
       "rank_type": 3
     },
+    "53021": {
+      "name": "유령부",
+      "item_type": "「Bangboo」",
+      "rank_type": 3
+    },
     "54001": {
       "name": "샤크부",
       "item_type": "「Bangboo」",
@@ -4407,7 +4752,12 @@
       "name": "싹싹",
       "item_type": "「Bangboo」",
       "rank_type": 4
+    },
+    "54022": {
+      "name": "울트라 제이크",
+      "item_type": "「Bangboo」",
+      "rank_type": 4
     }
   },
-  "version": "2.7"
+  "version": "3.0"
 }

src/main/config.js

@@ -9,7 +9,7 @@ const config = {
   proxyMode: false,
   autoUpdate: true,
   fetchFullHistory: false,
-  hideNovice: false
+  hideStandard: false
 }
 
 const getLocalConfig = async () => {

src/main/getData.js

@@ -12,7 +12,6 @@ const { mergeData } =  require('./utils/mergeData')
 const gachaTypeRaw = require('../gachaType.json')
 
 const dataMap = new Map()
-const order = ['2', '3', '1', '5']
 let apiDomain = 'https://public-operation-nap.mihoyo.com'
 
 const saveData = async (data, url) => {

src/renderer/App.vue

@@ -139,7 +139,7 @@
       class="gap-4 grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 2xl:grid-cols-4"
     >
       <div class="mb-4" v-for="(item, i) of detail" :key="i">
-        <div :class="{ hidden: state.config.hideNovice && item[0] === '2' }">
+        <div :class="{ hidden: state.config.hideStandard && item[0] === '1' }">
           <p class="text-center text-gray-600 my-2">
             {{ typeMap.get(item[0]) }}
           </p>

src/renderer/components/Setting.vue

@@ -29,6 +29,12 @@
           v-model="settingForm.autoUpdate">
         </el-switch>
       </el-form-item>
+      <el-form-item :label="text.hideStandard">
+        <el-switch
+          @change="saveSetting"
+          v-model="settingForm.hideStandard">
+        </el-switch>
+      </el-form-item>
       <el-form-item :label="text.fetchFullHistory">
         <el-switch
           @change="saveSetting"
@@ -103,6 +109,7 @@ const settingForm = reactive({
   proxyMode: true,
   autoUpdate: true,
   fetchFullHistory: false,
+  hideStandard: true
 })
 
 const state = reactive({
@@ -115,7 +122,7 @@ const text = computed(() => props.i18n.ui.setting)
 const about = computed(() => props.i18n.ui.about)
 
 const saveSetting = async () => {
-  const keys = ['lang', 'logType', 'proxyMode', 'autoUpdate', 'fetchFullHistory']
+  const keys = ['lang', 'logType', 'proxyMode', 'autoUpdate', 'fetchFullHistory', 'hideStandard']
   for (let key of keys) {
     await ipcRenderer.invoke('SAVE_CONFIG', [key, settingForm[key]])
   }

src/renderer/gachaDetail.js

@@ -8,9 +8,13 @@ const itemCount = (map, name) => {
   }
 }
 
+const order = ['2', '3', '5', '102', '103', '1']
+
 const gachaDetail = (data) => {
   const detailMap = new Map()
-  for (let [key, value] of data) {
+  for (let key of order) {
+    if (!data.has(key)) continue
+    let value = data.get(key)
     let detail = {
       count2: 0, count3: 0, count4: 0,
       count2w: 0, count3w: 0, count4w: 0, count3c: 0, count4c: 0, count3b: 0, count4b: 0,