Merge branch 'dev' of https://github.com/SkyUOI/Zenith into dev

Author: limuy2022

scripts/bullets/enchanted_beam.gd

@@ -16,15 +16,27 @@ func start():
 	$Start.start()
 
 
+# 是否攻击过player
+var is_bound = false
+
+
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta):
-	position += delta * speed * direction * (1.0 if $Start.time_left == 0 else (1.0 / 6.0))
+	# 没用过正常移动
+	if !is_bound:
+		position += delta * speed * direction * (1.0 if $Start.time_left == 0 else (1.0 / 6.0))
+	else:
+		position -= delta * speed * direction
 
 
 func _on_out_screen_screen_exited():
 	queue_free()
 
 
 func _on_area_entered(area):
+	# 防止重复伤害
 	if area.name == "Player":
 		area.get_node("..").hit(10)
+		$CollisionShape2D.set_deferred("disabled", true)
+	#elif area.name == 盾
+	#is_bound = true

scripts/weapons/enchanted_sword.gd

@@ -62,6 +62,7 @@ func exit():
 func nextOper():
 	oper_num += 1
 	if oper_num >= opers.size():
+		attack_finished.emit()
 		return
 	opers[oper_num].call()