From d5197557f6462002c1b7a58b89e3c78fcac5df72 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: Tue, 30 Sep 2025 13:23:51 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=AD=A6=E5=99=A8):=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E4=BB=A3=E8=BE=BE=E7=BD=97=E6=96=AF=E9=A3=8E=E6=9A=B4=E9=AD=82?= =?UTF-8?q?=E6=AD=A6=E5=99=A8=E5=B9=B6=E8=B0=83=E6=95=B4=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为公鸡角色添加新的武器代达罗斯风暴魂，并调整其伤害、数量和半径参数。同时修改怪物灵魂子弹的伤害值，并添加超出屏幕自动销毁逻辑。更新武器描述文本以反映参数变化。 --- components/Bullets/WhiteSoul.tscn | 2 +- components/Characters/Rooster.tscn | 10 +++++++--- components/Feeds/A-WhiteSoul.tscn | 22 ++++++++++++++++++++++ components/Weapons/WhiteSoul.tscn | 7 ++++--- scripts/Contents/Bullets/WhiteSoul.gd | 2 ++ 5 files changed, 36 insertions(+), 7 deletions(-) create mode 100644 components/Feeds/A-WhiteSoul.tscn diff --git a/components/Bullets/WhiteSoul.tscn b/components/Bullets/WhiteSoul.tscn index ad17941..86b82f3 100644 --- a/components/Bullets/WhiteSoul.tscn +++ b/components/Bullets/WhiteSoul.tscn @@ -46,7 +46,7 @@ texture_filter = 1 script = ExtResource("2_ld7n7") displayName = "怪物灵魂" speed = 20.0 -lifeTime = 2000.0 +damage = 5.0 [node name="texture" parent="." index="0"] rotation = -1.5708 diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index c3fb311..d69cd4a 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=15 format=3 uid="uid://bm7ymrri6pykb"] +[gd_scene load_steps=16 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"] @@ -6,6 +6,7 @@ [ext_resource type="AudioStream" uid="uid://dclinyhu256xi" path="res://resources/sounds/effect/Low Whoosh.mp3" id="3_4syso"] [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_kr2sk"] [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"] @@ -45,10 +46,13 @@ displayName = "公鸡" [node name="weaponStore" parent="." index="0"] process_mode = 4 -[node name="PurpleCrystal" parent="weaponStore" index="0" instance=ExtResource("3_cyreu")] +[node name="WhiteSoul" parent="weaponStore" index="0" instance=ExtResource("3_kr2sk")] +offset_bottom = 341.0 + +[node name="PurpleCrystal" parent="weaponStore" index="1" instance=ExtResource("3_cyreu")] debugRebuild = false -[node name="VectorStar" parent="weaponStore" index="1" instance=ExtResource("4_re2px")] +[node name="VectorStar" parent="weaponStore" index="2" instance=ExtResource("4_re2px")] debugRebuild = false [node name="sprint" parent="sounds" index="0"] diff --git a/components/Feeds/A-WhiteSoul.tscn b/components/Feeds/A-WhiteSoul.tscn new file mode 100644 index 0000000..872ba3d --- /dev/null +++ b/components/Feeds/A-WhiteSoul.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=3 uid="uid://bex4qnwll5s34"] + +[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_rfm0t"] +[ext_resource type="Texture2D" uid="uid://bgj2i5q2rst27" path="res://resources/weapons/Daedalus_Stormbow.png" id="2_dkf3o"] +[ext_resource type="PackedScene" uid="uid://bt4b7ks26fcgi" path="res://components/Weapons/WhiteSoul.tscn" id="3_iq4u3"] + +[node name="WhiteSoul" instance=ExtResource("1_rfm0t")] +avatarTexture = ExtResource("2_dkf3o") +displayName = "代达罗斯风暴魂" +quality = 2 +topic = 8 +weapons = Array[PackedScene]([ExtResource("3_iq4u3")]) +costs = Array[int]([2, 1]) +costCounts = Array[int]([1, 1000]) + +[node name="avatar" parent="container/info" index="0"] +texture = ExtResource("2_dkf3o") + +[node name="name" parent="container/info" index="1"] +displayName = "代达罗斯风暴魂" +quality = 2 +topic = 8 diff --git a/components/Weapons/WhiteSoul.tscn b/components/Weapons/WhiteSoul.tscn index 543c446..ac9f1e4 100644 --- a/components/Weapons/WhiteSoul.tscn +++ b/components/Weapons/WhiteSoul.tscn @@ -12,8 +12,8 @@ quality = 3 costBeachball = 300 store = { "atk": 5, -"count": 2.0, -"radius": 50.0 +"count": 1.0, +"radius": 100.0 } storeType = { "atk": 1, @@ -21,6 +21,7 @@ storeType = { "radius": 0.0 } descriptionTemplate = "从天而降$count支目标位于鼠标位置半径$radius内的怪物灵魂，造成$atk点伤害。" +cooldown = 50.0 [node name="avatar" parent="container/info" index="0"] texture = ExtResource("2_kcegs") @@ -33,4 +34,4 @@ displayName = "代达罗斯风暴魂" quality = 3 [node name="description" parent="container" index="2"] -text = "[center]从天而降[color=cyan]2[/color]→[color=yellow]2[/color]支目标位于鼠标位置半径[color=cyan]50.00[/color]→[color=yellow]47.62[/color]内的怪物灵魂，造成[color=cyan]2[/color]→[color=yellow]4[/color]点伤害。[/center]" +text = "[center]从天而降[color=cyan]1[/color]→[color=yellow]1[/color]支目标位于鼠标位置半径[color=cyan]100.00[/color]→[color=yellow]95.24[/color]内的怪物灵魂，造成[color=cyan]5[/color]→[color=yellow]7[/color]点伤害。[/center]" diff --git a/scripts/Contents/Bullets/WhiteSoul.gd b/scripts/Contents/Bullets/WhiteSoul.gd index cbca013..6be588f 100644 --- a/scripts/Contents/Bullets/WhiteSoul.gd +++ b/scripts/Contents/Bullets/WhiteSoul.gd @@ -2,3 +2,5 @@ extends BulletBase func ai(): PresetBulletAI.forward(self, rotation) + if position.y > CameraManager.instance.position.y + QuickUI.getWindowSize().y / 2: + tryDestroy()