From 6d51795c54e5861d2dd21d9280061f41e5287d7d 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: Fri, 1 May 2026 12:42:03 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=89=AB=E5=B8=9A?=
 =?UTF-8?q?=E6=AD=A6=E5=99=A8=E4=BC=A4=E5=AE=B3=E5=80=BC=E5=8F=8A=E8=83=BD?=
 =?UTF-8?q?=E9=87=8F=E5=9D=97=E8=A1=8C=E4=B8=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

调整扫帚系列武器的伤害值以平衡游戏性：
- 扫帚回旋镖基础伤害从15降至5
- 扫帚炮新增基础伤害5
- 扫帚基础伤害从20降至15

优化能量块行为逻辑：
- 新增移动速度属性
- 扩展攻击互斥组和攻击类型
- 调整攻击3类型时的速度变化逻辑
---
 components/Bullets/Broom.tscn              | 4 ++--
 components/Bullets/BroomBoomerang.tscn     | 2 +-
 components/Bullets/BroomGun.tscn           | 1 +
 scripts/Contents/Characters/EnergyBlock.gd | 8 ++++++--
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/components/Bullets/Broom.tscn b/components/Bullets/Broom.tscn
index f23560d..15e181c 100644
--- a/components/Bullets/Broom.tscn
+++ b/components/Bullets/Broom.tscn
@@ -281,7 +281,7 @@ size = Vector2(252, 39.99996)
 [node name="Broom" unique_id=5571707 instance=ExtResource("1_t7cj0")]
 script = ExtResource("2_p0bgf")
 displayName = "扫帚"
-baseDamage = 20.0
+baseDamage = 15.0
 motionType = 0
 penerate = 1.0
 
@@ -303,7 +303,7 @@ local_coords = true
 process_material = SubResource("ParticleProcessMaterial_87bq4")
 
 [node name="hitbox" parent="." index="1" unique_id=175349408 node_paths=PackedStringArray("target")]
-position = Vector2(200, 0)
+position = Vector2(200, 1.907981e-05)
 rotation = -3.1415925
 shape = SubResource("RectangleShape2D_keubc")
 disabled = true
diff --git a/components/Bullets/BroomBoomerang.tscn b/components/Bullets/BroomBoomerang.tscn
index 666a647..239a6a0 100644
--- a/components/Bullets/BroomBoomerang.tscn
+++ b/components/Bullets/BroomBoomerang.tscn
@@ -147,7 +147,7 @@ radius = 124.01613
 script = ExtResource("2_14u4g")
 displayName = "扫帚回旋镖"
 speed = 40.0
-baseDamage = 15.0
+baseDamage = 5.0
 penerate = 1.0
 lifeTime = 10000.0
 autoLoopAnimation = true
diff --git a/components/Bullets/BroomGun.tscn b/components/Bullets/BroomGun.tscn
index 1d6fd9f..c8efdc3 100644
--- a/components/Bullets/BroomGun.tscn
+++ b/components/Bullets/BroomGun.tscn
@@ -199,6 +199,7 @@ size = Vector2(1968, 44)
 [node name="BroomGun" unique_id=5571707 instance=ExtResource("1_7ykg5")]
 script = ExtResource("2_jn776")
 displayName = "扫帚炮"
+baseDamage = 5.0
 motionType = 2
 penerate = 1.0
 autoSpawnAnimation = true
diff --git a/scripts/Contents/Characters/EnergyBlock.gd b/scripts/Contents/Characters/EnergyBlock.gd
index 2d8dbb2..0b8aa3e 100644
--- a/scripts/Contents/Characters/EnergyBlock.gd
+++ b/scripts/Contents/Characters/EnergyBlock.gd
@@ -5,6 +5,7 @@ var currentBroom: BroomBullet
 
 func register():
 	fields[FieldStore.Entity.MAX_HEALTH] = 1500
+	fields[FieldStore.Entity.MOVEMENT_SPEED] = 0.7
 	attackCooldownMap[0] = 6000
 	attackCooldownMap[1] = 3000
 	attackCooldownMap[2] = 8000
@@ -12,12 +13,12 @@ func register():
 	attackCooldownMap[4] = 2000
 	attackCooldownMap[5] = 2000
 	attackCooldownMap[6] = 5000
-	attackMutexes = [0, 1]
+	attackMutexes = [0, 1, 3]
 	sprintMultiplier = 30
 func ai():
 	PresetEntityAI.distanceAttack(self , currentFocusedBoss, 0, 300, 0)
 	for i in 6:
-		tryAttack(i + 1, [3])
+		tryAttack(i + 1, [3, 4])
 	if 1 not in attackingStates:
 		PresetEntityAI.follow(self , currentFocusedBoss)
 func attack(type: int):
@@ -44,8 +45,11 @@ func attack(type: int):
 	elif type == 3:
 		for bullet in BulletBase.generate(ComponentManager.getBullet("Broom"), self , getTrackingAnchor(), 0):
 			if bullet is BroomBullet:
+				fields[FieldStore.Entity.MOVEMENT_SPEED] *= 2
 				await TickTool.frame()
 				bullet.animator.play("rotate")
+				await bullet.destroied
+				fields[FieldStore.Entity.MOVEMENT_SPEED] /= 2
 	elif type == 4:
 		BulletBase.generate(ComponentManager.getBullet("BroomBoomerang"), self , position, position.angle_to_point(currentFocusedPosition))
 	elif type == 5: