From 10000f4aba4cf4baa41ffa79d597f05b27728029 Mon Sep 17 00:00:00 2001
From: BTMuli <bt-muli@outlook.com>
Date: Sat, 17 Jan 2026 21:56:56 +0800
Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20=E4=BF=AE=E6=AD=A3Up=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/userGacha/gro-data-view.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/userGacha/gro-data-view.vue b/src/components/userGacha/gro-data-view.vue
index a8ffb1c1..086527e3 100644
--- a/src/components/userGacha/gro-data-view.vue
+++ b/src/components/userGacha/gro-data-view.vue
@@ -93,6 +93,7 @@
   </div>
 </template>
 <script lang="ts" setup>
+import gameEnum from "@enum/game.js";
 import { UnlistenFn } from "@tauri-apps/api/event";
 import { getCurrentWindow } from "@tauri-apps/api/window";
 import {
@@ -248,9 +249,14 @@ function checkIsUp(item: TGApp.Sqlite.Gacha.Gacha): boolean | undefined {
   if (item.gachaType === "100" || item.gachaType === "200") return undefined;
   const itemTime = new Date(item.time).getTime();
   const itemIdNum = Number(item.itemId);
+  const strictPool: Array<string> = [gameEnum.gachaType.WeaponUp, gameEnum.gachaType.MixUp];
+  const avatarUpPool: Array<string> = [gameEnum.gachaType.AvatarUp, gameEnum.gachaType.AvatarUp2];
   const poolsFind = AppGachaData.filter((pool) => {
-    // 对于武器池，严格要求 gachaType 对应，角色池放宽以修复特殊情况下的异常
-    if (pool.type.toLocaleString() !== item.gachaType && item.gachaType === "302") return false;
+    // 对于武器池&集录池，严格要求 gachaType 对应，角色池放宽以修复特殊情况下的异常
+    if (pool.type.toString() !== item.gachaType) {
+      if (strictPool.includes(item.gachaType.toString())) return false;
+      if (!avatarUpPool.includes(pool.type.toString())) return false;
+    }
     const startTime = new Date(pool.from).getTime();
     const endTime = new Date(pool.to).getTime();
     return itemTime >= startTime && itemTime <= endTime;