diff --git a/components/Effects/CatBoom.tscn b/components/Effects/CatBoom.tscn index ae0da2d..eb21ff3 100644 --- a/components/Effects/CatBoom.tscn +++ b/components/Effects/CatBoom.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=11 format=3 uid="uid://b4y1kq7yger4h"] +[gd_scene load_steps=12 format=3 uid="uid://b4y1kq7yger4h"] [ext_resource type="PackedScene" uid="uid://bcvuuy2m0pke0" path="res://components/Abstracts/EffectBase.tscn" id="1_fwc1i"] +[ext_resource type="AudioStream" uid="uid://s2ves404aifr" path="res://resources/sounds/effect/catreflect.wav" id="2_pg5a4"] [sub_resource type="Curve" id="Curve_snh3o"] _data = [Vector2(0.6, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] @@ -48,6 +49,11 @@ color_initial_ramp = SubResource("GradientTexture1D_5ra8e") alpha_curve = SubResource("CurveTexture_tr6r8") [node name="CatBoom" instance=ExtResource("1_fwc1i")] +spawnSound = "spawn" + +[node name="spawn" parent="sounds" index="0"] +stream = ExtResource("2_pg5a4") +volume_db = 5.0 [node name="particles" parent="." index="1"] z_index = 1 diff --git a/components/Weapons/Meowmere.tscn b/components/Weapons/Meowmere.tscn index 22d4656..099c42f 100644 --- a/components/Weapons/Meowmere.tscn +++ b/components/Weapons/Meowmere.tscn @@ -1,8 +1,9 @@ -[gd_scene load_steps=4 format=3 uid="uid://frwt0fgrpskb"] +[gd_scene load_steps=5 format=3 uid="uid://frwt0fgrpskb"] [ext_resource type="PackedScene" uid="uid://ckq2cq6m23hq3" path="res://components/Abstracts/WeaponCardBase.tscn" id="1_xhgkg"] -[ext_resource type="Script" path="res://scripts/Contents/Weapons/Meowmere.gd" id="2_4rd12"] +[ext_resource type="Script" uid="uid://jr5idpte8epy" path="res://scripts/Contents/Weapons/Meowmere.gd" id="2_4rd12"] [ext_resource type="Texture2D" uid="uid://cwr2pud7h8o3e" path="res://resources/bullets/meowmere/Meowmere.webp" id="2_kiocs"] +[ext_resource type="AudioStream" uid="uid://cx203jnrkto4u" path="res://resources/sounds/effect/swordshoot.wav" id="4_hvtvi"] [node name="Meowmere" instance=ExtResource("1_xhgkg")] script = ExtResource("2_4rd12") @@ -12,8 +13,8 @@ quality = 2 typeTopic = 3 costBeachball = 600 store = { -"atk": 10, -"childatk": 12.5, +"atk": 5, +"childatk": 6.25, "count": 1.0, "reduce": 0.25 } @@ -24,12 +25,18 @@ storeType = { "reduce": 2 } descriptionTemplate = "发射$count只伤害以$reduce衰减的造成$childatk点伤害的[b]彩虹猫[/b]的同时挥舞造成$atk点伤害。" -needEnergy = 1.0 -cooldown = 200.0 +cooldown = 230.0 +debugRebuild = true + +[node name="attack" parent="sounds" index="0"] +stream = ExtResource("4_hvtvi") +volume_db = 10.0 [node name="avatar" parent="container/info" index="0"] texture = ExtResource("2_kiocs") +[node name="beachball" parent="container/info/infos" index="1"] +count = 600 [node name="name" parent="container/info" index="2"] displayName = "彩虹猫之刃" @@ -37,4 +44,4 @@ quality = 2 typeTopic = 3 [node name="description" parent="container" index="2"] -text = "[center]发射[color=cyan]1[/color]→[color=yellow]1[/color]只伤害以[color=cyan]25%[/color]→[color=yellow]23%[/color]衰减的造成[color=cyan]12[/color]→[color=yellow]28[/color]点伤害的[b]彩虹猫[/b]的同时挥舞造成[color=cyan]10[/color]→[color=yellow]13[/color]点伤害。[/center]" +text = "[center]发射[color=cyan]1[/color]只伤害以[color=cyan]25%[/color]衰减的造成[color=cyan]6[/color]点伤害的[b]彩虹猫[/b]的同时挥舞造成[color=cyan]5[/color]点伤害。[/center]" diff --git a/resources/sounds/effect/catreflect.wav b/resources/sounds/effect/catreflect.wav new file mode 100644 index 0000000..01d77a5 Binary files /dev/null and b/resources/sounds/effect/catreflect.wav differ diff --git a/resources/sounds/effect/catreflect.wav.import b/resources/sounds/effect/catreflect.wav.import new file mode 100644 index 0000000..e9054ad --- /dev/null +++ b/resources/sounds/effect/catreflect.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://s2ves404aifr" +path="res://.godot/imported/catreflect.wav-0b451bf767697f83bdfa7cbe4be37d93.sample" + +[deps] + +source_file="res://resources/sounds/effect/catreflect.wav" +dest_files=["res://.godot/imported/catreflect.wav-0b451bf767697f83bdfa7cbe4be37d93.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/resources/sounds/effect/swordshoot.wav b/resources/sounds/effect/swordshoot.wav new file mode 100644 index 0000000..183147b Binary files /dev/null and b/resources/sounds/effect/swordshoot.wav differ diff --git a/resources/sounds/effect/swordshoot.wav.import b/resources/sounds/effect/swordshoot.wav.import new file mode 100644 index 0000000..a8a20ac --- /dev/null +++ b/resources/sounds/effect/swordshoot.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://cx203jnrkto4u" +path="res://.godot/imported/swordshoot.wav-e4fdac70f59f6e86144b79f28e11dadc.sample" + +[deps] + +source_file="res://resources/sounds/effect/swordshoot.wav" +dest_files=["res://.godot/imported/swordshoot.wav-e4fdac70f59f6e86144b79f28e11dadc.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/scripts/Contents/Weapons/Meowmere.gd b/scripts/Contents/Weapons/Meowmere.gd index 60d76df..16f2008 100644 --- a/scripts/Contents/Weapons/Meowmere.gd +++ b/scripts/Contents/Weapons/Meowmere.gd @@ -2,9 +2,9 @@ extends Weapon func update(to, origin, _entity): - origin["atk"] += 3 * to * soulLevel + origin["atk"] += 1.5 * to * soulLevel origin["count"] = 1 * soulLevel - origin["childatk"] += 1.25 * origin["atk"] + origin["childatk"] = 1.25 * origin["atk"] origin["reduce"] /= 1 + 0.05 * to * soulLevel return origin func attack(entity: EntityBase): @@ -17,3 +17,4 @@ func attack(entity: EntityBase): if j is BulletBase: j.baseDamage = readStore("childatk") j.penerateDamageReduction = readStore("reduce") + return true