From 2ebec941eaf03ffa6d2fd1a89623ef6766332648 Mon Sep 17 00:00:00 2001
From: lizhuoyuan <2820814112@qq.com>
Date: Fri, 18 Apr 2025 15:57:40 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=A1=80=E7=93=B6=E5=AE=9D=E7=9F=B3?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libs/items.js      |  7 ++-----
 project/plugins.js | 51 ++++++++++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/libs/items.js b/libs/items.js
index 74824c07..654fd04d 100644
--- a/libs/items.js
+++ b/libs/items.js
@@ -32,11 +32,8 @@ items.prototype.getItemEffectValue = function (itemId, ratio) {
     const itemEffectEvent = core.material.items[itemId].itemEffectEvent;
     if (!itemEffectEvent) return effectObj;
     const value = itemEffectEvent.value;
-    if (!ratio && ratio !== 0) {
-        ratio = core.status.thisMap.ratio;
-        if (!ratio && ratio !== 0) {
-            ratio = 1;
-        }
+    if (ratio == null) {
+        ratio = (core.status.thisMap?.ratio) ?? 1;
     }
     for (let statusName in value) {
         let statusValue, needRatio;
diff --git a/project/plugins.js b/project/plugins.js
index cb7bcfe5..98caa71b 100644
--- a/project/plugins.js
+++ b/project/plugins.js
@@ -1793,30 +1793,37 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 =
 				diff = {};
 				const id = block.event.id;
 				const item = core.material.items[id];
-				if (item.cls === 'items' && item.hasOwnProperty('itemEffectEvent') && item.itemEffectEvent.hasOwnProperty('value')) {
-					const values = item.itemEffectEvent.value;
-					for (let statusName in values) {
-						const getStatusValue = values[statusName];
-						let ratio, needRatio, statusValue;
-						if (statusName.endsWith(':o')) {
-							needRatio = true;
-							statusName = statusName.slice(0, -2);
-						}
-						ratio = getRatio();
-						if (core.status.hero.hasOwnProperty(statusName)) {
-							if (!diff.hasOwnProperty(statusName)) {
-								diff[statusName] = 0;
-							}
-							try {
-								statusValue = eval(getStatusValue);
-							} catch (error) {
-								console.log(error);
-							}
-							if (needRatio) statusValue *= ratio;
-							diff[statusName] += statusValue || 0;
-						}
+				if (item.cls === 'items'){
+					const ratio = getRatio();
+					const effectObj = core.getItemEffectValue(item.id, ratio);
+					for (let statusName in effectObj) {
+						diff[statusName] = statusValue || 0;
 					}
 				}
+				// if (item.cls === 'items' && item.hasOwnProperty('itemEffectEvent') && item.itemEffectEvent.hasOwnProperty('value')) {
+				// 	const values = item.itemEffectEvent.value;
+				// 	for (let statusName in values) {
+				// 		const getStatusValue = values[statusName];
+				// 		let ratio, needRatio, statusValue;
+				// 		if (statusName.endsWith(':o')) {
+				// 			needRatio = true;
+				// 			statusName = statusName.slice(0, -2);
+				// 		}
+				// 		ratio = getRatio();
+				// 		if (core.status.hero.hasOwnProperty(statusName)) {
+				// 			if (!diff.hasOwnProperty(statusName)) {
+				// 				diff[statusName] = 0;
+				// 			}
+				// 			try {
+				// 				statusValue = eval(getStatusValue);
+				// 			} catch (error) {
+				// 				console.log(error);
+				// 			}
+				// 			if (needRatio) statusValue *= ratio;
+				// 			diff[statusName] += statusValue || 0;
+				// 		}
+				// 	}
+				// }
 				if (item.cls === 'equips') {
 					// 装备也显示
 					const diff = item.equip.value ?? {};