From 0f3dc2ca9fb59d180cad23064f80ce95d2696bee 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 20:41:48 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0VerticalSoften?= =?UTF-8?q?=E7=9D=80=E8=89=B2=E5=99=A8=EF=BC=8C=E5=A2=9E=E5=BC=BA=E9=80=8F?= =?UTF-8?q?=E6=98=8E=E5=BA=A6=E6=8E=A7=E5=88=B6=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/Abstracts/FullscreenPanelBase.tscn | 11 ++++-- components/Abstracts/WeaponCardBase.tscn | 2 +- .../Scenes/FullscreenPanels/MakeFeed.tscn | 2 +- shaders/BigLaser.gdshader | 1 - shaders/Bomb.gdshader | 31 ---------------- shaders/CooldownProgress.gdshader | 1 - shaders/Explosion.gdshader | 37 ------------------- shaders/Laser.gdshader | 12 ------ shaders/Pixelization.gdshader | 7 ---- shaders/VerticalSoften.gdshader | 10 +++++ shaders/test.gdshader | 5 --- 11 files changed, 19 insertions(+), 100 deletions(-) delete mode 100644 shaders/Bomb.gdshader delete mode 100644 shaders/Explosion.gdshader delete mode 100644 shaders/Laser.gdshader delete mode 100644 shaders/Pixelization.gdshader create mode 100644 shaders/VerticalSoften.gdshader delete mode 100644 shaders/test.gdshader diff --git a/components/Abstracts/FullscreenPanelBase.tscn b/components/Abstracts/FullscreenPanelBase.tscn index a00ffb6..6fc9a11 100644 --- a/components/Abstracts/FullscreenPanelBase.tscn +++ b/components/Abstracts/FullscreenPanelBase.tscn @@ -2,8 +2,7 @@ [ext_resource type="Script" path="res://scripts/Statemachine/FullscreenPanelBase.gd" id="1_8e8nf"] -[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_mjt0u"] -bg_color = Color(0, 0, 0, 0.5) +[sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_grmsd"] [sub_resource type="Animation" id="Animation_76r7u"] length = 0.001 @@ -53,7 +52,7 @@ tracks/1/interp = 1 tracks/1/loop_wrap = true tracks/1/keys = { "handle_modes": PackedInt32Array(0, 0), -"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 500, -0.25, 0, 0.25, 0), +"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 100, -0.25, 0, 0.25, 0), "times": PackedFloat32Array(0, 0.5) } @@ -107,7 +106,11 @@ anchor_right = 1.0 anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 -theme_override_styles/panel = SubResource("StyleBoxFlat_mjt0u") +theme_override_styles/panel = SubResource("StyleBoxEmpty_grmsd") + +[node name="background" type="ColorRect" parent="content"] +layout_mode = 2 +color = Color(0, 0, 0, 0.5) [node name="wrapper" type="VBoxContainer" parent="content"] layout_mode = 2 diff --git a/components/Abstracts/WeaponCardBase.tscn b/components/Abstracts/WeaponCardBase.tscn index d4906ca..ebd1b6a 100644 --- a/components/Abstracts/WeaponCardBase.tscn +++ b/components/Abstracts/WeaponCardBase.tscn @@ -100,7 +100,7 @@ stretch_mode = 5 [node name="beachball" type="Label" parent="container/info/infos/beachballInfo"] unique_name_in_owner = true layout_mode = 2 -text = "100" +text = "500" [node name="name" parent="container/info" instance=ExtResource("3_qv0b1")] unique_name_in_owner = true diff --git a/components/Scenes/FullscreenPanels/MakeFeed.tscn b/components/Scenes/FullscreenPanels/MakeFeed.tscn index e7ed223..2f772cf 100644 --- a/components/Scenes/FullscreenPanels/MakeFeed.tscn +++ b/components/Scenes/FullscreenPanels/MakeFeed.tscn @@ -8,7 +8,7 @@ [node name="MakeFeed" instance=ExtResource("1_1wmro")] script = ExtResource("2_pr610") -[node name="wrapper" parent="content" index="0"] +[node name="wrapper" parent="content" index="1"] theme_override_constants/separation = 50 [node name="tips" type="VBoxContainer" parent="content/wrapper" index="0"] diff --git a/shaders/BigLaser.gdshader b/shaders/BigLaser.gdshader index 1de84b2..072968f 100644 --- a/shaders/BigLaser.gdshader +++ b/shaders/BigLaser.gdshader @@ -20,6 +20,5 @@ void fragment() { wave_intensity *= sin(wave_dist * wave_frequency * 3.14159) * wave_amplitude; vec3 base_color = mix(vec3(1.0), laser_color.rgb, 1.0 - laser_intensity); vec3 color = base_color + vec3(wave_intensity); - //COLOR = vec4(color, (0.5-x_dist)/0.5); COLOR = vec4(color,smoothstep(0,1.0-edge_nonalpha,(0.5-x_dist)/0.5)); } \ No newline at end of file diff --git a/shaders/Bomb.gdshader b/shaders/Bomb.gdshader deleted file mode 100644 index ca43e5d..0000000 --- a/shaders/Bomb.gdshader +++ /dev/null @@ -1,31 +0,0 @@ -shader_type canvas_item; - -uniform float explosion_radius : hint_range(0.0, 1.0) = 0.0; -uniform float explosion_intensity : hint_range(0.0, 2.0) = 1.0; -uniform vec4 explosion_color : source_color = vec4(1.0, 0.5, 0.0, 1.0); -uniform float time_scale = 1.0; - -void fragment() { - // 计算当前像素到中心的距离 - vec2 center = vec2(0.5, 0.5); - float dist = distance(UV, center); - - // 使用TIME创建随时间变化的爆炸效果 - float time = TIME * time_scale; - float explosion = smoothstep(explosion_radius, explosion_radius - 0.2, dist) * explosion_intensity; - - // 添加一些噪声使爆炸看起来更自然 - float noise = sin(dist * 20.0 - time * 5.0) * 0.1; - explosion += noise; - - // 计算最终颜色，混合原始纹理和爆炸效果 - vec4 original_color = texture(TEXTURE, UV); - vec4 final_color = mix(original_color, explosion_color, explosion); - - // 添加一些发光效果 - float glow = exp(-dist * 5.0) * explosion_intensity; - final_color.rgb += glow * explosion_color.rgb; - final_color.a; - // 输出最终颜色 - COLOR = final_color; -} diff --git a/shaders/CooldownProgress.gdshader b/shaders/CooldownProgress.gdshader index b4e51c1..7c8a42a 100644 --- a/shaders/CooldownProgress.gdshader +++ b/shaders/CooldownProgress.gdshader @@ -4,7 +4,6 @@ uniform float backAlpha:hint_range(0.0, 1.0, 0.01)=0.25; uniform float edgeHeight:hint_range(0.0, 1.0, 0.01)=0.05; uniform float trailHeight:hint_range(0.0, 1.0, 0.01)=0.3; void fragment() { - COLOR=texture(TEXTURE,UV); if(UV.y>=progress){ COLOR.a*=backAlpha; }else if(distance(UV.y,progress)percent.y){ + COLOR.a*=1.0-(distance(UV.y,percent.y))/(1.0-percent.y); + } +} \ No newline at end of file diff --git a/shaders/test.gdshader b/shaders/test.gdshader deleted file mode 100644 index 3930e47..0000000 --- a/shaders/test.gdshader +++ /dev/null @@ -1,5 +0,0 @@ -shader_type canvas_item; - -void fragment() { - COLOR=vec4(vec2(textureSize(TEXTURE,0)),0,1); -}