chore: update idJson to 2.6

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zzz-signal-search-export",
-  "version": "1.1.18",
+  "version": "1.1.17",
   "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.hideStandard": "Hide Standard Banner",
+  "ui.setting.hideNovice": "Hide Starter Warp",
   "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,7 +51,6 @@
   "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,7 +50,6 @@
   "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

@@ -160,11 +160,6 @@
       "item_type": "音擎",
       "rank_type": 3
     },
-    "13020": {
-      "name": "炎炙沸釜",
-      "item_type": "音擎",
-      "rank_type": 3
-    },
     "13101": {
       "name": "德玛拉电池Ⅱ型",
       "item_type": "音擎",
@@ -425,16 +420,6 @@
       "item_type": "音擎",
       "rank_type": 4
     },
-    "14151": {
-      "name": "霓虹妄想",
-      "item_type": "音擎",
-      "rank_type": 4
-    },
-    "14152": {
-      "name": "鳞齿寻踪",
-      "item_type": "音擎",
-      "rank_type": 4
-    },
     "1011": {
       "name": "安比",
       "item_type": "代理人",
@@ -680,16 +665,6 @@
       "item_type": "代理人",
       "rank_type": 4
     },
-    "1511": {
-      "name": "南宫羽",
-      "item_type": "代理人",
-      "rank_type": 4
-    },
-    "1521": {
-      "name": "希希芙",
-      "item_type": "代理人",
-      "rank_type": 4
-    },
     "53001": {
       "name": "企鹅布",
       "item_type": "邦布",
@@ -1042,11 +1017,6 @@
       "item_type": "音擎",
       "rank_type": 3
     },
-    "13020": {
-      "name": "炎炙沸釜",
-      "item_type": "音擎",
-      "rank_type": 3
-    },
     "13101": {
       "name": "德瑪拉電池Ⅱ型",
       "item_type": "音擎",
@@ -1307,16 +1277,6 @@
       "item_type": "音擎",
       "rank_type": 4
     },
-    "14151": {
-      "name": "霓虹妄想",
-      "item_type": "音擎",
-      "rank_type": 4
-    },
-    "14152": {
-      "name": "鱗齒尋蹤",
-      "item_type": "音擎",
-      "rank_type": 4
-    },
     "1011": {
       "name": "安比",
       "item_type": "代理人",
@@ -1562,16 +1522,6 @@
       "item_type": "代理人",
       "rank_type": 4
     },
-    "1511": {
-      "name": "南宮羽",
-      "item_type": "代理人",
-      "rank_type": 4
-    },
-    "1521": {
-      "name": "希希芙",
-      "item_type": "代理人",
-      "rank_type": 4
-    },
     "53001": {
       "name": "企鵝布",
       "item_type": "邦布",
@@ -1924,11 +1874,6 @@
       "item_type": "W-Engines",
       "rank_type": 3
     },
-    "13020": {
-      "name": "The Simmering Pot",
-      "item_type": "W-Engines",
-      "rank_type": 3
-    },
     "13101": {
       "name": "Demara Battery Mark II",
       "item_type": "W-Engines",
@@ -2189,16 +2134,6 @@
       "item_type": "W-Engines",
       "rank_type": 4
     },
-    "14151": {
-      "name": "Neon Fantasies",
-      "item_type": "W-Engines",
-      "rank_type": 4
-    },
-    "14152": {
-      "name": "Serpentine Seeker",
-      "item_type": "W-Engines",
-      "rank_type": 4
-    },
     "1011": {
       "name": "Anby",
       "item_type": "Agents",
@@ -2444,16 +2379,6 @@
       "item_type": "Agents",
       "rank_type": 4
     },
-    "1511": {
-      "name": "Nangong Yu",
-      "item_type": "Agents",
-      "rank_type": 4
-    },
-    "1521": {
-      "name": "Cissia",
-      "item_type": "Agents",
-      "rank_type": 4
-    },
     "53001": {
       "name": "Penguinboo",
       "item_type": "Bangboo",
@@ -2806,11 +2731,6 @@
       "item_type": "音動機",
       "rank_type": 3
     },
