From 4b69a510c7f2a144668ac5bc121a20fe8361d72b Mon Sep 17 00:00:00 2001
From: CatIgnore <137709037+CatIgnore@users.noreply.github.com>
Date: Mon, 23 Oct 2023 23:38:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E6=8A=A4=E7=94=B2=E6=9C=BA?=
 =?UTF-8?q?=E5=88=B6=EF=BC=8C=E4=BF=AE=E5=A4=8D=E6=8A=A4=E7=94=B2=E5=A4=B1?=
 =?UTF-8?q?=E6=95=88=E6=97=B6damagepop=E4=B8=8D=E6=AD=A3=E7=A1=AE=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 game/game.js | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/game/game.js b/game/game.js
index 5d9f22d6a..599e317d9 100644
--- a/game/game.js
+++ b/game/game.js
@@ -19504,7 +19504,8 @@
 						event.hujia=Math.min(-num,player.hujia);
 						event.getParent().hujia=event.hujia;
 						event.num+=event.hujia;
-						// game.log(player,'的护甲抵挡了'+get.cnNumber(event.hujia)+'点伤害');
+						//log moved to changeHujia
+						//game.log(player,'的护甲抵挡了'+get.cnNumber(event.hujia)+'点伤害');
 						player.changeHujia(-event.hujia).type='damage';
 					}
 					//old part
@@ -19537,7 +19538,7 @@
 							num=-player.hujia;
 							event.num=num;
 						}
-						switch(event.type){
+						switch(event.type){ //log moved here
 							case 'damage':
 								game.log(player,'的护甲抵挡了'+get.cnNumber(-num)+'点伤害');
 								break;
@@ -19547,9 +19548,9 @@
 						}
 					}
 					player.hujia+=num;
-					// if(player.hujia<0){
-					// 	player.hujia=0;
-					// }
+					/*if(player.hujia<0){
+						player.hujia=0;
+					}*/
 					player.update();
 				},
 				dying:function(){