From 2650c3dd456afbd5d7cf7d61bbfba07971f6bba6 Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Mon, 6 May 2024 12:49:47 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E8=A7=82=E7=81=AB=E3=80=91=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=BD=93=E5=89=8D=E5=87=BA=E7=89=8C=E9=98=B6=E6=AE=B5?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/jsrg/skill.js | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/character/jsrg/skill.js b/character/jsrg/skill.js
index 36a85cd8e..8f40b0e3b 100644
--- a/character/jsrg/skill.js
+++ b/character/jsrg/skill.js
@@ -6654,7 +6654,12 @@ const skills = {
 		group: "jsrgguanhuo_viewas",
 		content: function () {
 			"step 0";
-			var count = player.getHistory("useSkill", evt => evt.skill == "jsrgguanhuo_viewas").length;
+			var count = player.getHistory("useSkill", evt => {
+				return (
+					evt.skill == "jsrgguanhuo_viewas" &&
+					evt.getParent("phaseUse") === trigger.getParent("phaseUse")
+				);
+			}).length;
 			if (count == 1) {
 				player.addTempSkill("jsrgguanhuo_ex", "phaseUseAfter");
 				player.addMark("jsrgguanhuo_ex", 1, false);
@@ -6666,8 +6671,18 @@ const skills = {
 		ai: {
 			effect: {
 				player: function (card, player) {
-					if (_status.event.getParent().skill == "jsrgguanhuo_viewas" && player.getHistory("useSkill", evt => evt.skill == "jsrgguanhuo_viewas").length == 1) return "zeroplayertarget";
-					if (_status.event.type == "phase" && _status.event.skill == "jsrgguanhuo_viewas" && player.getHistory("useSkill", evt => evt.skill == "jsrgguanhuo_viewas").length > 1 && player.countCards("h") <= 3) return [0, 0];
+					if (_status.event.getParent().skill == "jsrgguanhuo_viewas" && player.getHistory("useSkill", evt => {
+						return (
+							evt.skill == "jsrgguanhuo_viewas" &&
+							evt.getParent("phaseUse") === _status.event.getParent("phaseUse")
+						);
+					}).length == 1) return "zeroplayertarget";
+					if (_status.event.type == "phase" && _status.event.skill == "jsrgguanhuo_viewas" && player.getHistory("useSkill", evt => {
+						return (
+							evt.skill == "jsrgguanhuo_viewas" &&
+							evt.getParent("phaseUse") === _status.event.getParent("phaseUse")
+						);
+					}).length > 1 && player.countCards("h") <= 3) return [0, 0];
 				},
 			},
 		},