diff --git a/components/Characters/Cat.tscn b/components/Characters/Cat.tscn index ba58e2d..59d734b 100644 --- a/components/Characters/Cat.tscn +++ b/components/Characters/Cat.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_hw4g4"] [ext_resource type="Texture2D" uid="uid://cs6se8dighfgj" path="res://resources/characters/cat/cat.png" id="2_q30ge"] [ext_resource type="Script" uid="uid://chmxghslo4kc4" path="res://scripts/Contents/Characters/Cat.gd" id="2_uo67a"] -[ext_resource type="AudioStream" uid="uid://d2ooclkk70rm0" path="res://resources/sounds/effect/Meow.wav" id="3_bglcc"] +[ext_resource type="AudioStream" uid="uid://c3duk5wy1o3c2" path="res://resources/sounds/effect/Chirp.wav" id="3_2o6vq"] [ext_resource type="AudioStream" uid="uid://chxpw0sprn4kj" path="res://resources/sounds/effect/Police Siren.wav" id="4_2o6vq"] [ext_resource type="AudioStream" uid="uid://b7pxuov1id0ho" path="res://resources/sounds/effect/Pew.mp3" id="4_rh5rn"] @@ -30,8 +30,8 @@ radius = 19.026299 script = ExtResource("2_uo67a") [node name="hurt" parent="sounds" index="3"] -stream = ExtResource("3_bglcc") -volume_db = -5.0 +stream = ExtResource("3_2o6vq") +volume_db = 3.0 [node name="die" parent="sounds" index="5"] stream = ExtResource("4_2o6vq") @@ -41,7 +41,6 @@ stream = ExtResource("4_rh5rn") [node name="texture" parent="." index="3"] sprite_frames = SubResource("SpriteFrames_uo67a") -animation = &"walk" [node name="staticBackground" parent="texture" index="0"] position = Vector2(0, -2) @@ -50,6 +49,7 @@ texture = ExtResource("2_q30ge") [node name="staticAnimation" parent="texture" index="1"] scale = Vector2(1, 1.289) +animation = &"idle" [node name="hitbox" parent="texture/hurtbox" index="0"] position = Vector2(-9.5, 5) diff --git a/components/Characters/Hen.tscn b/components/Characters/Hen.tscn index d959d33..a3d65c6 100644 --- a/components/Characters/Hen.tscn +++ b/components/Characters/Hen.tscn @@ -32,6 +32,7 @@ dropCounts = Array[Vector2]([Vector2(6, 12), Vector2(4, 8)]) [node name="hurt" parent="sounds" index="3"] stream = ExtResource("3_1stll") +volume_db = 10.0 [node name="texture" parent="." index="3"] sprite_frames = SubResource("SpriteFrames_xwexj") diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index ed0215e..4d78c8a 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -2,9 +2,7 @@ [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="Texture2D" uid="uid://fn8qx72clh38" path="res://resources/characters/cock/rooster-a.svg" id="2_q0j6j"] [ext_resource type="AudioStream" uid="uid://dclinyhu256xi" path="res://resources/sounds/effect/Low Whoosh.mp3" id="3_4syso"] -[ext_resource type="Texture2D" uid="uid://ci2ik43ce82uy" path="res://resources/characters/cock/rooster-b.svg" id="3_b0fgx"] [ext_resource type="PackedScene" uid="uid://c0n3igy4hucrg" path="res://components/Weapons/PurpleCrystal.tscn" id="3_jluqw"] [ext_resource type="AudioStream" uid="uid://cdrevrq7n6yqa" path="res://resources/sounds/effect/Boing.mp3" id="4_66s6c"] [ext_resource type="PackedScene" uid="uid://u0djqwuuysp8" path="res://components/Weapons/Volcano.tscn" id="4_jluqw"] @@ -12,35 +10,47 @@ [ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"] [ext_resource type="AudioStream" uid="uid://4wuuf1osk0yv" path="res://resources/sounds/effect/Low Boing.wav" id="6_m5px1"] [ext_resource type="AudioStream" uid="uid://b10u6iir6uvqn" path="res://resources/sounds/effect/BigLaser.wav" id="8_7dhim"] +[ext_resource type="Texture2D" uid="uid://x7ic6wm22jv4" path="res://resources/characters/cock/rooster.png" id="11_joj4g"] [sub_resource type="SpriteFrames" id="SpriteFrames_4v2ol"] animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("2_q0j6j") -}], +"frames": [], "loop": true, "name": &"idle", "speed": 1.0 }, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("2_q0j6j") -}, { -"duration": 1.0, -"texture": ExtResource("3_b0fgx") -}], +"frames": [], "loop": true, "name": &"walk", "speed": 3.0 }] +[sub_resource type="SpriteFrames" id="SpriteFrames_jluqw"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("11_joj4g") +}], +"loop": true, +"name": &"idle", +"speed": 5.0 +}, { +"frames": [{ +"duration": 1.0, +"texture": ExtResource("11_joj4g") +}], +"loop": true, +"name": &"walk", +"speed": 5.0 +}] + [sub_resource type="CircleShape2D" id="CircleShape2D_h1v0q"] -radius = 41.0122 +radius = 61.204575 [node name="Rooster" instance=ExtResource("1_e5pl8")] script = ExtResource("2_oqdqd") displayName = "公鸡" +useStatic = true metadata/_edit_horizontal_guides_ = [-139.0] metadata/_edit_vertical_guides_ = [58.0] @@ -69,7 +79,7 @@ stream = ExtResource("6_m5px1") [node name="attack1" type="AudioStreamPlayer2D" parent="sounds" index="5"] stream = ExtResource("8_7dhim") -[node name="attack0" parent="sounds" index="6"] +[node name="attack0" parent="sounds" index="7"] stream = ExtResource("3_4syso") [node name="texture" parent="." index="3"] @@ -77,13 +87,19 @@ position = Vector2(0, -70) sprite_frames = SubResource("SpriteFrames_4v2ol") animation = &"walk" +[node name="staticAnimation" parent="texture" index="1"] +position = Vector2(0, -24) +scale = Vector2(0.32309517, 0.32309517) +sprite_frames = SubResource("SpriteFrames_jluqw") +animation = &"walk" + [node name="hitbox" parent="texture/hurtbox" index="0"] -position = Vector2(0, 30) +position = Vector2(8, -28) shape = SubResource("CircleShape2D_h1v0q") [node name="normal" type="Node2D" parent="texture/weapons" index="0"] position = Vector2(54, -45) [node name="statebar" parent="." index="4" node_paths=PackedStringArray("entity")] -position = Vector2(0, -151) +position = Vector2(0, -202) entity = NodePath("..") diff --git a/resources/characters/cock/rooster.png b/resources/characters/cock/rooster.png new file mode 100644 index 0000000..bee1720 Binary files /dev/null and b/resources/characters/cock/rooster.png differ diff --git a/resources/characters/cock/rooster.png.import b/resources/characters/cock/rooster.png.import new file mode 100644 index 0000000..ed9d6cf --- /dev/null +++ b/resources/characters/cock/rooster.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://x7ic6wm22jv4" +path="res://.godot/imported/rooster.png-74c3540f2e7089da9c47579843ae2b98.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/characters/cock/rooster.png" +dest_files=["res://.godot/imported/rooster.png-74c3540f2e7089da9c47579843ae2b98.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 diff --git a/resources/sounds/effect/Chirp.wav b/resources/sounds/effect/Chirp.wav new file mode 100644 index 0000000..d19daad Binary files /dev/null and b/resources/sounds/effect/Chirp.wav differ diff --git a/resources/sounds/effect/Chirp.wav.import b/resources/sounds/effect/Chirp.wav.import new file mode 100644 index 0000000..0605fb0 --- /dev/null +++ b/resources/sounds/effect/Chirp.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://c3duk5wy1o3c2" +path="res://.godot/imported/Chirp.wav-73c78cd6c05e8c377bc6f7b8aa5c9c08.sample" + +[deps] + +source_file="res://resources/sounds/effect/Chirp.wav" +dest_files=["res://.godot/imported/Chirp.wav-73c78cd6c05e8c377bc6f7b8aa5c9c08.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/Characters/Cat.gd b/scripts/Contents/Characters/Cat.gd index f6f0504..59b95e4 100644 --- a/scripts/Contents/Characters/Cat.gd +++ b/scripts/Contents/Characters/Cat.gd @@ -4,8 +4,8 @@ class_name Maodie func register(): fields[FieldStore.Entity.MAX_HEALTH] = 75 fields[FieldStore.Entity.MOVEMENT_SPEED] = randf_range(0.5, 0.8) - attackCooldownMap[0] = randi_range(2500, 6000) - sprintMultiplier = 20 + attackCooldownMap[0] = randi_range(3500, 8000) + sprintMultiplier = randf_range(10, 35) func ai(): PresetEntityAI.follow(self, currentFocusedBoss) tryAttack(0, true)