From 2ebc2bd05e2f6fff982d4baaa44642eee173c3cd 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: Mon, 2 Feb 2026 12:21:48 +0800 Subject: [PATCH] =?UTF-8?q?feat(FieldStore):=20=E5=90=8C=E6=AD=A5=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E6=A0=8F=E5=BD=93=E6=9C=80=E5=A4=A7=E7=94=9F=E5=91=BD?= =?UTF-8?q?=E5=80=BC=E5=8F=98=E5=8C=96=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit refactor(Feeds): 调整鸡蛋属性和消耗资源 - 提升鸡蛋品质为4 - 移除字段1及其效果 - 调整消耗资源和数量 feat(Feeds): 新增咸亨记账簿道具 - 添加新道具HXD - 设置基础属性和武器 refactor(Characters): 移除Rooster中的HXD武器 --- components/Characters/Rooster.tscn | 5 +---- components/Feeds/A-HXD.tscn | 22 ++++++++++++++++++++++ components/Feeds/Egg.tscn | 12 ++++++------ scripts/Tools/FieldStore.gd | 5 +++-- 4 files changed, 32 insertions(+), 12 deletions(-) create mode 100644 components/Feeds/A-HXD.tscn diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index a6c408c..491996f 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -1,8 +1,7 @@ -[gd_scene load_steps=13 format=3 uid="uid://dky8574uqc18r"] +[gd_scene load_steps=12 format=3 uid="uid://dky8574uqc18r"] [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_e5pl8"] [ext_resource type="Script" uid="uid://cthtupc6dtbav" path="res://scripts/Contents/Characters/Rooster.gd" id="2_oqdqd"] -[ext_resource type="PackedScene" uid="uid://bm5sw6mr71acq" path="res://components/Weapons/HXD.tscn" id="3_da2ca"] [ext_resource type="AudioStream" uid="uid://cdrevrq7n6yqa" path="res://resources/sounds/effect/Boing.mp3" id="4_66s6c"] [ext_resource type="AudioStream" uid="uid://benyec5bqni0b" path="res://resources/sounds/effect/Chomp.wav" id="4_k0yme"] [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"] @@ -58,8 +57,6 @@ metadata/_edit_vertical_guides_ = [71.0] [node name="weaponStore" parent="." index="1"] process_mode = 4 -[node name="HXD" parent="weaponStore" index="0" instance=ExtResource("3_da2ca")] - [node name="sprint" parent="sounds" index="0"] stream = ExtResource("4_66s6c") diff --git a/components/Feeds/A-HXD.tscn b/components/Feeds/A-HXD.tscn new file mode 100644 index 0000000..0ce0d78 --- /dev/null +++ b/components/Feeds/A-HXD.tscn @@ -0,0 +1,22 @@ +[gd_scene load_steps=4 format=3 uid="uid://dhf3vh6vumsv4"] + +[ext_resource type="PackedScene" uid="uid://bykwevnv7keeh" path="res://components/Abstracts/FeedCardBase.tscn" id="1_laabr"] +[ext_resource type="Texture2D" uid="uid://cvvtr2mmwo18r" path="res://resources/weapons/HXD.png" id="2_785sm"] +[ext_resource type="PackedScene" uid="uid://bm5sw6mr71acq" path="res://components/Weapons/HXD.tscn" id="3_dcbvm"] + +[node name="HXD" instance=ExtResource("1_laabr")] +avatarTexture = ExtResource("2_785sm") +displayName = "咸亨记账簿" +quality = 2 +topic = 8 +fields = Array[int]([0]) +fieldValues = Array[float]([-25.0]) +weapons = Array[PackedScene]([ExtResource("3_dcbvm")]) + +[node name="avatar" parent="container/info" index="0"] +texture = ExtResource("2_785sm") + +[node name="name" parent="container/info" index="1"] +displayName = "咸亨记账簿" +quality = 2 +topic = 8 diff --git a/components/Feeds/Egg.tscn b/components/Feeds/Egg.tscn index 6237c4d..d035a85 100644 --- a/components/Feeds/Egg.tscn +++ b/components/Feeds/Egg.tscn @@ -6,17 +6,17 @@ [node name="Egg" instance=ExtResource("1_pda12")] avatarTexture = ExtResource("2_4crt5") displayName = "鸡蛋" -quality = 3 +quality = 4 topic = 3 -fields = Array[int]([3, 7, 1]) -fieldValues = Array[float]([1.0, -360.0, -0.45]) -costs = Array[int]([0, 1]) -costCounts = Array[int]([500, 300]) +fields = Array[int]([3, 7]) +fieldValues = Array[float]([2.0, -360.0]) +costs = Array[int]([2, 4]) +costCounts = Array[int]([5, 5]) [node name="avatar" parent="container/info" index="0"] texture = ExtResource("2_4crt5") [node name="name" parent="container/info" index="1"] displayName = "鸡蛋" -quality = 3 +quality = 4 topic = 3 diff --git a/scripts/Tools/FieldStore.gd b/scripts/Tools/FieldStore.gd index fb1b678..e05b96a 100644 --- a/scripts/Tools/FieldStore.gd +++ b/scripts/Tools/FieldStore.gd @@ -113,8 +113,9 @@ static var entityMinValueMap = { Entity.DAMAGE_MULTIPILER: 0.01 } static var entityApplier = { - Entity.MAX_HEALTH: func(entity, value): + Entity.MAX_HEALTH: func(entity: EntityBase, value): entity.health += value + entity.statebar.forceSync() return true , Entity.EXTRA_APPLE_MAX: func(entity, value): @@ -129,4 +130,4 @@ static var entityViewCastMap = { } static var entityNegativeFields: Array[Entity] = [ Entity.OFFSET_SHOOT -] \ No newline at end of file +]