From ab19f9ba9eef42d74847a2ac2c72a63340e581dc Mon Sep 17 00:00:00 2001
From: mengxinzxz <2223529500@qq.com>
Date: Tue, 14 Nov 2023 18:08:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8D=81=E5=B8=B8=E4=BE=8D?=
 =?UTF-8?q?=E7=BB=93=E5=85=9A=E6=9F=90=E5=B8=B8=E4=BE=8D=E5=90=8C=E6=97=B6?=
 =?UTF-8?q?=E6=9C=89=E5=8F=8C=E5=90=91=E5=92=8C=E5=8D=95=E5=90=91=E4=B8=8D?=
 =?UTF-8?q?=E8=AE=A4=E5=8F=AF=E6=97=B6=E5=9B=BA=E5=AE=9A=E4=B8=8D=E5=8F=AF?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=8F=8C=E5=90=91=E4=B8=8D=E8=AE=A4=E5=8F=AF?=
 =?UTF-8?q?=E5=B8=B8=E4=BE=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 character/mobile.js | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/character/mobile.js b/character/mobile.js
index e0342c1bf..e73fa757c 100644
--- a/character/mobile.js
+++ b/character/mobile.js
@@ -1607,11 +1607,18 @@ game.import('character',function(lib,game,ui,get,ai,_status){
 					var others=list.randomGets(4);
 					if(others.length==1) event._result={bool:true,links:others};
 					else{
-						var conflictList=others.filter(changshi=>{
+						var conflictList,map={
+							'scs_bilan':'scs_hankui',
+							'scs_hankui':'scs_bilan',
+							'scs_duangui':'scs_guosheng',
+							'scs_guosheng':'scs_duangui',
+						},list=others.slice();
+						if(map[first]&&others.some(changshi=>map[first]==changshi)) conflictList=[others.find(changshi=>map[first]==changshi)];
+						else conflictList=others.filter(changshi=>{
 							var map=lib.skill.mbdanggu.conflictMap(player);
 							var names=map[first];
 							return names.contains(changshi);
-						}),list=others.slice();
+						});
 						if(conflictList.length){
 							var conflict=conflictList.randomGet();
 							list.remove(conflict);