From fac30f506f5cf0c89e6076bc2861473ef8e9b6b4 Mon Sep 17 00:00:00 2001
From: BauxiteAl <3117254928@qq.com>
Date: Mon, 2 Oct 2023 21:26:28 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8customArgs=E9=87=8D=E6=96=B0=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E5=8D=97=E8=9B=AE=E3=80=81=E4=B8=87=E7=AE=AD=E8=AE=A9?=
 =?UTF-8?q?=E5=85=B6=E6=94=AF=E6=8C=81=E9=9C=80=E9=A2=9D=E5=A4=96=E6=89=93?=
 =?UTF-8?q?=E5=87=BA=E4=B8=80=E5=BC=A0=E7=89=8C=E5=93=8D=E5=BA=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 card/standard.js | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/card/standard.js b/card/standard.js
index 185a8788b..c451c7651 100644
--- a/card/standard.js
+++ b/card/standard.js
@@ -888,9 +888,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				reverseOrder:true,
 				content:function(){
 					"step 0"
-					if(!event.shaReq) event.shaReq={};
-					if(typeof event.shaReq[target.playerid]!='number') event.shaReq[target.playerid]=1;
-					event.shaRequired=event.shaReq[target.playerid];
+					if(typeof event.shaRequired!='number'||!event.shaRequired||event.shaRequired<0) event.shaRequired=1;
 					if(typeof event.baseDamage!='number') event.baseDamage=1;
 					"step 1"
 					if(event.directHit) event._result={bool:false};
@@ -971,9 +969,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){
 				},
 				content:function(){
 					"step 0"
-					if(!event.shanReq) event.shanReq={};
-					if(typeof event.shanReq[target.playerid]!='number') event.shanReq[target.playerid]=1;
-					event.shanRequired=event.shanReq[target.playerid];
+					if(typeof event.shanRequired!='number'||!event.shanRequired||event.shanRequired<0) event.shanRequired=1;
 					if(typeof event.baseDamage!='number') event.baseDamage=1;
 					"step 1"
 					if(event.directHit) event._result={bool:false};