From 75adfed4547222d67cc234995de597c58159678c 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: Tue, 5 May 2026 14:46:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=92=E8=89=B2):=20=E4=B8=BA=E8=A7=92?= =?UTF-8?q?=E8=89=B2=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=AD=A6=E5=99=A8?= =?UTF-8?q?=E5=B9=B6=E8=B0=83=E6=95=B4=E6=AD=BB=E4=BA=A1=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 为HCN、Lynx和MuyangDog角色添加默认武器 移除发布模式下自动添加紫色水晶武器的逻辑 调整死亡逻辑，使召唤物也能被正确释放 --- components/Characters/HCN.tscn | 3 +++ components/Characters/Lynx.tscn | 3 +++ components/Characters/MuyangDog.tscn | 3 +++ scripts/Statemachine/EntityBase.gd | 3 +-- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/components/Characters/HCN.tscn b/components/Characters/HCN.tscn index 2d66663..8b9413d 100644 --- a/components/Characters/HCN.tscn +++ b/components/Characters/HCN.tscn @@ -2,7 +2,10 @@ [ext_resource type="PackedScene" uid="uid://bs863g2s8r770" path="res://components/Abstracts/PlayerBase.tscn" id="1_eeneu"] [ext_resource type="Script" uid="uid://bevc4f6apql4t" path="res://scripts/Contents/Characters/HCN.gd" id="2_f7uj3"] +[ext_resource type="PackedScene" uid="uid://wl8u5m52708w" path="res://components/Weapons/LGBT.tscn" id="3_2fpmn"] [node name="HCN" unique_id=1711205167 instance=ExtResource("1_eeneu")] script = ExtResource("2_f7uj3") displayName = "氰化氢" + +[node name="LGBT" parent="weaponStore" index="0" unique_id=1938660022 instance=ExtResource("3_2fpmn")] diff --git a/components/Characters/Lynx.tscn b/components/Characters/Lynx.tscn index 848e82d..c4952a2 100644 --- a/components/Characters/Lynx.tscn +++ b/components/Characters/Lynx.tscn @@ -2,7 +2,10 @@ [ext_resource type="PackedScene" uid="uid://bs863g2s8r770" path="res://components/Abstracts/PlayerBase.tscn" id="1_ns0m5"] [ext_resource type="Script" uid="uid://b8g0hkqvyeptg" path="res://scripts/Contents/Characters/Lynx.gd" id="2_d6nve"] +[ext_resource type="PackedScene" uid="uid://frwt0fgrpskb" path="res://components/Weapons/Meowmere.tscn" id="3_nitbu"] [node name="Lynx" unique_id=1711205167 instance=ExtResource("1_ns0m5")] script = ExtResource("2_d6nve") displayName = "猞猁" + +[node name="Meowmere" parent="weaponStore" index="0" unique_id=1965287972 instance=ExtResource("3_nitbu")] diff --git a/components/Characters/MuyangDog.tscn b/components/Characters/MuyangDog.tscn index cfd1ff0..29217b2 100644 --- a/components/Characters/MuyangDog.tscn +++ b/components/Characters/MuyangDog.tscn @@ -2,7 +2,10 @@ [ext_resource type="PackedScene" uid="uid://bs863g2s8r770" path="res://components/Abstracts/PlayerBase.tscn" id="1_y3l4w"] [ext_resource type="Script" uid="uid://bbmb572iba42l" path="res://scripts/Contents/Characters/MuyangDog.gd" id="2_mr6nm"] +[ext_resource type="PackedScene" uid="uid://u0djqwuuysp8" path="res://components/Weapons/Volcano.tscn" id="3_e236u"] [node name="MuyangDog" unique_id=1711205167 instance=ExtResource("1_y3l4w")] script = ExtResource("2_mr6nm") displayName = "牧羊犬" + +[node name="Volcano" parent="weaponStore" index="0" unique_id=204992396 instance=ExtResource("3_e236u")] diff --git a/scripts/Statemachine/EntityBase.gd b/scripts/Statemachine/EntityBase.gd index ad99243..e093dd8 100644 --- a/scripts/Statemachine/EntityBase.gd +++ b/scripts/Statemachine/EntityBase.gd @@ -139,7 +139,6 @@ func _ready(): if WorldManager.isRelease(): for i in weaponStore.get_children(): i.queue_free() - weaponStore.add_child(ComponentManager.getWeapon("PurpleCrystal").instantiate()) for i in weaponStore.get_children(): i.hide() weapons.append(i) @@ -448,7 +447,7 @@ func tryDie(by: BulletBase = null): UIState.showTip("[b]%s[/b] 已被打败！" % displayName, TipBox.MessageType.CONGRATULATION) elif isPlayer(): UIState.showTip("[b]%s[/b] 似了😭。" % displayName, TipBox.MessageType.ERROR) - if !isPlayer(): + if !isPlayer() || isSummon(): queue_free() func tryHeal(count: float): playSound("heal")