From 493582be7dcc1b2254e5676b0730054076562793 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 17:33:19 +0800 Subject: [PATCH] =?UTF-8?q?feat[=E8=A7=92=E8=89=B2]:=20=E6=B7=BB=E5=8A=A0R?= =?UTF-8?q?ooster=E8=A7=92=E8=89=B2=E5=8F=8A=E7=9B=B8=E5=85=B3=E6=AD=A6?= =?UTF-8?q?=E5=99=A8=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 新增Rooster角色脚本及LGBT武器UI组件，完善角色战斗系统资源。 --- components/UI/WeaponName.tscn | 8 +++--- components/Weapons/LGBT.tscn | 8 ++---- project.godot | 36 ++++++++++++++++---------- scripts/Contents/Characters/Rooster.gd | 8 ++++-- 4 files changed, 35 insertions(+), 25 deletions(-) diff --git a/components/UI/WeaponName.tscn b/components/UI/WeaponName.tscn index 35d4c95..3533cdd 100644 --- a/components/UI/WeaponName.tscn +++ b/components/UI/WeaponName.tscn @@ -3,10 +3,10 @@ [ext_resource type="Theme" uid="uid://bje5cd08dyok7" path="res://themes/bigTextAndBold.tres" id="2_y8dft"] [ext_resource type="Script" path="res://scripts/Statemachine/WeaponName.gd" id="3_g750e"] -[sub_resource type="LabelSettings" id="LabelSettings_1vypy"] +[sub_resource type="LabelSettings" id="LabelSettings_fglo5"] font_size = 12 -[sub_resource type="LabelSettings" id="LabelSettings_pyxdw"] +[sub_resource type="LabelSettings" id="LabelSettings_3tmci"] font_size = 12 [node name="WeaponName" type="HBoxContainer"] @@ -34,7 +34,7 @@ unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 0 text = "[普通]" -label_settings = SubResource("LabelSettings_1vypy") +label_settings = SubResource("LabelSettings_fglo5") [node name="label" type="RichTextLabel" parent="."] unique_name_in_owner = true @@ -60,4 +60,4 @@ unique_name_in_owner = true layout_mode = 2 size_flags_vertical = 8 text = "[冲击]" -label_settings = SubResource("LabelSettings_pyxdw") +label_settings = SubResource("LabelSettings_3tmci") diff --git a/components/Weapons/LGBT.tscn b/components/Weapons/LGBT.tscn index 5dcd9fe..6b7da6d 100644 --- a/components/Weapons/LGBT.tscn +++ b/components/Weapons/LGBT.tscn @@ -11,6 +11,7 @@ script = ExtResource("2_0tyah") avatarTexture = ExtResource("2_ou6jo") displayName = "彩虹旗" quality = 4 +typeTopic = 3 store = { "angle": 30.0, "atk": 20.0, @@ -28,7 +29,6 @@ storeType = { descriptionTemplate = "每$angle发射1/$count条以$power效率追踪$trace秒的[b]彩虹飞星[/b]，每条造成$atk点伤害。" needEnergy = 30.0 cooldown = 1000.0 -debugRebuild = true [node name="attack" parent="sounds" index="0"] stream = ExtResource("4_c5xse") @@ -45,11 +45,7 @@ text = "500" [node name="name" parent="container/info" index="2"] displayName = "彩虹旗" quality = 4 -typeTopicNameMap = { -0: "冲击", -1: "能量", -2: "熔融" -} +typeTopic = 3 [node name="description" parent="container" index="2"] size_flags_vertical = 3 diff --git a/project.godot b/project.godot index b551fef..8290d30 100644 --- a/project.godot +++ b/project.godot @@ -51,11 +51,6 @@ m_right={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":68,"key_label":0,"unicode":100,"location":0,"echo":false,"script":null) ] } -attack={ -"deadzone": 0.5, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null) -] -} sprint={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":32,"key_label":0,"unicode":32,"location":0,"echo":false,"script":null) @@ -66,11 +61,6 @@ heal={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":82,"key_label":0,"unicode":114,"location":0,"echo":false,"script":null) ] } -attack2={ -"deadzone": 0.5, -"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null) -] -} showFields={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":4194306,"key_label":0,"unicode":0,"location":0,"echo":false,"script":null) @@ -87,17 +77,37 @@ openWeapon={ "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":73,"key_label":0,"unicode":105,"location":0,"echo":false,"script":null) ] } -skill0={ +attack={ +"deadzone": 0.5, +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":1,"canceled":false,"pressed":false,"double_click":false,"script":null) +] +} +attack2={ +"deadzone": 0.5, +"events": [Object(InputEventMouseButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"button_mask":0,"position":Vector2(0, 0),"global_position":Vector2(0, 0),"factor":1.0,"button_index":2,"canceled":false,"pressed":false,"double_click":false,"script":null) +] +} +smallSkill={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":69,"key_label":0,"unicode":101,"location":0,"echo":false,"script":null) +] +} +superSkill={ +"deadzone": 0.5, +"events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":81,"key_label":0,"unicode":113,"location":0,"echo":false,"script":null) +] +} +cardSkill0={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":49,"key_label":0,"unicode":49,"location":0,"echo":false,"script":null) ] } -skill1={ +cardSkill1={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":50,"key_label":0,"unicode":50,"location":0,"echo":false,"script":null) ] } -skill2={ +cardSkill2={ "deadzone": 0.5, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":51,"key_label":0,"unicode":51,"location":0,"echo":false,"script":null) ] diff --git a/scripts/Contents/Characters/Rooster.gd b/scripts/Contents/Characters/Rooster.gd index bd604ad..8290dca 100644 --- a/scripts/Contents/Characters/Rooster.gd +++ b/scripts/Contents/Characters/Rooster.gd @@ -17,9 +17,13 @@ func ai(): tryAttack(0) elif Input.is_action_pressed("attack2"): tryAttack(1) + elif Input.is_action_pressed("smallSkill"): + tryAttack(2) + elif Input.is_action_pressed("superSkill"): + tryAttack(3) for i in range(3): - if Input.is_action_pressed("skill" + str(i)): - tryAttack(2 + i) + if Input.is_action_pressed("cardSkill" + str(i)): + tryAttack(4 + i) if Input.is_action_just_pressed("sprint"): trySprint() if Input.is_action_just_pressed("heal"):