From 236402ad647e4beeb7aed6d8697c2f2f9dc5082f Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Wed, 1 May 2024 15:29:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E5=B0=86=E6=88=90=E5=90=8D2024?=
 =?UTF-8?q?=E4=B8=80=E7=B3=BB=E5=88=97bugfix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/yijiang.js | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/character/yijiang.js b/character/yijiang.js
index 10ba74b91..fcfdcedf8 100755
--- a/character/yijiang.js
+++ b/character/yijiang.js
@@ -115,7 +115,7 @@ game.import("character", function () {
 
 			linghuyu: ["male", "wei", 4, ["xvzhi"]],
 			yj_simafu: ["male", "wei", 3, ["beiyu", "duchi"]],
-			yj_xuangongzhu: ["female", "wei", 3, ["qimei", "zhuiji"]],
+			yj_xuangongzhu: ["female", "wei", 3, ["yjqimei", "yjzhuiji"]],
 			xukun: ["male", "wu", 4, ["fazhu"]],
 		},
 		characterIntro: {
@@ -242,7 +242,10 @@ game.import("character", function () {
 					const stat = player.getStat("xvzhi");
 					return target.countCards("h") && (!stat || !stat.includes(target));
 				},
+				selectTarget:2,
 				usable: 1,
+				multiline: true,
+				multitarget: true,
 				async content(event, trigger, player) {
 					const targets = event.targets;
 					if (targets.some(i => !i.countCards("h"))) return;
@@ -250,27 +253,24 @@ game.import("character", function () {
 						.chooseCardOL(targets, "h", true, [1, Infinity], "蓄志：选择任意张手牌并与对方交换")
 						.set("ai", card => {
 							const player = get.event("player"),
-								target = get
-									.event()
-									.getParent(2)
-									.targets.find(i => i != player);
+								target = get.event().getParent(2).targets.find(i => i != player);
 							const sha = new lib.element.VCard({ name: "sha" });
 							const playerEffect = player.hasUseTarget(sha, false)
 								? Math.max(
 										...game.filterPlayer(current =>
-											player.canUse(sha, current, false).map(current => {
-												return get.effect(current, sha, player, player);
-											})
-										)
+											player.canUse(sha, current, false)
+										).map(current => {
+											return get.effect(current, sha, player, player);
+										})
 								  )
 								: 0;
 							const targetEffect = target.hasUseTarget(sha, false)
 								? Math.max(
 										...game.filterPlayer(current =>
-											target.canUse(sha, current, false).map(current => {
-												return get.effect(current, sha, target, target);
-											})
-										)
+											target.canUse(sha, current, false)
+										).map(current => {
+											return get.effect(current, sha, player, player);
+										})
 								  )
 								: 0;
 							return 5 + 3 * get.sgn(playerEffect - targetEffect) - get.value(card);
@@ -374,12 +374,12 @@ game.import("character", function () {
 						await player.showHandcards(get.translation(player) + "发动了【督持】");
 						const colors = player.getCards("h").reduce((list, card) => list.add(get.color(card)), []);
 						if (colors.length == 1) {
-							player.chat("洗具");
+							player.popup("洗具");
 							trigger.getParent().excluded.add(player);
 							return;
 						}
 					}
-					player.chat("杯具");
+					player.popup("杯具");
 				},
 				ai: { threaten: 0.8 },
 			},
@@ -389,7 +389,7 @@ game.import("character", function () {
 				enable: "phaseUse",
 				filter(event, player) {
 					const count = player.getStat("skill").yjqimei;
-					if (count && count > 0 && !player.hasSkill("yjqimei")) return false;
+					if (count && count > 0 && !player.hasSkill("yjqimei_rewrite")) return false;
 					return true;
 				},
 				filterTarget: lib.filter.notMe,