From 1b737ac8aa4a0ab465c03b2f13dce5091c5e827f 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, 11 Apr 2026 09:48:08 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E8=A7=92=E8=89=B2):=20=E4=B8=BA=E8=B5=9B?= =?UTF-8?q?=E5=8D=9A=E7=8C=AB=E7=8C=AB=E5=92=8C=E6=B7=B1=E6=B5=B7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E6=8E=89=E8=90=BD=E7=89=A9=E5=93=81=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit feat(武器): 新增引力源武器及其资源文件 - 添加引力源武器的场景配置和SVG资源 - 包含引力源武器的物理效果和描述文本 fix(子弹): 调整紫色小水晶的穿透属性 - 将穿透值设为0.25 - 更新链式机枪的描述以反映穿透属性变化 refactor(角色): 移除公鸡角色的武器存储 - 删除公鸡角色中不再需要的武器实例 chore(关卡): 更新调试关卡配置 - 将waveDebugConfig改为使用WAVE_MOWING --- components/Bullets/PurpleCrystalSmall.tscn | 9 ++-- components/Characters/CyberCat.tscn | 2 + components/Characters/Deepsea.tscn | 2 + components/Characters/Rooster.tscn | 16 ------- components/Weapons/ChainGun.tscn | 11 ++++- components/Weapons/GravitySource.tscn | 47 +++++++++++++++++++++ resources/weapons/gravity-source.svg | 26 ++++++++++++ resources/weapons/gravity-source.svg.import | 43 +++++++++++++++++++ scripts/Contents/Wave.gd | 2 +- 9 files changed, 135 insertions(+), 23 deletions(-) create mode 100644 components/Weapons/GravitySource.tscn create mode 100644 resources/weapons/gravity-source.svg create mode 100644 resources/weapons/gravity-source.svg.import diff --git a/components/Bullets/PurpleCrystalSmall.tscn b/components/Bullets/PurpleCrystalSmall.tscn index 5be6d6c..6c5be2e 100644 --- a/components/Bullets/PurpleCrystalSmall.tscn +++ b/components/Bullets/PurpleCrystalSmall.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=6 format=3 uid="uid://c6wjncfsm2rxw"] +[gd_scene format=3 uid="uid://c6wjncfsm2rxw"] [ext_resource type="PackedScene" uid="uid://crtdkysmnkith" path="res://components/Abstracts/BulletBase.tscn" id="1_7tnrb"] [ext_resource type="Script" uid="uid://t1q1eq8fk0ro" path="res://scripts/Contents/Bullets/PurpleCrystal.gd" id="2_it0pa"] @@ -18,17 +18,18 @@ animations = [{ [sub_resource type="CircleShape2D" id="CircleShape2D_gdnkp"] radius = 5.0 -[node name="PurpleCrystalSmall" instance=ExtResource("1_7tnrb")] +[node name="PurpleCrystalSmall" unique_id=468411397 instance=ExtResource("1_7tnrb")] modulate = Color(1.5, 1.5, 1.5, 1) script = ExtResource("2_it0pa") displayName = "微型水晶" speed = 15.0 baseDamage = 1.0 +penerate = 0.25 lifeTime = 1000.0 -[node name="texture" parent="." index="0"] +[node name="texture" parent="." index="0" unique_id=162977358] scale = Vector2(0.6, 0.6) sprite_frames = SubResource("SpriteFrames_r86b3") -[node name="hitbox" parent="." index="1"] +[node name="hitbox" parent="." index="1" unique_id=175349408] shape = SubResource("CircleShape2D_gdnkp") diff --git a/components/Characters/CyberCat.tscn b/components/Characters/CyberCat.tscn index 6af361f..8baa0b4 100644 --- a/components/Characters/CyberCat.tscn +++ b/components/Characters/CyberCat.tscn @@ -20,6 +20,8 @@ animations = [{ [node name="CyberCat" unique_id=1689157073 instance=ExtResource("1_afsds")] script = ExtResource("2_afsds") displayName = "赛博猫猫" +drops = Array[int]([0, 1]) +dropCounts = Array[Vector2]([Vector2(50, 60), Vector2(10, 15)]) metadata/_edit_vertical_guides_ = [200.0] [node name="texture" parent="." index="3"] diff --git a/components/Characters/Deepsea.tscn b/components/Characters/Deepsea.tscn index 5c362ab..8e2d7c7 100644 --- a/components/Characters/Deepsea.tscn +++ b/components/Characters/Deepsea.tscn @@ -24,6 +24,8 @@ size = Vector2(165, 349) [node name="Deepsea" unique_id=1544856335 instance=ExtResource("1_g8my0")] script = ExtResource("2_1qdp4") displayName = "深海" +drops = Array[int]([0, 1]) +dropCounts = Array[Vector2]([Vector2(40, 80), Vector2(30, 60)]) [node name="attack1" type="AudioStreamPlayer2D" parent="sounds" index="7" unique_id=1216852444] stream = ExtResource("3_hk3hc") diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index 6250d1a..b547192 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -2,13 +2,9 @@ [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://bbrllsqjmx0ie" path="res://components/Weapons/DaoStatue.tscn" id="3_da2ca"] -[ext_resource type="PackedScene" uid="uid://cx7nogfnv7s8t" path="res://components/Weapons/Tree.tscn" id="4_0omr3"] [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="PackedScene" uid="uid://yq7vmijwvgx1" path="res://components/Weapons/AcidWind.tscn" id="5_jluqw"] [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"] -[ext_resource type="PackedScene" uid="uid://bm5sw6mr71acq" path="res://components/Weapons/HXD.tscn" id="6_fkh3f"] [ext_resource type="AudioStream" uid="uid://4wuuf1osk0yv" path="res://resources/sounds/effect/Low Boing.wav" id="6_m5px1"] [ext_resource type="Texture2D" uid="uid://fn8qx72clh38" path="res://resources/characters/cock/rooster-a.svg" id="8_da2ca"] [ext_resource type="Texture2D" uid="uid://ci2ik43ce82uy" path="res://resources/characters/cock/rooster-b.svg" id="9_0omr3"] @@ -104,18 +100,6 @@ process_material = SubResource("ParticleProcessMaterial_joj4g") [node name="weaponStore" parent="." index="2"] process_mode = 4 -[node name="DaoStatue" parent="weaponStore" index="0" unique_id=265403254 instance=ExtResource("3_da2ca")] -debugRebuild = false - -[node name="Tree" parent="weaponStore" index="1" unique_id=185228402 instance=ExtResource("4_0omr3")] -debugRebuild = false - -[node name="AcidWind" parent="weaponStore" index="2" unique_id=1072098623 instance=ExtResource("5_jluqw")] -debugRebuild = false - -[node name="HXD" parent="weaponStore" index="3" unique_id=1383383596 instance=ExtResource("6_fkh3f")] -debugRebuild = false - [node name="sprint" parent="sounds" index="0"] stream = ExtResource("4_66s6c") diff --git a/components/Weapons/ChainGun.tscn b/components/Weapons/ChainGun.tscn index db3a146..5730afe 100644 --- a/components/Weapons/ChainGun.tscn +++ b/components/Weapons/ChainGun.tscn @@ -20,10 +20,11 @@ storeType = { "count": 1, "split": 3 } -descriptionTemplate = "超高速发射$count个[b]微型水晶[/b]，可造成$atk点伤害，散射+$split。" +descriptionTemplate = "超高速发射$count个[b]微型水晶[/b]，可造成$atk点伤害，散射+$split，穿透+[color=yellow]25%[/color]。" sources = Array[String](["Terraria"]) needEnergy = 0.75 cooldown = 66.0 +debugRebuild = true [node name="attack" parent="sounds" parent_id_path=PackedInt32Array(1775425991) index="0" unique_id=853583292] stream = ExtResource("4_g38si") @@ -40,5 +41,11 @@ count = 400 [node name="name" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="0" unique_id=1576068972] displayName = "链式机枪" +[node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] +text = "Terraria" + [node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] -text = "[center]超高速发射[color=cyan]1[/color]个[b]微型水晶[/b]，可造成[color=cyan]5[/color]点伤害，散射+[color=cyan]15.0°[/color]。[/center]" +text = "[center]超高速发射[color=cyan]1[/color]个[b]微型水晶[/b]，可造成[color=cyan]5[/color]点伤害，散射+[color=cyan]15.0°[/color]，穿透+[color=yellow]25%[/color]。[/center]" + +[node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] +visible = false diff --git a/components/Weapons/GravitySource.tscn b/components/Weapons/GravitySource.tscn new file mode 100644 index 0000000..e0320d9 --- /dev/null +++ b/components/Weapons/GravitySource.tscn @@ -0,0 +1,47 @@ +[gd_scene format=3 uid="uid://cb68wvctxd4kx"] + +[ext_resource type="PackedScene" uid="uid://ckq2cq6m23hq3" path="res://components/Abstracts/WeaponCardBase.tscn" id="1_1lqmy"] +[ext_resource type="Texture2D" uid="uid://dbbd5ljkfvof8" path="res://resources/weapons/gravity-source.svg" id="2_r5y0x"] + +[node name="GravitySource" unique_id=2085048785 instance=ExtResource("1_1lqmy")] +avatarTexture = ExtResource("2_r5y0x") +displayName = "引力源" +store = { +"atk": 114514.0, +"m1": 10000.0, +"m2": 1.0 +} +storeType = { +"atk": 0 +} +descriptionTemplate = "使光标化身为[b]恒星[/b]产生强大引力，并吸引[color=yellow]1[/color]颗行星围绕其。移动恒星来使行星产生加速度，[color=yellow]行星速度越快撞击伤害越高[/color]。 +行星的速度太快会发生[color=red]逃逸[/color]， +撞上恒星后会[color=red]坠毁[/color]。 + +恒星质量：$m1，行星质量：$m2， +圆周运动初始半径：[color=yellow]100[/color]， +万有引力常数：$atk。" +sources = Array[String](["万有引力", "宇宙航行"]) +tease = "告诉我，逃逸速度是多少？！" +debugRebuild = true + +[node name="avatar" parent="container/info" parent_id_path=PackedInt32Array(1625294072) index="0" unique_id=1021985889] +texture = ExtResource("2_r5y0x") + +[node name="name" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="0" unique_id=1576068972] +displayName = "引力源" + +[node name="source" parent="container/info/displays" parent_id_path=PackedInt32Array(784441328) index="1" unique_id=365191794] +text = "万有引力 × 宇宙航行" + +[node name="description" parent="container" parent_id_path=PackedInt32Array(575698869) index="2" unique_id=566230682] +text = "[center]使光标化身为[b]恒星[/b]产生强大引力，并吸引[color=yellow]1[/color]颗行星围绕其。移动恒星来使行星产生加速度，[color=yellow]行星速度越快撞击伤害越高[/color]。 +行星的速度太快会发生[color=red]逃逸[/color]， +撞上恒星后会[color=red]坠毁[/color]。 + +恒星质量：[color=cyan]10000.00[/color]，行星质量：[color=cyan]1.00[/color]， +圆周运动初始半径：[color=yellow]100[/color]， +万有引力常数：[color=cyan]114514.00[/color]。[/center]" + +[node name="tease" parent="container" parent_id_path=PackedInt32Array(575698869) index="3" unique_id=689277044] +text = "“告诉我，逃逸速度是多少？！”" diff --git a/resources/weapons/gravity-source.svg b/resources/weapons/gravity-source.svg new file mode 100644 index 0000000..dac2f62 --- /dev/null +++ b/resources/weapons/gravity-source.svg @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/resources/weapons/gravity-source.svg.import b/resources/weapons/gravity-source.svg.import new file mode 100644 index 0000000..21a58d6 --- /dev/null +++ b/resources/weapons/gravity-source.svg.import @@ -0,0 +1,43 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://dbbd5ljkfvof8" +path="res://.godot/imported/gravity-source.svg-4080192372fa7c00781334c13cd9a26a.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/weapons/gravity-source.svg" +dest_files=["res://.godot/imported/gravity-source.svg-4080192372fa7c00781334c13cd9a26a.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 +svg/scale=1.0 +editor/scale_with_editor_scale=false +editor/convert_colors_with_editor_theme=false diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd index 235f7a1..77601b3 100644 --- a/scripts/Contents/Wave.gd +++ b/scripts/Contents/Wave.gd @@ -61,7 +61,7 @@ static var WAVE_MOWING = [ ] static var WAVE_EMPTY = [] static var waveReleaseConfig = [WAVE_TESTBOSS_ALL, 1] -static var waveDebugConfig = [WAVE_JUSTJOKE, 1] +static var waveDebugConfig = [WAVE_MOWING, 1] static var current: int = startWith(waveReleaseConfig[1]) if WorldManager.isRelease() else startWith(waveDebugConfig[1]) static var data = waveReleaseConfig[0] if WorldManager.isRelease() else waveDebugConfig[0]