diff --git a/components/Bullets/LGBTBullet.tscn b/components/Bullets/LGBTBullet.tscn index 789e240..056efec 100644 --- a/components/Bullets/LGBTBullet.tscn +++ b/components/Bullets/LGBTBullet.tscn @@ -3,20 +3,10 @@ [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_bnhy4"] [ext_resource type="Texture2D" uid="uid://d2pndtow16635" path="res://resources/bullets/lgbt-bullet/造型2.svg" id="2_cnsbx"] [ext_resource type="Script" path="res://scripts/Contents/Bullets/LGBTBullet.gd" id="2_iakgr"] +[ext_resource type="Script" path="res://scripts/Statemachine/LeadingMark.gd" id="3_rirwy"] -[sub_resource type="SpriteFrames" id="SpriteFrames_rdak6"] -animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("2_cnsbx") -}], -"loop": true, -"name": &"default", -"speed": 5.0 -}] - -[sub_resource type="CircleShape2D" id="CircleShape2D_4pjb3"] -radius = 32.249 +[sub_resource type="CircleShape2D" id="CircleShape2D_1e8f0"] +radius = 12.3693 [sub_resource type="Curve" id="Curve_6bq7i"] _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] @@ -93,10 +83,13 @@ script = ExtResource("2_iakgr") lifeTime = 2000.0 [node name="texture" parent="." index="0"] -sprite_frames = SubResource("SpriteFrames_rdak6") +rotation = 1.5708 +script = ExtResource("3_rirwy") +width = 30.0 +height = 40.0 [node name="hitbox" parent="." index="1"] -shape = SubResource("CircleShape2D_4pjb3") +shape = SubResource("CircleShape2D_1e8f0") [node name="particles" type="GPUParticles2D" parent="." index="2"] z_index = -1 diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index d50b277..ea0c1e3 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -7,8 +7,8 @@ [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_ms5sq"] [ext_resource type="AudioStream" uid="uid://cdrevrq7n6yqa" path="res://resources/sounds/effect/Boing.mp3" id="4_66s6c"] -[ext_resource type="PackedScene" uid="uid://cxabqjo7skxev" path="res://components/Weapons/BigLaser.tscn" id="4_0862n"] [ext_resource type="AudioStream" uid="uid://benyec5bqni0b" path="res://resources/sounds/effect/Chomp.wav" id="4_k0yme"] +[ext_resource type="PackedScene" uid="uid://wl8u5m52708w" path="res://components/Weapons/LGBT.tscn" id="4_pb8qn"] [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"] [ext_resource type="AudioStream" uid="uid://4wuuf1osk0yv" path="res://resources/sounds/effect/Low Boing.wav" id="6_m5px1"] [ext_resource type="AudioStream" uid="uid://b10u6iir6uvqn" path="res://resources/sounds/effect/BigLaser.wav" id="8_7dhim"] @@ -46,7 +46,7 @@ process_mode = 4 [node name="PurpleCrystal" parent="weaponStore" index="0" instance=ExtResource("3_ms5sq")] -[node name="BigLaser" parent="weaponStore" index="1" instance=ExtResource("4_0862n")] +[node name="LGBT" parent="weaponStore" index="1" instance=ExtResource("4_pb8qn")] [node name="sprint" parent="sounds" index="0"] stream = ExtResource("4_66s6c") diff --git a/components/UI/EntityStateBar.tscn b/components/UI/EntityStateBar.tscn index ce88538..8fd0de4 100644 --- a/components/UI/EntityStateBar.tscn +++ b/components/UI/EntityStateBar.tscn @@ -1,8 +1,20 @@ -[gd_scene load_steps=4 format=3 uid="uid://dcjqjqere8ets"] +[gd_scene load_steps=8 format=3 uid="uid://dcjqjqere8ets"] [ext_resource type="PackedScene" uid="uid://d1ulrvupa76ap" path="res://components/UI/ColorBar.tscn" id="1_0ngbn"] [ext_resource type="Script" path="res://scripts/Statemachine/EntityStateBar.gd" id="1_ovbjr"] +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_w56p2"] +bg_color = Color(0, 0, 0, 0.5) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_2sar3"] +bg_color = Color(1, 0, 0, 0.5) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_i0t67"] +bg_color = Color(0, 1, 0, 0.5) + +[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_jxamg"] +bg_color = Color(1, 1, 1, 1) + [sub_resource type="LabelSettings" id="LabelSettings_ih2pl"] font_size = 13 @@ -15,6 +27,10 @@ offset_left = -50.0 offset_top = -5.0 offset_right = 50.0 offset_bottom = 5.0 +backBox = SubResource("StyleBoxFlat_w56p2") +middleBox1 = SubResource("StyleBoxFlat_2sar3") +middleBox2 = SubResource("StyleBoxFlat_i0t67") +frontBox = SubResource("StyleBoxFlat_jxamg") [node name="levelLabel" type="HBoxContainer" parent="health"] unique_name_in_owner = true diff --git a/components/Weapons/LGBT.tscn b/components/Weapons/LGBT.tscn index ac2fc38..921dcc1 100644 --- a/components/Weapons/LGBT.tscn +++ b/components/Weapons/LGBT.tscn @@ -21,7 +21,7 @@ store = { } storeType = Array[int]([2, 0, 0, 1, 0]) descriptionTemplate = "发射$count条，每条间分隔$angle，可追踪$trace秒，效率为$power的带状彩虹，每条造成$atk点伤害。" -needEnergy = 25.0 +needEnergy = 50.0 cooldown = 500.0 [node name="attack" parent="sounds" index="0"] @@ -31,7 +31,7 @@ process_mode = 3 texture = ExtResource("2_ou6jo") [node name="energy" parent="container/info/energyInfo" index="1"] -text = "50.0" +text = "25.0" [node name="name" parent="container/info" index="2"] displayName = "彩虹旗" diff --git a/scripts/Contents/Bullets/LGBTBullet.gd b/scripts/Contents/Bullets/LGBTBullet.gd index 994a121..0ef809c 100644 --- a/scripts/Contents/Bullets/LGBTBullet.gd +++ b/scripts/Contents/Bullets/LGBTBullet.gd @@ -8,7 +8,6 @@ var tracePower: float func register(): speed = 1 func ai(): - texture.rotation_degrees += speed speed *= 1.05 speed = clamp(speed, 0, 20) if is_instance_valid(tracer) and timeLived() < maxTraceTime: diff --git a/scripts/Statemachine/LeadingMark.gd b/scripts/Statemachine/LeadingMark.gd new file mode 100644 index 0000000..bc92282 --- /dev/null +++ b/scripts/Statemachine/LeadingMark.gd @@ -0,0 +1,19 @@ +@tool +extends Node2D + +@export var width: float = 75 +@export var height: float = 100 +@export var collapse: float = 0.25 +@export var color: Color = Color(1, 1, 1) + +func getPolygon() -> Array[Vector2]: + return [ + Vector2(0, -height / 2), + Vector2(width / 2, height / 2), + Vector2(0, height * (1 - collapse) - height / 2), + Vector2(-width / 2, height / 2), + ] +func _draw(): + draw_polygon(getPolygon(), [color]) +func _process(_delta): + queue_redraw()