From c57bf686db1ae85b819e3584ba641ed18e1b009f Mon Sep 17 00:00:00 2001
From: 157 <3619242020@qq.com>
Date: Sun, 5 May 2024 19:15:52 +0800
Subject: [PATCH] =?UTF-8?q?unique=E6=A0=87=E7=AD=BE=E8=A1=A5=E5=85=85?=
 =?UTF-8?q?=EF=BC=8Cbugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/diy/skill.js      |  1 +
 character/huicui/skill.js   |  4 +++-
 character/key/skill.js      |  2 ++
 character/xianding/skill.js |  1 +
 character/yingbian/skill.js |  1 +
 mode/guozhan.js             | 12 ++++++++++++
 6 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/character/diy/skill.js b/character/diy/skill.js
index 6b9444260..ecaef5e48 100644
--- a/character/diy/skill.js
+++ b/character/diy/skill.js
@@ -807,6 +807,7 @@ const skills = {
 	},
 	noname_duocai2: { charlotte: true },
 	nsbizhao: {
+		unique: true,
 		trigger: { player: "showCharacterAfter" },
 		forced: true,
 		hiddenSkill: true,
diff --git a/character/huicui/skill.js b/character/huicui/skill.js
index 17f557256..4f930552e 100644
--- a/character/huicui/skill.js
+++ b/character/huicui/skill.js
@@ -12193,7 +12193,9 @@ const skills = {
 		filter: function (event, player, name) {
 			if (player.hasSkill("zhiwei2")) return false;
 			if (!game.hasPlayer(current => current != player)) return false;
-			if (get.mode() == "guozhan") return event.name == "showCharacter" && (event.toShow.includes("gz_luyusheng") || event.toShow.includes("luyusheng"));
+			if (get.mode() == "guozhan") return event.name == "showCharacter" && event.toShow(name => {
+				return get.character(name, 3).includes("zhiwei");
+			});
 			return event.name != "showCharacter" && (name != "phaseBefore" || game.phaseNumber == 0);
 		},
 		content: function () {
diff --git a/character/key/skill.js b/character/key/skill.js
index 261916ac6..3ade3f88f 100644
--- a/character/key/skill.js
+++ b/character/key/skill.js
@@ -4754,6 +4754,7 @@ const skills = {
 		},
 	},
 	yukito_yaxiang: {
+		unique: true,
 		forceunique: true,
 		enable: "chooseToUse",
 		limited: true,
@@ -10573,6 +10574,7 @@ const skills = {
 		},
 	},
 	umi_qihuan: {
+		unique: true,
 		forceunique: true,
 		enable: "chooseToUse",
 		filter(summer, umi) {
diff --git a/character/xianding/skill.js b/character/xianding/skill.js
index c61739582..bdabe422f 100644
--- a/character/xianding/skill.js
+++ b/character/xianding/skill.js
@@ -5075,6 +5075,7 @@ const skills = {
 		},
 	},
 	dcxunbie: {
+		unique: true,
 		audio: 2,
 		trigger: {
 			player: "dying",
diff --git a/character/yingbian/skill.js b/character/yingbian/skill.js
index 9767101e3..c52038894 100644
--- a/character/yingbian/skill.js
+++ b/character/yingbian/skill.js
@@ -946,6 +946,7 @@ const skills = {
 		},
 	},
 	gaoling: {
+		unique: true,
 		audio: 2,
 		trigger: { player: "showCharacterAfter" },
 		hiddenSkill: true,
diff --git a/mode/guozhan.js b/mode/guozhan.js
index df286370a..0066eca2e 100644
--- a/mode/guozhan.js
+++ b/mode/guozhan.js
@@ -2674,8 +2674,15 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			fakezhiwei: {
+				unique: true,
 				audio: "zhiwei",
 				inherit: "zhiwei",
+				filter: function (event, player, name) {
+					if (!game.hasPlayer(current => current != player)) return false;
+					return event.name == "showCharacter" && event.toShow(name => {
+						return get.character(name, 3).includes("fakezhiwei");
+					});
+				},
 				content() {
 					"step 0";
 					player
@@ -4914,6 +4921,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			fakebaoqie: {
+				unique: true,
 				audio: "baoqie",
 				trigger: { player: "showCharacterEnd" },
 				filter(event, player) {
@@ -5087,6 +5095,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			fakehuirong: {
+				unique: true,
 				audio: "huirong",
 				trigger: { player: "showCharacterEnd" },
 				filter(event, player) {
@@ -5258,6 +5267,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			fakeshiren: {
+				unique: true,
 				audio: "shiren",
 				trigger: { player: "showCharacterEnd" },
 				filter(event, player) {
@@ -7524,6 +7534,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 			},
 			//黄权
 			gzdianhu: {
+				unique: true,
 				audio: "xinfu_dianhu",
 				trigger: { player: "showCharacterAfter" },
 				forced: true,
@@ -20613,6 +20624,7 @@ game.import("mode", function (lib, game, ui, get, ai, _status) {
 				},
 			},
 			gzguixiu: {
+				unique: true,
 				audio: "guixiu",
 				trigger: { player: ["showCharacterAfter", "removeCharacterBefore"] },
 				filter: function (event, player) {