-    "13020": {
-      "name": "炎々沸々鍋一丁",
-      "item_type": "音動機",
-      "rank_type": 3
-    },
     "13101": {
       "name": "デマラ式電池Ⅱ型",
       "item_type": "音動機",
@@ -3071,16 +2991,6 @@
       "item_type": "音動機",
       "rank_type": 4
     },
-    "14151": {
-      "name": "妄想ディスコテック",
-      "item_type": "音動機",
-      "rank_type": 4
-    },
-    "14152": {
-      "name": "影を追う白き牙",
-      "item_type": "音動機",
-      "rank_type": 4
-    },
     "1011": {
       "name": "アンビー",
       "item_type": "エージェント",
@@ -3326,16 +3236,6 @@
       "item_type": "エージェント",
       "rank_type": 4
     },
-    "1511": {
-      "name": "南宮羽",
-      "item_type": "エージェント",
-      "rank_type": 4
-    },
-    "1521": {
-      "name": "シーシィア",
-      "item_type": "エージェント",
-      "rank_type": 4
-    },
     "53001": {
       "name": "ペンギンボンプ",
       "item_type": "ボンプ",
@@ -3688,11 +3588,6 @@
       "item_type": "W-엔진",
       "rank_type": 3
     },
-    "13020": {
-      "name": "들끓는 가마솥",
-      "item_type": "W-엔진",
-      "rank_type": 3
-    },
     "13101": {
       "name": "데마라 배터리 Ⅱ형",
       "item_type": "W-엔진",
@@ -3953,16 +3848,6 @@
       "item_type": "W-엔진",
       "rank_type": 4
     },
-    "14151": {
-      "name": "네온사인 망상",
-      "item_type": "W-엔진",
-      "rank_type": 4
-    },
-    "14152": {
-      "name": "추적하는 송곳니",
-      "item_type": "W-엔진",
-      "rank_type": 4
-    },
     "1011": {
       "name": "엔비",
       "item_type": "에이전트",
@@ -4208,16 +4093,6 @@
       "item_type": "에이전트",
       "rank_type": 4
     },
-    "1511": {
-      "name": "남궁우",
-      "item_type": "에이전트",
-      "rank_type": 4
-    },
-    "1521": {
-      "name": "시시아",
-      "item_type": "에이전트",
-      "rank_type": 4
-    },
     "53001": {
       "name": "펭귄부",
       "item_type": "「Bangboo」",
@@ -4409,5 +4284,5 @@
       "rank_type": 4
     }
   },
-  "version": "2.7"
+  "version": "2.6"
 }

src/main/config.js

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

src/main/getData.js

@@ -12,6 +12,7 @@ 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.hideStandard && item[0] === '1' }">
+        <div :class="{ hidden: state.config.hideNovice && item[0] === '2' }">
           <p class="text-center text-gray-600 my-2">
             {{ typeMap.get(item[0]) }}
           </p>

src/renderer/components/Setting.vue

@@ -29,12 +29,6 @@
           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"
@@ -109,7 +103,6 @@ const settingForm = reactive({
   proxyMode: true,
   autoUpdate: true,
   fetchFullHistory: false,
-  hideStandard: true
 })
 
 const state = reactive({
@@ -122,7 +115,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', 'hideStandard']
+  const keys = ['lang', 'logType', 'proxyMode', 'autoUpdate', 'fetchFullHistory']
   for (let key of keys) {
     await ipcRenderer.invoke('SAVE_CONFIG', [key, settingForm[key]])
   }

src/renderer/gachaDetail.js

@@ -8,13 +8,9 @@ const itemCount = (map, name) => {
   }
 }
 
-const order = ['2', '3', '5', '102', '103', '1']
-
 const gachaDetail = (data) => {
   const detailMap = new Map()
-  for (let key of order) {
+  for (let [key, value] of data) {
-    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,