From cc90a4caab5960a2adcd098b91b96257cc7f441f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=A8=E8=90=BD=E5=9F=BA=E5=9B=B4=E8=99=BE?=
 <3161880837@qq.com>
Date: Wed, 25 Mar 2026 22:06:08 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E5=85=B3=E5=8D=A1=E5=92=8C=E5=AD=90=E5=BC=B9=E5=8F=8D=E5=BC=B9?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

将测试关卡从WAVE_TESTBOSS_KUKE改为WAVE_JUSTJOKE
修改子弹碰撞逻辑，改为反弹子弹而非摧毁，以测试平衡性
---
 scripts/Contents/Bullets/Parrier.gd | 5 ++++-
 scripts/Contents/Wave.gd            | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/Contents/Bullets/Parrier.gd b/scripts/Contents/Bullets/Parrier.gd
index 6559a45..c5af437 100644
--- a/scripts/Contents/Bullets/Parrier.gd
+++ b/scripts/Contents/Bullets/Parrier.gd
@@ -31,7 +31,10 @@ func hitBullet(bullet: BulletBase): # 当前子弹与其他子弹相撞
 			CameraManager.shake(250, 300)
 			launcher.impluse((position - bullet.position).normalized() * (bullet.speed * bullet.getDamage()) ** (1.0 / 3) * 250)
 			# 摧毁其他子弹
-			bullet.tryDestroy()
+			# bullet.tryDestroy()
+			# 试一下改成弹反的平衡性有没有问题
+			bullet.look_at(bullet.launcher.position)
+			bullet.launcher = launcher
 			var cycler = launcher.getOrCreateCycleTimer("parry", 2000, 100)
 			if len(cycler.bullets) < maxBallCount: # 玩家最多只能拥有多少气
 				for b in BulletBase.generate(
diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd
index b3b5ef9..049645e 100644
--- a/scripts/Contents/Wave.gd
+++ b/scripts/Contents/Wave.gd
@@ -50,7 +50,7 @@ static var WAVE_JUSTJOKE = [
 	Wave.create("Kernyr", 0, 0, true, 0, INF, 1),
 ]
 static var WAVE_EMPTY = []
-static var data = WAVE_NORMAL if WorldManager.isRelease() else WAVE_TESTBOSS_KUKE
+static var data = WAVE_NORMAL if WorldManager.isRelease() else WAVE_JUSTJOKE
 
 static func create(
 		entity_: String,