From 5f0554263bb723720dca03f5b6bf4e03944889e1 Mon Sep 17 00:00:00 2001
From: kissnavel <xkn0722@gmail.com>
Date: Sun, 30 Nov 2025 22:47:05 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=B0=83=E6=95=B4=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/gachalog.js |  4 ++--
 lib/gacha.js     | 15 +++++----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/apps/gachalog.js b/apps/gachalog.js
index a264ff2..64157b0 100644
--- a/apps/gachalog.js
+++ b/apps/gachalog.js
@@ -125,9 +125,9 @@ export class GachaLog extends ZZZPlugin {
     const uid = await this.getUID();
     if (!uid) return false;
     if (/^(1[0-9])[0-9]{8}/i.test(uid)) {
-      const { api } = await this.getAPI();
+      const { api, deviceFp } = await this.getAPI();
       this.reply('抽卡记录获取中请稍等...可能需要一段时间，请耐心等待');
-      const { data, count } = await updateGachaLog(api, uid);
+      const { data, count } = await updateGachaLog(api, uid, deviceFp);
       let msg = [];
       msg.push(`抽卡记录更新成功，共${Object.keys(data).length}个卡池`);
       for (const name in data) {
diff --git a/lib/gacha.js b/lib/gacha.js
index e9f91ef..308c971 100644
--- a/lib/gacha.js
+++ b/lib/gacha.js
@@ -14,7 +14,6 @@ import {
 } from './gacha/const.js';
 import { getLevelFromList } from './gacha/tool.js';
 import { getZZZGachaLogByAuthkey } from './gacha/core.js';
-import request from '../utils/request.js';
 
 /**
  * 更新抽卡数据
@@ -62,18 +61,14 @@ export const updateGachaLog = async (authKey, uid, region, game_biz) => {
       queryLabel: while (true) {
         if (/^(1[0-9])[0-9]{8}/i.test(uid)) {
           const api = authKey;
+          const deviceFp = region;
           // 获取抽卡记录
-          const sdk = api.getUrl('zzzGacha_Record', { type, endId } );
-          const res = await request(sdk.url, {
-            headers: sdk.headers,
-            method: 'get',
-          });
-          const log = await res.json();
-          if (!log || !log?.data?.gacha_item_list || log?.data?.gacha_item_list?.length === 0) {
+          const log = await api.getFinalData('zzzGacha_Record', { deviceFp, type, endId } );
+          if (!log || !log?.gacha_item_list || log?.gacha_item_list?.length === 0) {
             break;
           }
           // 遍历数据 (从最新的开始)
-          for (let item of log.data.gacha_item_list) {
+          for (let item of log.gacha_item_list) {
             item = {
               uid: uid,
               gacha_id: '0',
@@ -98,7 +93,7 @@ export const updateGachaLog = async (authKey, uid, region, game_biz) => {
             newCount[name]++;
           }
           // 更新页数和最后一个数据的 id
-          endId = log.data.gacha_item_list[log.data.gacha_item_list.length - 1]?.id || endId;
+          endId = log.gacha_item_list[log.gacha_item_list.length - 1]?.id || endId;
         } else {
           // 获取抽卡记录
           const log = await getZZZGachaLogByAuthkey(