1
1
mirror of https://github.com/Rundll86/Dog-Lynx-And-HCN.git synced 2026-06-13 15:17:13 +08:00

feat(子弹): 为魔法飞弹添加命中动画和音效

refactor(角色): 将MTY角色从猫头鹰改为狗熊宝宝并调整攻击逻辑

fix(子弹): 修复ParryBall和Parrier子弹的实例有效性检查

style(场景): 清理场景文件中的冗余属性

feat(工具): 为findClosetBulletCanDamage添加最大距离参数

chore(配置): 更新测试用的波次配置
This commit is contained in:
2026-04-24 18:09:24 +08:00
parent f27d75befd
commit 3a8c48dae7
12 changed files with 161 additions and 60 deletions
+64 -4
View File
@@ -3,9 +3,61 @@
[ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_4sjx4"]
[ext_resource type="Script" uid="uid://b1y8r5xrhhso" path="res://scripts/Contents/Bullets/MagicMissle.gd" id="2_lrw10"]
[ext_resource type="Texture2D" uid="uid://bl1i26ovfpxwc" path="res://resources/bullets/magic-missle/tr.webp" id="2_ross6"]
[ext_resource type="AudioStream" uid="uid://cn876dtp1ypqx" path="res://resources/sounds/effect/Collect.wav" id="3_3jny5"]
[ext_resource type="Texture2D" uid="uid://bkiaaucejquik" path="res://resources/bullets/light-express/Everlasting_Rainbow.png" id="3_lrw10"]
[sub_resource type="CapsuleShape2D" id="CapsuleShape2D_rugh7"]
height = 76.0
[sub_resource type="Animation" id="Animation_3jny5"]
resource_name = "destroy"
length = 0.5
step = 0.1
[sub_resource type="Animation" id="Animation_grb5l"]
tracks/0/type = "audio"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("audio")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"clips": [{
"end_offset": 0.0,
"start_offset": 0.0,
"stream": ExtResource("3_3jny5")
}],
"times": PackedFloat32Array(0)
}
tracks/0/use_blend = true
[sub_resource type="Animation" id="Animation_jigkj"]
resource_name = "loop"
loop_mode = 1
step = 0.1
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath(".:rotation")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 1),
"transitions": PackedFloat32Array(1, 1),
"update": 0,
"values": [0.0, 6.28319]
}
[sub_resource type="Animation" id="Animation_mgg76"]
resource_name = "spawn"
[sub_resource type="AnimationLibrary" id="AnimationLibrary_s86wr"]
_data = {
&"destroy": SubResource("Animation_3jny5"),
&"hit": SubResource("Animation_grb5l"),
&"loop": SubResource("Animation_jigkj"),
&"spawn": SubResource("Animation_mgg76")
}
[sub_resource type="CircleShape2D" id="CircleShape2D_lrw10"]
radius = 18.027756
[sub_resource type="Curve" id="Curve_lrw10"]
_data = [Vector2(0, 0), 0.0, 0.0, 0, 0, Vector2(0.2, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0]
@@ -48,12 +100,20 @@ script = ExtResource("2_lrw10")
penerate = 1.0
penerateDamageReduction = 0.1
[node name="animator" parent="texture" parent_id_path=PackedInt32Array(162977358) index="0" unique_id=1114087117]
libraries/ = SubResource("AnimationLibrary_s86wr")
[node name="audio" parent="texture" parent_id_path=PackedInt32Array(162977358) index="1" unique_id=1167114186]
stream = ExtResource("3_3jny5")
[node name="static" type="Sprite2D" parent="texture" parent_id_path=PackedInt32Array(162977358) index="2" unique_id=1008850333]
texture = ExtResource("2_ross6")
position = Vector2(-58.999996, 0)
scale = Vector2(0.79195106, 0.79195106)
texture = ExtResource("3_lrw10")
[node name="hitbox" parent="." index="1" unique_id=175349408]
rotation = 1.5707964
shape = SubResource("CapsuleShape2D_rugh7")
shape = SubResource("CircleShape2D_lrw10")
[node name="trail" type="GPUParticles2D" parent="." index="2" unique_id=1403224943]
z_index = -1
+8 -8
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=7 format=3 uid="uid://brt2q316hrswe"]
[gd_scene format=3 uid="uid://brt2q316hrswe"]
[ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_57y3f"]
[ext_resource type="Script" uid="uid://bi7nde2rs0w4m" path="res://scripts/Contents/Bullets/Parrier.gd" id="2_li4th"]
@@ -43,23 +43,23 @@ _data = {
radius = 60.0
height = 300.0
[node name="Parrier" instance=ExtResource("1_57y3f")]
[node name="Parrier" unique_id=2089111975 instance=ExtResource("1_57y3f")]
script = ExtResource("2_li4th")
parryRate = 0.0
displayName = "爪击"
baseDamage = 5.0
penerate = 1.0
autoSpawnAnimation = true
freeAfterSpawn = true
[node name="texture" parent="." index="0"]
[node name="texture" parent="." index="0" unique_id=162977358]
modulate = Color(1, 1, 1, 0)
scale = Vector2(0.8, 0.8)
[node name="animator" parent="texture" index="0"]
libraries = {
&"": SubResource("AnimationLibrary_k4ctn")
}
[node name="animator" parent="texture" index="0" unique_id=1114087117]
libraries/ = SubResource("AnimationLibrary_k4ctn")
[node name="hitbox" parent="." index="1"]
[node name="hitbox" parent="." index="1" unique_id=175349408]
position = Vector2(150, 0)
rotation = 1.5707964
shape = SubResource("CapsuleShape2D_li4th")
+7 -8
View File
@@ -1,4 +1,4 @@
[gd_scene load_steps=9 format=3 uid="uid://bhp1ru3rjwkbf"]
[gd_scene format=3 uid="uid://bhp1ru3rjwkbf"]
[ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_1ke2b"]
[ext_resource type="Texture2D" uid="uid://ctmxadaowx5ps" path="res://resources/weapons/Volcano.webp" id="2_q2yg1"]
@@ -119,8 +119,9 @@ _data = {
[sub_resource type="RectangleShape2D" id="RectangleShape2D_q2yg1"]
size = Vector2(146, 26)
[node name="QKSword" instance=ExtResource("1_1ke2b")]
[node name="QKSword" unique_id=1066937094 instance=ExtResource("1_1ke2b")]
script = ExtResource("2_x26jp")
displayName = "乾坤剑"
speed = 20.0
baseDamage = 25.0
penerate = 1.0
@@ -128,15 +129,13 @@ penerateDamageReduction = 0.2
lifeTime = 3000.0
autoSpawnAnimation = true
[node name="texture" parent="." index="0"]
[node name="texture" parent="." index="0" unique_id=162977358]
modulate = Color(1, 1, 1, 0)
scale = Vector2(1e-05, 1e-05)
sprite_frames = SubResource("SpriteFrames_x26jp")
[node name="animator" parent="texture" index="0"]
libraries = {
&"": SubResource("AnimationLibrary_evtlt")
}
[node name="animator" parent="texture" index="0" unique_id=1114087117]
libraries/ = SubResource("AnimationLibrary_evtlt")
[node name="hitbox" parent="." index="1"]
[node name="hitbox" parent="." index="1" unique_id=175349408]
shape = SubResource("RectangleShape2D_q2yg1")