From 04dbd5d6dbe37200778dc83131c284c7d498c529 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: Sun, 14 Dec 2025 13:22:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E6=AD=A6=E5=99=A8):=20=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E8=93=9D=E6=B0=B4=E6=99=B6=E6=AD=A6=E5=99=A8=E5=8F=8A=E7=9B=B8?= =?UTF-8?q?=E5=85=B3=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 添加蓝水晶武器资源及配置 - 调整蓝水晶子弹的生命周期和追踪速度 - 修改数学工具中的随机数生成逻辑 - 更新钻石子弹的穿透属性和生命周期 - 将蓝水晶武器添加到角色武器库中 --- components/Bullets/BlueCrystal.tscn | 2 +- components/Bullets/Diamond2.tscn | 35 ++++++++++--------- components/Characters/Rooster.tscn | 9 +++-- components/Weapons/BlueCrystal.tscn | 17 +++------ resources/weapons/blue-crystal.png | Bin 0 -> 2369 bytes resources/weapons/blue-crystal.png.import | 40 ++++++++++++++++++++++ scripts/Contents/Bullets/BlueCrystal.gd | 2 +- scripts/Tools/MathTool.gd | 2 +- 8 files changed, 73 insertions(+), 34 deletions(-) create mode 100644 resources/weapons/blue-crystal.png create mode 100644 resources/weapons/blue-crystal.png.import diff --git a/components/Bullets/BlueCrystal.tscn b/components/Bullets/BlueCrystal.tscn index 6e59520..4ab17c2 100644 --- a/components/Bullets/BlueCrystal.tscn +++ b/components/Bullets/BlueCrystal.tscn @@ -38,7 +38,7 @@ alpha_curve = SubResource("CurveTexture_4h7m0") script = ExtResource("2_0q2lw") displayName = "蓝水晶" speed = 5.0 -lifeTime = 5000.0 +lifeTime = 2500.0 [node name="texture" parent="." index="0"] modulate = Color(0.8283318, 1.529841, 1.548706, 1) diff --git a/components/Bullets/Diamond2.tscn b/components/Bullets/Diamond2.tscn index 6fcc409..7c84ee3 100644 --- a/components/Bullets/Diamond2.tscn +++ b/components/Bullets/Diamond2.tscn @@ -4,8 +4,20 @@ [ext_resource type="Script" uid="uid://c1ywds8xwerm3" path="res://scripts/Contents/Bullets/Diamond2.gd" id="2_i4qda"] [ext_resource type="Texture2D" uid="uid://dfptmc7clhtx7" path="res://resources/bullets/diamond/frames/0.svg" id="3_pkqnc"] -[sub_resource type="Animation" id="Animation_pkqnc"] -resource_name = "spawn" +[sub_resource type="Animation" id="Animation_g4uh6"] +length = 0.001 +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), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [0.0] +} [sub_resource type="Animation" id="Animation_0d4xv"] resource_name = "loop" @@ -24,20 +36,8 @@ tracks/0/keys = { "values": [0.0, 6.283185307179586] } -[sub_resource type="Animation" id="Animation_g4uh6"] -length = 0.001 -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), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [0.0] -} +[sub_resource type="Animation" id="Animation_pkqnc"] +resource_name = "spawn" [sub_resource type="AnimationLibrary" id="AnimationLibrary_v5jve"] _data = { @@ -52,7 +52,8 @@ radius = 6.0827627 [node name="Diamond2" instance=ExtResource("1_slk7q")] script = ExtResource("2_i4qda") displayName = "钻石" -lifeTime = 5000.0 +penerate = 0.5 +lifeTime = 3000.0 autoLoopAnimation = true [node name="animator" parent="texture" index="0"] diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index 92933da..77b89d2 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -1,9 +1,10 @@ -[gd_scene load_steps=13 format=3 uid="uid://bm7ymrri6pykb"] +[gd_scene load_steps=14 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" uid="uid://cthtupc6dtbav" path="res://scripts/Contents/Characters/Rooster.gd" id="2_oqdqd"] [ext_resource type="PackedScene" uid="uid://c0n3igy4hucrg" path="res://components/Weapons/PurpleCrystal.tscn" id="3_jluqw"] [ext_resource type="PackedScene" uid="uid://wl8u5m52708w" path="res://components/Weapons/LGBT.tscn" id="3_s7kxe"] +[ext_resource type="PackedScene" uid="uid://c3crr8r7y3oho" path="res://components/Weapons/BlueCrystal.tscn" id="4_0omr3"] [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="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"] @@ -58,7 +59,11 @@ process_mode = 4 [node name="PurpleCrystal" parent="weaponStore" index="0" instance=ExtResource("3_jluqw")] offset_bottom = 350.0 -[node name="LGBT" parent="weaponStore" index="1" instance=ExtResource("3_s7kxe")] +[node name="BlueCrystal" parent="weaponStore" index="1" instance=ExtResource("4_0omr3")] +offset_bottom = 374.0 +debugRebuild = false + +[node name="LGBT" parent="weaponStore" index="2" instance=ExtResource("3_s7kxe")] [node name="sprint" parent="sounds" index="0"] stream = ExtResource("4_66s6c") diff --git a/components/Weapons/BlueCrystal.tscn b/components/Weapons/BlueCrystal.tscn index 4739ef9..a32d076 100644 --- a/components/Weapons/BlueCrystal.tscn +++ b/components/Weapons/BlueCrystal.tscn @@ -1,17 +1,17 @@ [gd_scene load_steps=5 format=3 uid="uid://c3crr8r7y3oho"] [ext_resource type="PackedScene" uid="uid://ckq2cq6m23hq3" path="res://components/Abstracts/WeaponCardBase.tscn" id="1_rlc3s"] -[ext_resource type="Texture2D" uid="uid://cp4ypuarjoshp" path="res://resources/skillIcons/purple-crystal.png" id="2_4qqa7"] [ext_resource type="Script" uid="uid://8xlc5upq36n7" path="res://scripts/Contents/Weapons/BlueCrystal.gd" id="2_jbcf8"] +[ext_resource type="Texture2D" uid="uid://dl1tawdvnlsux" path="res://resources/weapons/blue-crystal.png" id="3_fewtg"] [ext_resource type="AudioStream" uid="uid://dclinyhu256xi" path="res://resources/sounds/effect/Low Whoosh.mp3" id="4_fewtg"] [node name="BlueCrystal" instance=ExtResource("1_rlc3s")] script = ExtResource("2_jbcf8") -avatarTexture = ExtResource("2_4qqa7") +avatarTexture = ExtResource("3_fewtg") displayName = "蓝水晶簇" quality = 2 store = { -"atk": 2, +"atk": 5, "count": 2.0 } storeType = { @@ -20,20 +20,13 @@ storeType = { "distance": 0 } descriptionTemplate = "发射[b]蓝水晶[/b]，可无限追踪，命中造成$atk点伤害，飞行过程中有$count颗[b]钻石[/b]环绕。" -cooldown = 200.0 +cooldown = 250.0 [node name="attack" parent="sounds" index="0"] stream = ExtResource("4_fewtg") [node name="avatar" parent="container/info" index="0"] -modulate = Color(0.828, 1.53, 1.549, 1) -texture = ExtResource("2_4qqa7") - -[node name="beachball" parent="container/info/infos" index="1"] -count = 500 - -[node name="soul" parent="container/info/infos" index="2"] -count = 1 +texture = ExtResource("3_fewtg") [node name="name" parent="container/info" index="2"] displayName = "蓝水晶簇" diff --git a/resources/weapons/blue-crystal.png b/resources/weapons/blue-crystal.png new file mode 100644 index 0000000000000000000000000000000000000000..ca8b2f186a7fdcaba70d8083ee78960c9c980025 GIT binary patch literal 2369 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 Vector2: var ab = b - a var distance = ab.length()