From 910dd4d19dc587dd5c80f699dfab9edb9c1ae11c Mon Sep 17 00:00:00 2001
From: bietiaop <1527109126@qq.com>
Date: Thu, 14 Nov 2024 18:41:54 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E6=9B=B4=E6=8D=A2v2=E5=9C=B0=E5=9D=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/assets/mysurl.js     |  3 +++
 lib/download.js          | 10 ++++------
 lib/download/download.js | 15 +--------------
 3 files changed, 8 insertions(+), 20 deletions(-)

diff --git a/lib/assets/mysurl.js b/lib/assets/mysurl.js
index ea25481..bdc2c45 100644
--- a/lib/assets/mysurl.js
+++ b/lib/assets/mysurl.js
@@ -5,3 +5,6 @@ export const ZZZ_RES = 'https://act-webstatic.mihoyo.com/game_record/zzz',
 export const NEW_ZZZ_RES = 'https://act-webstatic.mihoyo.com/game_record/nap',
   NEW_ZZZ_SQUARE_AVATAR = `${NEW_ZZZ_RES}/role_square_avatar`,
   NEW_ZZZ_SQUARE_BANGBOO = `${NEW_ZZZ_RES}/bangboo_rectangle_avatar`;
+export const ZZZ_RES_V2 = `https://act-webstatic.mihoyo.com/game_record/zzzv2`,
+  ZZZ_SQUARE_AVATAR_V2 = `${ZZZ_RES_V2}/role_square_avatar_v2`,
+  ZZZ_SQUARE_BANGBOO_V2 = `${ZZZ_RES_V2}/bangboo_rectangle_avatar`;
diff --git a/lib/download.js b/lib/download.js
index 673b281..8d1d8bb 100644
--- a/lib/download.js
+++ b/lib/download.js
@@ -13,10 +13,9 @@ import {
 export const getSquareAvatar = async charID => {
   const filename = `role_square_avatar_${charID}.png`;
   const result = await downloadMysImage(
-    'ZZZ_SQUARE_AVATAR',
+    'ZZZ_SQUARE_AVATAR_V2',
     'ZZZ_SQUARE_AVATAR_PATH',
-    filename,
-    'NEW_ZZZ_SQUARE_AVATAR'
+    filename
   );
   return result;
 };
@@ -46,10 +45,9 @@ export const getSmallSquareAvatar = async charID => {
 export const getSquareBangboo = async bangbooId => {
   const filename = `bangboo_rectangle_avatar_${bangbooId}.png`;
   const result = await downloadMysImage(
-    'ZZZ_SQUARE_BANGBOO',
+    'ZZZ_SQUARE_BANGBOO_V2',
     'ZZZ_SQUARE_BANGBOO_PATH',
-    filename,
-    'NEW_ZZZ_SQUARE_BANGBOO'
+    filename
   );
   return result;
 };
diff --git a/lib/download/download.js b/lib/download/download.js
index 4a6921f..1b051ae 100644
--- a/lib/download/download.js
+++ b/lib/download/download.js
@@ -10,27 +10,14 @@ import * as LocalURI from './const.js';
  * @param {keyof MysURL} base 远程地址
  * @param {keyof LocalURI} localBase 本地地址
  * @param {string} filename 文件名
- * @param {keyof MysURL} newBase 新远程地址
  * @returns {Promise<string | null>} 保存路径
  */
-export const downloadMysImage = async (
-  base,
-  localBase,
-  filename,
-  newBase = ''
-) => {
+export const downloadMysImage = async (base, localBase, filename) => {
   base = MysURL[base];
   localBase = LocalURI[localBase];
-  if (!!newBase) {
-    newBase = MysURL[newBase];
-  }
   const finalPath = path.join(localBase, filename);
   let url = `${base}/${filename}`;
   let result = await checkFile(url, finalPath);
-  if (!result && !!newBase) {
-    url = `${newBase}/${filename}`;
-    result = await checkFile(url, finalPath);
-  }
   return result;
 };