From 6a4f5e8baf6b516218c686eea3fbe987d62006c0 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, 6 Sep 2025 21:12:11 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9B=B4=E6=96=B0FullscreenPanelBase?= =?UTF-8?q?=E5=92=8CVectorStar=E7=BB=84=E4=BB=B6=EF=BC=8C=E4=BC=98?= =?UTF-8?q?=E5=8C=96UI=E5=B8=83=E5=B1=80=E5=92=8C=E6=AD=A6=E5=99=A8?= =?UTF-8?q?=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Abstracts/FullscreenPanelBase.tscn | 2 ++ components/Bullets/VectorStar.tscn | 22 ++++++++++++++----- components/Weapons/LGBT.tscn | 10 ++++----- components/Weapons/VectorStar.tscn | 14 +++++------- scripts/Statemachine/UIState.gd | 4 +++- 5 files changed, 31 insertions(+), 21 deletions(-) diff --git a/components/Abstracts/FullscreenPanelBase.tscn b/components/Abstracts/FullscreenPanelBase.tscn index 6fc9a11..13b41fd 100644 --- a/components/Abstracts/FullscreenPanelBase.tscn +++ b/components/Abstracts/FullscreenPanelBase.tscn @@ -95,6 +95,8 @@ layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_top = -500.0 +offset_bottom = -500.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_8e8nf") diff --git a/components/Bullets/VectorStar.tscn b/components/Bullets/VectorStar.tscn index 6c740bf..fe36cf7 100644 --- a/components/Bullets/VectorStar.tscn +++ b/components/Bullets/VectorStar.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=10 format=3 uid="uid://ro1df12asa6y"] +[gd_scene load_steps=12 format=3 uid="uid://ro1df12asa6y"] [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_fyvdf"] [ext_resource type="Script" path="res://scripts/Contents/Bullets/VectorStar.gd" id="2_1u5ed"] @@ -22,6 +22,13 @@ point_count = 2 [sub_resource type="CurveTexture" id="CurveTexture_c22if"] curve = SubResource("Curve_y5wc0") +[sub_resource type="Curve" id="Curve_ji22g"] +_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] +point_count = 2 + +[sub_resource type="CurveTexture" id="CurveTexture_q44nv"] +curve = SubResource("Curve_ji22g") + [sub_resource type="Curve" id="Curve_r5tug"] _data = [Vector2(0.696697, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] point_count = 2 @@ -31,13 +38,16 @@ curve = SubResource("Curve_r5tug") [sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_bieyj"] particle_flag_disable_z = true +angle_min = 1.07288e-05 +angle_max = 360.0 +angle_curve = SubResource("CurveTexture_q44nv") direction = Vector3(-1, 0, 0) -spread = 0.0 -initial_velocity_min = 100.0 -initial_velocity_max = 200.0 +spread = 180.0 +initial_velocity_min = 10.0 +initial_velocity_max = 50.0 gravity = Vector3(0, 0, 0) -scale_min = 0.6 -scale_max = 0.8 +scale_min = 0.25 +scale_max = 0.75 scale_curve = SubResource("CurveTexture_6bcs1") alpha_curve = SubResource("CurveTexture_c22if") diff --git a/components/Weapons/LGBT.tscn b/components/Weapons/LGBT.tscn index 1d800df..a55b693 100644 --- a/components/Weapons/LGBT.tscn +++ b/components/Weapons/LGBT.tscn @@ -26,9 +26,10 @@ storeType = { "power": 2.0, "trace": 0.0 } -descriptionTemplate = "每$angle发射1/$count条以$power效率追踪$trace秒的[b]彩虹飞星[/b],每条造成$atk点伤害。" +descriptionTemplate = "每$angle发射1/$count条以$power效率追踪$trace秒的[b]七彩飞星[/b],每条造成$atk点伤害。" needEnergy = 50.0 cooldown = 1000.0 +debugRebuild = true [node name="attack" parent="sounds" index="0"] stream = ExtResource("4_c5xse") @@ -37,10 +38,7 @@ stream = ExtResource("4_c5xse") texture = ExtResource("2_ou6jo") [node name="energy" parent="container/info/infos/energyInfo" index="1"] -text = "30.0" - -[node name="beachball" parent="container/info/infos/beachballInfo" index="1"] -text = "500" +text = "50.0" [node name="name" parent="container/info" index="2"] displayName = "彩虹旗" @@ -49,5 +47,5 @@ typeTopic = 3 [node name="description" parent="container" index="2"] size_flags_vertical = 3 -text = "[center]每[color=cyan]30.0°[/color]发射1/[color=cyan]7[/color]条以[color=cyan]25%[/color]效率追踪[color=cyan]2.00[/color]秒的[b]彩虹飞星[/b],每条造成[color=cyan]20[/color]点伤害。[/center]" +text = "[center]每[color=cyan]30.0°[/color]发射1/[color=cyan]7[/color]条以[color=cyan]25%[/color]效率追踪[color=cyan]2.00[/color]秒的[b]七彩飞星[/b],每条造成[color=cyan]20[/color]点伤害。[/center]" autowrap_mode = 2 diff --git a/components/Weapons/VectorStar.tscn b/components/Weapons/VectorStar.tscn index 7e53144..86a5c4e 100644 --- a/components/Weapons/VectorStar.tscn +++ b/components/Weapons/VectorStar.tscn @@ -10,8 +10,8 @@ avatarTexture = ExtResource("3_wfty8") displayName = "星辰核心" quality = 2 store = { -"atk": 5, -"forwardtime": 1, +"atk": 7, +"forwardtime": 0.75, "maxcount": 10, "mincount": 5 } @@ -22,21 +22,19 @@ storeType = { "mincount": 1.0 } descriptionTemplate = "发射$mincount~$maxcount个[b]无主[/b]的矢量星,在$forwardtime秒后向目标冲刺并造成$atk点伤害。" -needEnergy = 25.0 +needEnergy = 10.0 cooldown = 500.0 +debugRebuild = true [node name="avatar" parent="container/info" index="0"] texture = ExtResource("3_wfty8") [node name="energy" parent="container/info/infos/energyInfo" index="1"] -text = "25.0" - -[node name="beachball" parent="container/info/infos/beachballInfo" index="1"] -text = "500" +text = "10.0" [node name="name" parent="container/info" index="2"] displayName = "星辰核心" quality = 2 [node name="description" parent="container" index="2"] -text = "[center]发射[color=cyan]5[/color]~[color=cyan]10[/color]个[b]无主[/b]的矢量星,在[color=cyan]1.00[/color]秒后向目标冲刺并造成[color=cyan]5[/color]点伤害。[/center]" +text = "[center]发射[color=cyan]5[/color]~[color=cyan]10[/color]个[b]无主[/b]的矢量星,在[color=cyan]0.75[/color]秒后向目标冲刺并造成[color=cyan]7[/color]点伤害。[/center]" diff --git a/scripts/Statemachine/UIState.gd b/scripts/Statemachine/UIState.gd index f1021f5..623d6ff 100644 --- a/scripts/Statemachine/UIState.gd +++ b/scripts/Statemachine/UIState.gd @@ -21,6 +21,8 @@ func _ready(): energyPercent = $"%percent" itemCollect = $"%itemCollect" skillIconContainer = $"%skillContainer" + # for i in FieldStore.entityMap: + # print(FieldStore.entityMap[i]) func _process(_delta): bossbar.visible = !!bossbar.entity func _physics_process(_delta): @@ -47,7 +49,7 @@ func _physics_process(_delta): fieldsAnimator.play("hide") if Input.is_action_just_pressed("pause"): if currentPanel: - if currentPanel.name == "Pause": + if currentPanel.name != "MakeFeed": closeCurrentPanel() else: setPanel("Pause")