From 174f24e3fed5083a30237a30ace0cee9c78d615e 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: Fri, 29 Aug 2025 09:17:15 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E5=AD=90=E5=BC=B9=E7=B3=BB=E7=BB=9F):=20?=
=?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=BF=80=E5=85=89=E5=AD=90=E5=BC=B9=E6=95=88?=
=?UTF-8?q?=E6=9E=9C=E5=92=8C=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
- 将BigLaser的父场景从LaserCommoner改为LaserSummoner
- 增加激光震动强度从100到150
- 移除succeedToHit方法的伤害加成效果
- 更新激光粒子效果和材质参数
- 修改水杯和蛋糕的字段属性
- 优化调试组件FeedHasField的目标字段
- 更新激光圆圈SVG资源
---
components/Bullets/BigLaser.tscn | 2 +-
...{LaserCommoner.tscn => LaserSummoner.tscn} | 23 +++++++++----------
components/Debug/FeedHasField.tscn | 2 +-
components/Feeds/Cupcake.tscn | 4 ++--
components/Feeds/WaterBottle.tscn | 4 ++--
resources/bullets/laser-circle/circle.svg | 2 +-
scripts/Contents/Bullets/BigLaser.gd | 4 +---
scripts/Debug/FeedHasField.gd | 2 +-
8 files changed, 20 insertions(+), 23 deletions(-)
rename components/Bullets/Common/{LaserCommoner.tscn => LaserSummoner.tscn} (94%)
diff --git a/components/Bullets/BigLaser.tscn b/components/Bullets/BigLaser.tscn
index 70b88b4..8e84d1c 100644
--- a/components/Bullets/BigLaser.tscn
+++ b/components/Bullets/BigLaser.tscn
@@ -1,6 +1,6 @@
[gd_scene load_steps=2 format=3 uid="uid://ltqx7fyovhla"]
-[ext_resource type="PackedScene" uid="uid://8gjjfju6p3fh" path="res://components/Bullets/Common/LaserCommoner.tscn" id="1_ukbip"]
+[ext_resource type="PackedScene" uid="uid://8gjjfju6p3fh" path="res://components/Bullets/Common/LaserSummoner.tscn" id="1_ukbip"]
[node name="BigLaser" instance=ExtResource("1_ukbip")]
needEnergy = 100.0
diff --git a/components/Bullets/Common/LaserCommoner.tscn b/components/Bullets/Common/LaserSummoner.tscn
similarity index 94%
rename from components/Bullets/Common/LaserCommoner.tscn
rename to components/Bullets/Common/LaserSummoner.tscn
index e51dc7e..0be27f2 100644
--- a/components/Bullets/Common/LaserCommoner.tscn
+++ b/components/Bullets/Common/LaserSummoner.tscn
@@ -1,18 +1,18 @@
[gd_scene load_steps=18 format=3 uid="uid://8gjjfju6p3fh"]
-[ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_f67dy"]
-[ext_resource type="Script" path="res://scripts/Contents/Bullets/BigLaser.gd" id="2_tdbxh"]
-[ext_resource type="Shader" path="res://shaders/BigLaser1.gdshader" id="3_km2v1"]
-[ext_resource type="Texture2D" uid="uid://dy4op6n6vxef3" path="res://resources/bullets/laser-circle/circle.svg" id="4_rs8hf"]
+[ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_pnxoq"]
+[ext_resource type="Script" path="res://scripts/Contents/Bullets/BigLaser.gd" id="2_nk2p8"]
+[ext_resource type="Shader" path="res://shaders/BigLaser1.gdshader" id="3_ow2gn"]
+[ext_resource type="Texture2D" uid="uid://dy4op6n6vxef3" path="res://resources/bullets/laser-circle/circle.svg" id="4_sewyb"]
[sub_resource type="SpriteFrames" id="SpriteFrames_yip5k"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_b2oy8"]
-shader = ExtResource("3_km2v1")
+shader = ExtResource("3_ow2gn")
shader_parameter/laser_color = Color(1, 0, 0, 1)
shader_parameter/width = 1.0
shader_parameter/softness = 0.2
-shader_parameter/wave_speed = 2.0
+shader_parameter/wave_speed = 3.0
shader_parameter/wave_frequency = 13.154
shader_parameter/wave_amplitude = 1.151
shader_parameter/wave_width = 0.032
@@ -157,7 +157,7 @@ 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, 12.5664, -0.25, 0, 0.25, 0),
+"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 25.1327, -0.25, 0, 0.25, 0),
"times": PackedFloat32Array(0, 5)
}
tracks/3/type = "bezier"
@@ -204,8 +204,8 @@ _data = {
radius = 40.0
height = 2000.0
-[node name="LaserSummoner" instance=ExtResource("1_f67dy")]
-script = ExtResource("2_tdbxh")
+[node name="LaserSummoner" instance=ExtResource("1_pnxoq")]
+script = ExtResource("2_nk2p8")
fields = {
0: 0,
1: 25,
@@ -220,9 +220,8 @@ sprite_frames = SubResource("SpriteFrames_yip5k")
[node name="rect" type="ColorRect" parent="texture" index="0"]
material = SubResource("ShaderMaterial_b2oy8")
offset_left = 233.0
-offset_top = 50.0
offset_right = 333.0
-offset_bottom = 2050.0
+offset_bottom = 2000.0
rotation = -1.5708
scale = Vector2(1e-05, 1)
@@ -247,7 +246,7 @@ libraries = {
[node name="circle" type="Sprite2D" parent="texture" index="2"]
modulate = Color(1, 1, 1, 0)
scale = Vector2(1e-05, 1e-05)
-texture = ExtResource("4_rs8hf")
+texture = ExtResource("4_sewyb")
[node name="hitbox" parent="." index="1"]
visible = false
diff --git a/components/Debug/FeedHasField.tscn b/components/Debug/FeedHasField.tscn
index 199a226..95817e2 100644
--- a/components/Debug/FeedHasField.tscn
+++ b/components/Debug/FeedHasField.tscn
@@ -5,5 +5,5 @@
[node name="FeedHasField" type="HBoxContainer"]
theme_override_constants/separation = 0
script = ExtResource("1_7leag")
-targetFields = Array[int]([17])
+targetFields = Array[int]([7])
clickToRefresh = true
diff --git a/components/Feeds/Cupcake.tscn b/components/Feeds/Cupcake.tscn
index 34a1df3..3667a3c 100644
--- a/components/Feeds/Cupcake.tscn
+++ b/components/Feeds/Cupcake.tscn
@@ -6,8 +6,8 @@
[node name="Cupcake" instance=ExtResource("1_x5oju")]
avatarTexture = ExtResource("2_qojf3")
displayName = "烘焙松糕"
-fields = Array[int]([12, 2])
-fieldValues = Array[float]([0.15, 0.1])
+fields = Array[int]([12, 2, 5])
+fieldValues = Array[float]([0.15, 0.1, 0.05])
costs = Array[int]([0])
costCounts = Array[int]([125])
diff --git a/components/Feeds/WaterBottle.tscn b/components/Feeds/WaterBottle.tscn
index 2485bb7..73f3096 100644
--- a/components/Feeds/WaterBottle.tscn
+++ b/components/Feeds/WaterBottle.tscn
@@ -7,8 +7,8 @@
avatarTexture = ExtResource("2_gsfud")
displayName = "水杯"
quality = 4
-fields = Array[int]([3])
-fieldValues = Array[float]([0.25])
+fields = Array[int]([3, 7])
+fieldValues = Array[float]([0.25, 3.0])
costs = Array[int]([1])
costCounts = Array[int]([400])
diff --git a/resources/bullets/laser-circle/circle.svg b/resources/bullets/laser-circle/circle.svg
index 34cdd2a..72556ea 100644
--- a/resources/bullets/laser-circle/circle.svg
+++ b/resources/bullets/laser-circle/circle.svg
@@ -1 +1 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/scripts/Contents/Bullets/BigLaser.gd b/scripts/Contents/Bullets/BigLaser.gd
index 34386ff..a9dd037 100644
--- a/scripts/Contents/Bullets/BigLaser.gd
+++ b/scripts/Contents/Bullets/BigLaser.gd
@@ -2,7 +2,7 @@ extends BulletBase
class_name BigLaser # 这个子弹是玩家的超级武器，耗能高，dps也高
func spawn():
- CameraManager.shake(5000, 100) # 激光会运行5秒，期间震屏100强度
+ CameraManager.shake(5000, 150) # 激光会运行5秒（5000毫秒），期间震屏超高强度
CameraManager.playAnimation("bigLaser")
fields[FieldStore.Bullet.DAMAGE] *= launcher.fields[FieldStore.Entity.ATTACK_SPEED]
func ai():
@@ -14,5 +14,3 @@ func applyDot():
hitbox.disabled = false
await TickTool.millseconds(100 / launcher.fields[FieldStore.Entity.ATTACK_SPEED])
return true
-func succeedToHit(_dmg: float):
- fields[FieldStore.Bullet.DAMAGE] *= 1.03
diff --git a/scripts/Debug/FeedHasField.gd b/scripts/Debug/FeedHasField.gd
index dbab240..cafded9 100644
--- a/scripts/Debug/FeedHasField.gd
+++ b/scripts/Debug/FeedHasField.gd
@@ -24,7 +24,7 @@ func rebuild():
i.queue_free()
var files = DirTool.listdir("res://components/Feeds/")
for file in files:
- var passed: bool
+ var passed: bool = true
var feed = load(file).instantiate() as Feed
for targetField in targetFields:
var haveThis = false