From 85c4eac2aa7b480959895b28fa2eced207ad7012 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: Sat, 22 Nov 2025 09:17:59 +0800 Subject: [PATCH] =?UTF-8?q?refactor(=E5=AD=90=E5=BC=B9):=20=E7=BB=9F?= =?UTF-8?q?=E4=B8=80=E4=BD=BF=E7=94=A8baseDamage=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E4=BC=A4=E5=AE=B3=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 修复多个子弹场景中的damage字段为baseDamage 调整部分子弹的伤害值和属性 删除不再使用的Pencil子弹场景 更新动画库引用格式为&前缀 优化部分子弹的碰撞体积和材质 --- components/Bullets/ArrowSeven.tscn | 27 ++-- components/Bullets/Diamond.tscn | 9 +- components/Bullets/DogCircle.tscn | 2 +- components/Bullets/ForeverRainbow.tscn | 21 ++-- components/Bullets/LightGun.tscn | 21 ++-- components/Bullets/Meowmere.tscn | 12 +- components/Bullets/Pencil.tscn | 139 --------------------- components/Bullets/PurpleCrystalSmall.tscn | 4 +- components/Bullets/Star.tscn | 11 +- components/Bullets/SunDance.tscn | 14 ++- 10 files changed, 64 insertions(+), 196 deletions(-) delete mode 100644 components/Bullets/Pencil.tscn diff --git a/components/Bullets/ArrowSeven.tscn b/components/Bullets/ArrowSeven.tscn index b6d517a..6909d52 100644 --- a/components/Bullets/ArrowSeven.tscn +++ b/components/Bullets/ArrowSeven.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=24 format=3 uid="uid://bjskq2m1rrlks"] [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_dvf35"] -[ext_resource type="Script" path="res://scripts/Contents/Bullets/BossAttack/Bear/ArrowSeven.gd" id="2_uqsop"] -[ext_resource type="Shader" path="res://shaders/Light.gdshader" id="3_j0g0m"] +[ext_resource type="Script" uid="uid://dqeyybijpnr7d" path="res://scripts/Contents/Bullets/BossAttack/Bear/ArrowSeven.gd" id="2_uqsop"] +[ext_resource type="Shader" uid="uid://le5wwd7wfwnj" path="res://shaders/Light.gdshader" id="3_j0g0m"] [ext_resource type="Texture2D" uid="uid://chq2rnqi00nbj" path="res://resources/bullets/light-express/Prismatic_Bolt.webp" id="3_tmrnu"] -[ext_resource type="Shader" path="res://shaders/SuperLight.gdshader" id="5_lyybq"] -[ext_resource type="Script" path="res://scripts/Statemachine/ShaderStage.gd" id="5_ppdpf"] +[ext_resource type="Shader" uid="uid://cduo4glknpowr" path="res://shaders/SuperLight.gdshader" id="5_lyybq"] +[ext_resource type="Script" uid="uid://cgb01lelfg73p" path="res://scripts/Statemachine/ShaderStage.gd" id="5_ppdpf"] [sub_resource type="Gradient" id="Gradient_wd04q"] offsets = PackedFloat32Array(0, 0.16, 0.32, 0.48, 0.64, 0.8, 1) @@ -73,19 +73,19 @@ resource_name = "spawn" [sub_resource type="AnimationLibrary" id="AnimationLibrary_f7cx6"] _data = { -"RESET": SubResource("Animation_usqjd"), -"destroy": SubResource("Animation_oinqg"), -"loop": SubResource("Animation_ynxlt"), -"spawn": SubResource("Animation_kmogx") +&"RESET": SubResource("Animation_usqjd"), +&"destroy": SubResource("Animation_oinqg"), +&"loop": SubResource("Animation_ynxlt"), +&"spawn": SubResource("Animation_kmogx") } -[sub_resource type="ShaderMaterial" id="ShaderMaterial_k643k"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_68scy"] shader = ExtResource("5_lyybq") shader_parameter/k = -0.223 shader_parameter/color = Color(1, 1, 1, 1) shader_parameter/scale = 10.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_0bv2k"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_1wdb2"] shader = ExtResource("3_j0g0m") shader_parameter/color = Color(1, 1, 1, 1) shader_parameter/mixProgress = 0.5 @@ -125,6 +125,7 @@ z_index = 1 script = ExtResource("2_uqsop") allColor = SubResource("GradientTexture1D_e0qv5") displayName = "七彩矢" +baseDamage = 1.0 autoLoopAnimation = true [node name="texture" parent="." index="0"] @@ -134,19 +135,19 @@ sprite_frames = SubResource("SpriteFrames_q4xus") [node name="animator" parent="texture" index="0"] libraries = { -"": SubResource("AnimationLibrary_f7cx6") +&"": SubResource("AnimationLibrary_f7cx6") } [node name="superlight" type="Node2D" parent="texture" index="1"] unique_name_in_owner = true z_index = -1 -material = SubResource("ShaderMaterial_k643k") +material = SubResource("ShaderMaterial_68scy") script = ExtResource("5_ppdpf") size = Vector2(100, 200) [node name="frontlight" type="Node2D" parent="texture" index="2"] unique_name_in_owner = true -material = SubResource("ShaderMaterial_0bv2k") +material = SubResource("ShaderMaterial_1wdb2") scale = Vector2(0.968786, 0.968786) script = ExtResource("5_ppdpf") size = Vector2(40, 40) diff --git a/components/Bullets/Diamond.tscn b/components/Bullets/Diamond.tscn index 258041b..bf46d6b 100644 --- a/components/Bullets/Diamond.tscn +++ b/components/Bullets/Diamond.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_8udva"] [ext_resource type="Texture2D" uid="uid://dfptmc7clhtx7" path="res://resources/bullets/diamond/frames/0.svg" id="2_txmup"] -[ext_resource type="Script" path="res://scripts/Contents/Bullets/Diamond.gd" id="2_yxtyj"] +[ext_resource type="Script" uid="uid://d3bvwks7ty3af" path="res://scripts/Contents/Bullets/Diamond.gd" id="2_yxtyj"] [sub_resource type="SpriteFrames" id="SpriteFrames_oj6iy"] animations = [{ @@ -67,7 +67,7 @@ point_count = 2 curve = SubResource("Curve_msxpa") [sub_resource type="Curve" id="Curve_evx5y"] -max_value = 2.0 +_limits = [0.0, 2.0, 0.0, 1.0] _data = [Vector2(0, 1.0014), 0.0, 0.0, 0, 0, Vector2(1, 2), 0.0, 0.0, 0, 0] point_count = 2 @@ -92,6 +92,7 @@ alpha_curve = SubResource("CurveTexture_diybr") [node name="Diamond" instance=ExtResource("1_8udva")] script = ExtResource("2_yxtyj") displayName = "冰钻石" +baseDamage = 3.0 lifeTime = 5000.0 indisDamage = true @@ -100,13 +101,13 @@ sprite_frames = SubResource("SpriteFrames_oj6iy") [node name="particles" type="GPUParticles2D" parent="texture" index="1"] amount = 50 -process_material = SubResource("ParticleProcessMaterial_q4mpr") lifetime = 0.5 +process_material = SubResource("ParticleProcessMaterial_q4mpr") [node name="particles2" type="GPUParticles2D" parent="texture" index="2"] amount = 4 -process_material = SubResource("ParticleProcessMaterial_fcn04") texture = ExtResource("2_txmup") +process_material = SubResource("ParticleProcessMaterial_fcn04") [node name="hitbox" parent="." index="1"] visible = false diff --git a/components/Bullets/DogCircle.tscn b/components/Bullets/DogCircle.tscn index 39d4122..1e19c28 100644 --- a/components/Bullets/DogCircle.tscn +++ b/components/Bullets/DogCircle.tscn @@ -103,7 +103,7 @@ height = 138.0 [node name="DogCircle" instance=ExtResource("1_yfqj6")] script = ExtResource("2_qyd4u") displayName = "吼叫声波" -damage = 2.0 +baseDamage = 2.0 autoSpawnAnimation = true freeAfterSpawn = true diff --git a/components/Bullets/ForeverRainbow.tscn b/components/Bullets/ForeverRainbow.tscn index 38c86af..867ea8d 100644 --- a/components/Bullets/ForeverRainbow.tscn +++ b/components/Bullets/ForeverRainbow.tscn @@ -2,9 +2,9 @@ [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_sltl7"] [ext_resource type="Texture2D" uid="uid://bkiaaucejquik" path="res://resources/bullets/light-express/Everlasting_Rainbow.png" id="2_3w4yo"] -[ext_resource type="Script" path="res://scripts/Contents/Bullets/BossAttack/Bear/ForeverRainbow.gd" id="2_wwmq8"] -[ext_resource type="Shader" path="res://shaders/Light.gdshader" id="4_tms7p"] -[ext_resource type="Script" path="res://scripts/Statemachine/ShaderStage.gd" id="5_ulipy"] +[ext_resource type="Script" uid="uid://crbn487ovawao" path="res://scripts/Contents/Bullets/BossAttack/Bear/ForeverRainbow.gd" id="2_wwmq8"] +[ext_resource type="Shader" uid="uid://le5wwd7wfwnj" path="res://shaders/Light.gdshader" id="4_tms7p"] +[ext_resource type="Script" uid="uid://cgb01lelfg73p" path="res://scripts/Statemachine/ShaderStage.gd" id="5_ulipy"] [sub_resource type="Gradient" id="Gradient_wd04q"] offsets = PackedFloat32Array(0, 0.16, 0.32, 0.48, 0.64, 0.8, 1) @@ -78,13 +78,13 @@ tracks/0/keys = { [sub_resource type="AnimationLibrary" id="AnimationLibrary_edsep"] _data = { -"RESET": SubResource("Animation_vt8tg"), -"destroy": SubResource("Animation_oinqg"), -"loop": SubResource("Animation_ynxlt"), -"spawn": SubResource("Animation_kmogx") +&"RESET": SubResource("Animation_vt8tg"), +&"destroy": SubResource("Animation_oinqg"), +&"loop": SubResource("Animation_ynxlt"), +&"spawn": SubResource("Animation_kmogx") } -[sub_resource type="ShaderMaterial" id="ShaderMaterial_rigqa"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_nukpm"] shader = ExtResource("4_tms7p") shader_parameter/color = Color(1, 1, 1, 1) shader_parameter/mixProgress = 1.0 @@ -97,6 +97,7 @@ height = 224.0 script = ExtResource("2_wwmq8") allColor = SubResource("GradientTexture1D_gcnu1") displayName = "永恒彩虹" +speed = 2.0 lifeTime = 11000.0 indisDamage = true autoSpawnAnimation = true @@ -108,11 +109,11 @@ sprite_frames = SubResource("SpriteFrames_vtg2m") [node name="animator" parent="texture" index="0"] libraries = { -"": SubResource("AnimationLibrary_edsep") +&"": SubResource("AnimationLibrary_edsep") } [node name="light" type="Node2D" parent="texture" index="1"] -material = SubResource("ShaderMaterial_rigqa") +material = SubResource("ShaderMaterial_nukpm") position = Vector2(75, 0) script = ExtResource("5_ulipy") size = Vector2(50, 50) diff --git a/components/Bullets/LightGun.tscn b/components/Bullets/LightGun.tscn index 948e449..b7b36cd 100644 --- a/components/Bullets/LightGun.tscn +++ b/components/Bullets/LightGun.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=20 format=3 uid="uid://chlefxyj2ood"] [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_kwotu"] -[ext_resource type="Script" path="res://scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd" id="2_jid6s"] -[ext_resource type="Script" path="res://scripts/Statemachine/ShaderStage.gd" id="3_or7kk"] -[ext_resource type="Shader" path="res://shaders/BigLaser.gdshader" id="3_y3jot"] +[ext_resource type="Script" uid="uid://c3kvunlhwbwlu" path="res://scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd" id="2_jid6s"] +[ext_resource type="Script" uid="uid://cgb01lelfg73p" path="res://scripts/Statemachine/ShaderStage.gd" id="3_or7kk"] +[ext_resource type="Shader" uid="uid://d3aopn2f23pmi" path="res://shaders/BigLaser.gdshader" id="3_y3jot"] [ext_resource type="Texture2D" uid="uid://cf065c7jjufq" path="res://resources/bullets/light-express/Ethereal_Lance.webp" id="5_bepne"] [sub_resource type="Gradient" id="Gradient_ep4dl"] @@ -157,13 +157,13 @@ tracks/4/keys = { [sub_resource type="AnimationLibrary" id="AnimationLibrary_d5b1d"] _data = { -"RESET": SubResource("Animation_ufqp1"), -"destroy": SubResource("Animation_oinqg"), -"loop": SubResource("Animation_ynxlt"), -"spawn": SubResource("Animation_kmogx") +&"RESET": SubResource("Animation_ufqp1"), +&"destroy": SubResource("Animation_oinqg"), +&"loop": SubResource("Animation_ynxlt"), +&"spawn": SubResource("Animation_kmogx") } -[sub_resource type="ShaderMaterial" id="ShaderMaterial_sjtia"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_qwuli"] shader = ExtResource("3_y3jot") shader_parameter/laser_color = Color(1, 1, 1, 0) shader_parameter/width = 1.0 @@ -210,17 +210,18 @@ script = ExtResource("2_jid6s") allColor = SubResource("GradientTexture1D_aqmnp") length = 1000.0 displayName = "空灵长枪" +baseDamage = 2.0 autoSpawnAnimation = true freeAfterSpawn = true [node name="animator" parent="texture" index="0"] libraries = { -"": SubResource("AnimationLibrary_d5b1d") +&"": SubResource("AnimationLibrary_d5b1d") } [node name="track" type="Node2D" parent="texture" index="1"] unique_name_in_owner = true -material = SubResource("ShaderMaterial_sjtia") +material = SubResource("ShaderMaterial_qwuli") rotation = 1.5708 script = ExtResource("3_or7kk") size = Vector2(10, 2000) diff --git a/components/Bullets/Meowmere.tscn b/components/Bullets/Meowmere.tscn index e8fb28a..e087da9 100644 --- a/components/Bullets/Meowmere.tscn +++ b/components/Bullets/Meowmere.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_newpt"] [ext_resource type="Texture2D" uid="uid://cwr2pud7h8o3e" path="res://resources/bullets/meowmere/Meowmere.webp" id="2_ahi5w"] -[ext_resource type="Script" path="res://scripts/Contents/Bullets/Meowmere.gd" id="2_eoimw"] +[ext_resource type="Script" uid="uid://dhv4nd02hoolr" path="res://scripts/Contents/Bullets/Meowmere.gd" id="2_eoimw"] [sub_resource type="SpriteFrames" id="SpriteFrames_432r6"] @@ -39,12 +39,12 @@ tracks/0/keys = { [sub_resource type="AnimationLibrary" id="AnimationLibrary_47iyl"] _data = { -"RESET": SubResource("Animation_q4hki"), -"spawn": SubResource("Animation_jdotg") +&"RESET": SubResource("Animation_q4hki"), +&"spawn": SubResource("Animation_jdotg") } [sub_resource type="RectangleShape2D" id="RectangleShape2D_ja03c"] -size = Vector2(56, 250) +size = Vector2(150, 250) [node name="Meowmere" instance=ExtResource("1_newpt")] script = ExtResource("2_eoimw") @@ -58,7 +58,7 @@ sprite_frames = SubResource("SpriteFrames_432r6") [node name="animator" parent="texture" index="0"] libraries = { -"": SubResource("AnimationLibrary_47iyl") +&"": SubResource("AnimationLibrary_47iyl") } [node name="sword" type="Node2D" parent="texture" index="1"] @@ -69,5 +69,5 @@ position = Vector2(25, -29) texture = ExtResource("2_ahi5w") [node name="hitbox" parent="." index="1"] -position = Vector2(140, 0) +position = Vector2(169.5, 0) shape = SubResource("RectangleShape2D_ja03c") diff --git a/components/Bullets/Pencil.tscn b/components/Bullets/Pencil.tscn deleted file mode 100644 index 4a4d614..0000000 --- a/components/Bullets/Pencil.tscn +++ /dev/null @@ -1,139 +0,0 @@ -[gd_scene load_steps=9 format=3 uid="uid://dlu1qd00t6gpa"] - -[ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_anksp"] -[ext_resource type="Script" path="res://scripts/Contents/Bullets/Pencil.gd" id="2_4w6n2"] -[ext_resource type="Texture2D" uid="uid://dnpqfqfg6dwt4" path="res://resources/bullets/pencil/frames/pencil-a.svg" id="2_ks8tb"] - -[sub_resource type="SpriteFrames" id="SpriteFrames_7ol02"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("2_ks8tb") -}], -"loop": true, -"name": &"default", -"speed": 5.0 -}] - -[sub_resource type="Animation" id="Animation_ij0gd"] -length = 0.001 -tracks/0/type = "bezier" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:scale:x") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"handle_modes": PackedInt32Array(0), -"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0) -} -tracks/1/type = "bezier" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:scale:y") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"handle_modes": PackedInt32Array(0), -"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0) -} -tracks/2/type = "bezier" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath(".:modulate:a") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"handle_modes": PackedInt32Array(0), -"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0) -} -tracks/3/type = "bezier" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath(".:position:y") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"handle_modes": PackedInt32Array(0), -"points": PackedFloat32Array(-44, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0) -} - -[sub_resource type="Animation" id="Animation_kmogx"] -resource_name = "spawn" -step = 0.05 -tracks/0/type = "bezier" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:scale:x") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"handle_modes": PackedInt32Array(0, 0), -"points": PackedFloat32Array(2, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0, 0.55) -} -tracks/1/type = "bezier" -tracks/1/imported = false -tracks/1/enabled = true -tracks/1/path = NodePath(".:scale:y") -tracks/1/interp = 1 -tracks/1/loop_wrap = true -tracks/1/keys = { -"handle_modes": PackedInt32Array(0, 0), -"points": PackedFloat32Array(2, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0, 0.55) -} -tracks/2/type = "bezier" -tracks/2/imported = false -tracks/2/enabled = true -tracks/2/path = NodePath(".:modulate:a") -tracks/2/interp = 1 -tracks/2/loop_wrap = true -tracks/2/keys = { -"handle_modes": PackedInt32Array(0, 0), -"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0, 0.55) -} -tracks/3/type = "bezier" -tracks/3/imported = false -tracks/3/enabled = true -tracks/3/path = NodePath(".:position:y") -tracks/3/interp = 1 -tracks/3/loop_wrap = true -tracks/3/keys = { -"handle_modes": PackedInt32Array(0, 0), -"points": PackedFloat32Array(-200, -0.25, 0, 0.25, 0, -44, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0.75, 1) -} - -[sub_resource type="AnimationLibrary" id="AnimationLibrary_0cgv5"] -_data = { -"RESET": SubResource("Animation_ij0gd"), -"spawn": SubResource("Animation_kmogx") -} - -[sub_resource type="RectangleShape2D" id="RectangleShape2D_cq7kn"] -size = Vector2(10, 10) - -[node name="Pencil" instance=ExtResource("1_anksp")] -script = ExtResource("2_4w6n2") -lifeTime = 3000.0 -autoSpawnAnimation = true - -[node name="texture" parent="." index="0"] -position = Vector2(0, -44) -sprite_frames = SubResource("SpriteFrames_7ol02") - -[node name="animator" parent="texture" index="0"] -libraries = { -"": SubResource("AnimationLibrary_0cgv5") -} - -[node name="hitbox" parent="." index="1"] -position = Vector2(0, -0.5) -shape = SubResource("RectangleShape2D_cq7kn") -disabled = true diff --git a/components/Bullets/PurpleCrystalSmall.tscn b/components/Bullets/PurpleCrystalSmall.tscn index dcb8120..5be6d6c 100644 --- a/components/Bullets/PurpleCrystalSmall.tscn +++ b/components/Bullets/PurpleCrystalSmall.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://c6wjncfsm2rxw"] [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_7tnrb"] -[ext_resource type="Script" path="res://scripts/Contents/Bullets/PurpleCrystal.gd" id="2_it0pa"] +[ext_resource type="Script" uid="uid://t1q1eq8fk0ro" path="res://scripts/Contents/Bullets/PurpleCrystal.gd" id="2_it0pa"] [ext_resource type="Texture2D" uid="uid://c7hyatbuieaj" path="res://resources/bullets/purple-crystal/frames/0.svg" id="3_3f3gq"] [sub_resource type="SpriteFrames" id="SpriteFrames_r86b3"] @@ -23,7 +23,7 @@ modulate = Color(1.5, 1.5, 1.5, 1) script = ExtResource("2_it0pa") displayName = "微型水晶" speed = 15.0 -damage = 0.5 +baseDamage = 1.0 lifeTime = 1000.0 [node name="texture" parent="." index="0"] diff --git a/components/Bullets/Star.tscn b/components/Bullets/Star.tscn index 3380bca..be9fcb7 100644 --- a/components/Bullets/Star.tscn +++ b/components/Bullets/Star.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_x6yf7"] [ext_resource type="Texture2D" uid="uid://csdjmin6g22sw" path="res://resources/bullets/star/frames/star.svg" id="2_cke7d"] -[ext_resource type="Script" path="res://scripts/Contents/Bullets/Star.gd" id="2_y4b0l"] +[ext_resource type="Script" uid="uid://bc2jvevaic06f" path="res://scripts/Contents/Bullets/Star.gd" id="2_y4b0l"] [sub_resource type="SpriteFrames" id="SpriteFrames_t53gb"] animations = [{ @@ -52,9 +52,9 @@ resource_name = "spawn" [sub_resource type="AnimationLibrary" id="AnimationLibrary_ls1ie"] _data = { -"RESET": SubResource("Animation_cig5u"), -"loop": SubResource("Animation_ynxlt"), -"spawn": SubResource("Animation_kmogx") +&"RESET": SubResource("Animation_cig5u"), +&"loop": SubResource("Animation_ynxlt"), +&"spawn": SubResource("Animation_kmogx") } [sub_resource type="CircleShape2D" id="CircleShape2D_tietk"] @@ -63,6 +63,7 @@ radius = 19.2354 [node name="Star" instance=ExtResource("1_x6yf7")] script = ExtResource("2_y4b0l") displayName = "星星" +baseDamage = 2.0 lifeTime = 1000.0 autoLoopAnimation = true @@ -72,7 +73,7 @@ sprite_frames = SubResource("SpriteFrames_t53gb") [node name="animator" parent="texture" index="0"] libraries = { -"": SubResource("AnimationLibrary_ls1ie") +&"": SubResource("AnimationLibrary_ls1ie") } [node name="hitbox" parent="." index="1"] diff --git a/components/Bullets/SunDance.tscn b/components/Bullets/SunDance.tscn index 8a55e6f..23b4993 100644 --- a/components/Bullets/SunDance.tscn +++ b/components/Bullets/SunDance.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=11 format=3 uid="uid://8ayxqglkc2nm"] [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_h0611"] -[ext_resource type="Script" path="res://scripts/Contents/Bullets/BossAttack/Bear/SunDance.gd" id="2_0kdtj"] +[ext_resource type="Script" uid="uid://s4x12fc67qyf" path="res://scripts/Contents/Bullets/BossAttack/Bear/SunDance.gd" id="2_0kdtj"] [ext_resource type="Texture2D" uid="uid://0w8sebsqjb7a" path="res://resources/bullets/light-express/Sun_Dance.webp" id="2_rqhmg"] [sub_resource type="Gradient" id="Gradient_ep4dl"] @@ -109,10 +109,10 @@ tracks/2/keys = { [sub_resource type="AnimationLibrary" id="AnimationLibrary_fv2s4"] _data = { -"RESET": SubResource("Animation_n0ppl"), -"destroy": SubResource("Animation_oinqg"), -"loop": SubResource("Animation_ynxlt"), -"spawn": SubResource("Animation_kmogx") +&"RESET": SubResource("Animation_n0ppl"), +&"destroy": SubResource("Animation_oinqg"), +&"loop": SubResource("Animation_ynxlt"), +&"spawn": SubResource("Animation_kmogx") } [node name="SunDance" instance=ExtResource("1_h0611")] @@ -121,12 +121,14 @@ scale = Vector2(1e-05, 1e-05) script = ExtResource("2_0kdtj") allColor = SubResource("GradientTexture1D_ikq3n") displayName = "太阳舞" +baseDamage = 1.0 +penerate = 1.0 autoSpawnAnimation = true freeAfterSpawn = true [node name="animator" parent="texture" index="0"] libraries = { -"": SubResource("AnimationLibrary_fv2s4") +&"": SubResource("AnimationLibrary_fv2s4") } [node name="leave1" type="Sprite2D" parent="texture" index="1"]