fallingshrimp/Dog-Lynx-And-HCN
1
1
Fork 0
mirror of https://github.com/Rundll86/Dog-Lynx-And-HCN.git synced 2026-05-28 15:01:53 +08:00
Code Releases Activity

fix(EntityBase): 修正伤害处理中healthChanged信号触发顺序

Browse Source 
refactor(Rooster): 更新武器配置，添加新武器并调整顺序
This commit is contained in:
陨落基围虾
2025-09-29 22:38:39 +08:00
parent c5d58a14f7
commit 2dca35f4fd
2 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/Characters/Rooster.tscn
+12 -4
View File
@@ -1,12 +1,14 @@
[gd_scene load_steps=16 format=3 uid="uid://bm7ymrri6pykb"]
[gd_scene load_steps=18 format=3 uid="uid://bm7ymrri6pykb"]
[ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_e5pl8"]
[ext_resource type="Script" path="res://scripts/Contents/Characters/Rooster.gd" id="2_oqdqd"]
[ext_resource type="Texture2D" uid="uid://fn8qx72clh38" path="res://resources/characters/cock/rooster-a.svg" id="2_q0j6j"]
[ext_resource type="AudioStream" uid="uid://dclinyhu256xi" path="res://resources/sounds/effect/Low Whoosh.mp3" id="3_4syso"]
[ext_resource type="PackedScene" uid="uid://frwt0fgrpskb" path="res://components/Weapons/Meowmere.tscn" id="3_480gn"]
[ext_resource type="Texture2D" uid="uid://ci2ik43ce82uy" path="res://resources/characters/cock/rooster-b.svg" id="3_b0fgx"]
[ext_resource type="PackedScene" uid="uid://c0n3igy4hucrg" path="res://components/Weapons/PurpleCrystal.tscn" id="3_cyreu"]
[ext_resource type="PackedScene" uid="uid://bt4b7ks26fcgi" path="res://components/Weapons/WhiteSoul.tscn" id="3_irwgh"]
[ext_resource type="PackedScene" uid="uid://b2qhes4apaxsj" path="res://components/Weapons/NuclearBomb.tscn" id="3_pnpoh"]
[ext_resource type="AudioStream" uid="uid://cdrevrq7n6yqa" path="res://resources/sounds/effect/Boing.mp3" id="4_66s6c"]
[ext_resource type="AudioStream" uid="uid://benyec5bqni0b" path="res://resources/sounds/effect/Chomp.wav" id="4_k0yme"]
[ext_resource type="PackedScene" uid="uid://bb1uh8k7gkhr7" path="res://components/Weapons/VectorStar.tscn" id="4_re2px"]
@@ -46,13 +48,19 @@ displayName = "公鸡"
[node name="weaponStore" parent="." index="0"]
process_mode = 4
[node name="WhiteSoul" parent="weaponStore" index="0" instance=ExtResource("3_irwgh")]
[node name="Meowmere" parent="weaponStore" index="0" instance=ExtResource("3_480gn")]
offset_bottom = 374.0
[node name="PurpleCrystal" parent="weaponStore" index="1" instance=ExtResource("3_cyreu")]
[node name="NuclearBomb" parent="weaponStore" index="1" instance=ExtResource("3_pnpoh")]
offset_bottom = 352.0
[node name="WhiteSoul" parent="weaponStore" index="2" instance=ExtResource("3_irwgh")]
offset_bottom = 374.0
[node name="PurpleCrystal" parent="weaponStore" index="3" instance=ExtResource("3_cyreu")]
debugRebuild = false
[node name="VectorStar" parent="weaponStore" index="2" instance=ExtResource("4_re2px")]
[node name="VectorStar" parent="weaponStore" index="4" instance=ExtResource("4_re2px")]
debugRebuild = false
[node name="sprint" parent="sounds" index="0"]
scripts/Statemachine/EntityBase.gd
+1 -1
View File
@@ -229,8 +229,8 @@ func takeDamage(bullet: BulletBase, crit: bool):
storeEnergy(damage * -0.5)
position += Vector2.from_angle(bullet.position.angle_to_point(position)) * bullet.knockback
hit.emit(damage, bullet, crit)
healthChanged.emit(health)
health -= damage
healthChanged.emit(health)
DamageLabel.create(damage, crit || perfectMiss, damageAnchor.global_position + MathTool.randv2_range(GameRule.damageLabelSpawnOffset))
if isBoss and bullet.launcher.isPlayer():
bullet.launcher.setBoss(self)