chore: update idJson to 2.8

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

@@ -435,8 +435,13 @@
       "item_type": "音擎",
       "rank_type": 4
     },
+    "14153": {
+      "name": "辉骑面铠",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
     "14154": {
-      "name": "(Test1)普罗米娅测试音擎",
+      "name": "朔月裁霜",
       "item_type": "音擎",
       "rank_type": 4
     },
@@ -695,6 +700,11 @@
       "item_type": "代理人",
       "rank_type": 4
     },
+    "1531": {
+      "name": "星徽·比利",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
     "1541": {
       "name": "普罗米娅",
       "item_type": "代理人",
@@ -791,9 +801,9 @@
       "rank_type": 3
     },
     "53021": {
-      "name": "(Test1)幽浮布",
+      "name": "幽浮布",
       "item_type": "邦布",
-      "rank_type": 4
+      "rank_type": 3
     },
     "54001": {
       "name": "鲨牙布",
@@ -1332,8 +1342,13 @@
       "item_type": "音擎",
       "rank_type": 4
     },
+    "14153": {
+      "name": "輝騎面鎧",
+      "item_type": "音擎",
+      "rank_type": 4
+    },
     "14154": {
-      "name": "(Test1)普羅米婭測試音擎",
+      "name": "朔月裁霜",
       "item_type": "音擎",
       "rank_type": 4
     },
@@ -1592,6 +1607,11 @@
       "item_type": "代理人",
       "rank_type": 4
     },
+    "1531": {
+      "name": "星徽·比利",
+      "item_type": "代理人",
+      "rank_type": 4
+    },
     "1541": {
       "name": "普羅米婭",
       "item_type": "代理人",
@@ -1688,9 +1708,9 @@
       "rank_type": 3
     },
     "53021": {
-      "name": "(Test1)幽浮布",
+      "name": "幽浮布",
       "item_type": "邦布",
-      "rank_type": 4
+      "rank_type": 3
     },
     "54001": {
       "name": "鯊牙布",
@@ -2229,8 +2249,13 @@
       "item_type": "W-Engines",
       "rank_type": 4
     },
+    "14153": {
+      "name": "Starlight Rider Faceplate",
+      "item_type": "W-Engines",
+      "rank_type": 4
+    },
     "14154": {
-      "name": "Item_Weapon_S_1541_Name",
+      "name": "Frostfall Sickle",
       "item_type": "W-Engines",
       "rank_type": 4
     },
@@ -2489,8 +2514,13 @@
       "item_type": "Agents",
       "rank_type": 4
     },
+    "1531": {
+      "name": "Starlight - Billy",
+      "item_type": "Agents",
+      "rank_type": 4
+    },
     "1541": {
-      "name": "Avatar_Female_Size03_Promeia",
+      "name": "Promeia",
       "item_type": "Agents",
       "rank_type": 4
     },
@@ -2585,9 +2615,9 @@
       "rank_type": 3
     },
     "53021": {
-      "name": "Bangboo_Name_53021",
+      "name": "Booltergeist",
       "item_type": "Bangboo",
-      "rank_type": 4
+      "rank_type": 3
     },
     "54001": {
       "name": "Sharkboo",
@@ -3126,8 +3156,13 @@
       "item_type": "音動機",
       "rank_type": 4
     },
+    "14153": {
+      "name": "スターライトバイザー",
+      "item_type": "音動機",
+      "rank_type": 4
+    },
     "14154": {
-      "name": "Item_Weapon_S_1541_Name",
+      "name": "フロスト・クレセント",
       "item_type": "音動機",
       "rank_type": 4
     },
@@ -3272,7 +3307,7 @@
       "rank_type": 4
     },
     "1301": {
-      "name": "オルペウス＆「鬼火」",
+      "name": "オルペウス&「鬼火」",
       "item_type": "エージェント",
       "rank_type": 4
     },
@@ -3386,8 +3421,13 @@
       "item_type": "エージェント",
       "rank_type": 4
     },
+    "1531": {
+      "name": "スターライト･ビリー",
+      "item_type": "エージェント",
+      "rank_type": 4
+    },
     "1541": {
-      "name": "Avatar_Female_Size03_Promeia",
+      "name": "プロメイア",
       "item_type": "エージェント",
       "rank_type": 4
     },
@@ -3482,9 +3522,9 @@
       "rank_type": 3
     },
     "53021": {
-      "name": "Bangboo_Name_53021",
+      "name": "ユウレイボンプ",
       "item_type": "ボンプ",
-      "rank_type": 4
+      "rank_type": 3
     },
     "54001": {
       "name": "ガブットボンプ",
@@ -4023,8 +4063,13 @@
       "item_type": "W-엔진",
       "rank_type": 4
     },
+    "14153": {
+      "name": "별빛 기사의 가면",
+      "item_type": "W-엔진",
+      "rank_type": 4
+    },
     "14154": {
-      "name": "Item_Weapon_S_1541_Name",
+      "name": "삭월에 끊어지는 서리",
       "item_type": "W-엔진",
       "rank_type": 4
     },
@@ -4283,8 +4328,13 @@
       "item_type": "에이전트",
       "rank_type": 4
     },
+    "1531": {
+      "name": "스타라이트·빌리",
+      "item_type": "에이전트",
+      "rank_type": 4
+    },
     "1541": {
-      "name": "Avatar_Female_Size03_Promeia",
+      "name": "프로미아",
       "item_type": "에이전트",
       "rank_type": 4
     },
@@ -4379,9 +4429,9 @@
       "rank_type": 3
     },
     "53021": {
-      "name": "Bangboo_Name_53021",
+      "name": "유령부",
       "item_type": "「Bangboo」",
-      "rank_type": 4
+      "rank_type": 3
     },
     "54001": {
       "name": "샤크부",
@@ -4484,5 +4534,5 @@
       "rank_type": 4
     }
   },
-  "version": "2.8.0+14441350"
+  "version": "2.8"
 }

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,

tools/getIdMap.py

@@ -67,8 +67,7 @@ def main():
         version_url = "https://static.nanoka.cc/manifest.json"
         version_data = fetch_json(version_url)
 
-        latest_version = version_data['zzz']['latest']
-        live_version = version_data['zzz']['live']
+        latest_version = version_data['zzz']['live']
         print(f"Latest version: {latest_version}")
         
         weapon_url = f"https://static.nanoka.cc/zzz/{latest_version}/weapon.json"