From 96e5a464a9b13e7f50f4080c07284b64c3cb57aa Mon Sep 17 00:00:00 2001
From: CatIgnore <137709037+CatIgnore@users.noreply.github.com>
Date: Sun, 22 Oct 2023 13:17:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8A=A4=E7=94=B2=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E6=97=B6damagepop=E9=94=99=E8=AF=AF=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复damage函数animate部分中，定义numx时未判断角色护甲是否失效，导致之后的$damagepop即使在角色护甲失效时也计算角色护甲的bug
---
 game/game.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/game/game.js b/game/game.js
index d4e128e00..a3b84da1e 100644
--- a/game/game.js
+++ b/game/game.js
@@ -19366,7 +19366,7 @@
 								}
 							}
 						},natures,player);
-						var numx=Math.max(0,num-player.hujia);
+						var numx=player.hasSkillTag('nohujia')?num:Math.max(0,num-player.hujia);
 						player.$damagepop(-numx,natures[0]);
 					}
 					if(event.unreal) event.goto(6)