diff --git a/components/Characters/Cat.tscn b/components/Characters/Cat.tscn index e6e1918..d678dac 100644 --- a/components/Characters/Cat.tscn +++ b/components/Characters/Cat.tscn @@ -37,6 +37,7 @@ radius = 19.026299 [node name="Cat" instance=ExtResource("1_hw4g4")] script = ExtResource("2_uo67a") displayName = "猫" +hurtAudioRate = 0.1 [node name="hurt" parent="sounds" index="3"] stream = ExtResource("3_2o6vq") diff --git a/components/Characters/Dog.tscn b/components/Characters/Dog.tscn index b6dc363..b0d1521 100644 --- a/components/Characters/Dog.tscn +++ b/components/Characters/Dog.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_cbgnh"] [ext_resource type="Texture2D" uid="uid://cew1kecisufy4" path="res://resources/characters/dog/hsq.png" id="2_oospf"] [ext_resource type="Script" uid="uid://soehdxfbpmc0" path="res://scripts/Contents/Characters/Dog.gd" id="2_pb36u"] -[ext_resource type="AudioStream" uid="uid://cgnqvldnkxjtr" path="res://resources/sounds/effect/doghurt2.wav" id="3_tn3v8"] +[ext_resource type="AudioStream" uid="uid://llx2exxpf6k6" path="res://resources/sounds/effect/Dog1.wav" id="3_tn3v8"] [sub_resource type="SpriteFrames" id="SpriteFrames_pb36u"] animations = [{ @@ -38,7 +38,7 @@ radius = 27.018513 [node name="Dog" instance=ExtResource("1_cbgnh")] script = ExtResource("2_pb36u") displayName = "哈士奇" -hurtAudioRate = 0.3 +hurtAudioRate = 0.1 [node name="hurt" parent="sounds" index="3"] stream = ExtResource("3_tn3v8") diff --git a/components/Characters/Hen.tscn b/components/Characters/Hen.tscn index a3d65c6..278a079 100644 --- a/components/Characters/Hen.tscn +++ b/components/Characters/Hen.tscn @@ -3,7 +3,7 @@ [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_twxai"] [ext_resource type="Script" uid="uid://dsfht8qodraln" path="res://scripts/Contents/Characters/Hen.gd" id="2_8u5a0"] [ext_resource type="AudioStream" uid="uid://cougu5tprpf8d" path="res://resources/sounds/effect/Growl.wav" id="3_1stll"] -[ext_resource type="Texture2D" uid="uid://ylvq4hek5qem" path="res://resources/characters/hen/hsl.png" id="4_1stll"] +[ext_resource type="Texture2D" uid="uid://o0t3oma5l6tu" path="res://resources/characters/hen/hen.png" id="4_1stll"] [sub_resource type="SpriteFrames" id="SpriteFrames_xwexj"] animations = [{ @@ -19,7 +19,7 @@ animations = [{ }] [sub_resource type="RectangleShape2D" id="RectangleShape2D_1stll"] -size = Vector2(114.5, 43) +size = Vector2(85.25, 46.5) [sub_resource type="CircleShape2D" id="CircleShape2D_rwj47"] radius = 19.026299 @@ -29,6 +29,7 @@ script = ExtResource("2_8u5a0") displayName = "母鸡" drops = Array[int]([0, 1]) dropCounts = Array[Vector2]([Vector2(6, 12), Vector2(4, 8)]) +hurtAudioRate = 0.1 [node name="hurt" parent="sounds" index="3"] stream = ExtResource("3_1stll") @@ -38,19 +39,19 @@ volume_db = 10.0 sprite_frames = SubResource("SpriteFrames_xwexj") [node name="staticBackground" parent="texture" index="0"] -scale = Vector2(-0.452, 0.452) +scale = Vector2(0.29643428, 0.29643428) texture = ExtResource("4_1stll") [node name="hitbox" parent="texture/hurtbox" index="0"] -position = Vector2(7, 4) +position = Vector2(-7.625, 2.25) shape = SubResource("RectangleShape2D_1stll") [node name="hitbox2" type="CollisionShape2D" parent="texture/hurtbox" index="1"] -position = Vector2(72, -28) +position = Vector2(37, -28) shape = SubResource("CircleShape2D_rwj47") [node name="normal" type="Node2D" parent="texture/weapons" index="0"] [node name="statebar" parent="." index="4" node_paths=PackedStringArray("entity")] -position = Vector2(0, -114) +position = Vector2(0, -107) entity = NodePath("..") diff --git a/components/Characters/KukeChild.tscn b/components/Characters/KukeChild.tscn index 497eba7..3219344 100644 --- a/components/Characters/KukeChild.tscn +++ b/components/Characters/KukeChild.tscn @@ -1,28 +1,25 @@ -[gd_scene load_steps=5 format=3 uid="uid://c5q7djx12phem"] +[gd_scene load_steps=6 format=3 uid="uid://c5q7djx12phem"] [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_3ohuq"] -[ext_resource type="Texture2D" uid="uid://lorraj4pe2lt" path="res://resources/characters/kukechild/KukeChild.png" id="2_7vbs6"] -[ext_resource type="Script" path="res://scripts/Contents/Characters/KukeChild.gd" id="2_ywxbd"] +[ext_resource type="Script" uid="uid://cnkiruxkx0qgu" path="res://scripts/Contents/Characters/KukeChild.gd" id="2_ywxbd"] +[ext_resource type="Texture2D" uid="uid://ds3k7aigfrghw" path="res://resources/characters/kukechild/huan.png" id="3_eg8un"] -[sub_resource type="SpriteFrames" id="SpriteFrames_5rcbd"] +[sub_resource type="SpriteFrames" id="SpriteFrames_lfsw4"] animations = [{ -"frames": [{ -"duration": 1.0, -"texture": ExtResource("2_7vbs6") -}], +"frames": [], "loop": true, "name": &"idle", "speed": 5.0 }, { -"frames": [{ -"duration": 1.0, -"texture": ExtResource("2_7vbs6") -}], +"frames": [], "loop": true, "name": &"walk", "speed": 5.0 }] +[sub_resource type="CircleShape2D" id="CircleShape2D_r35n4"] +radius = 84.05355 + [node name="KukeChild" instance=ExtResource("1_3ohuq")] script = ExtResource("2_ywxbd") displayName = "酷可小弟" @@ -30,11 +27,17 @@ displayName = "酷可小弟" [node name="collect" parent="sounds" index="4"] stream = null -[node name="texture" parent="." index="2"] -sprite_frames = SubResource("SpriteFrames_5rcbd") -animation = &"walk" +[node name="texture" parent="." index="3"] +sprite_frames = SubResource("SpriteFrames_lfsw4") + +[node name="staticBackground" parent="texture" index="0"] +scale = Vector2(0.2531443, 0.2531443) +texture = ExtResource("3_eg8un") + +[node name="hitbox" parent="texture/hurtbox" index="0"] +shape = SubResource("CircleShape2D_r35n4") [node name="normal" type="Node2D" parent="texture/weapons" index="0"] -[node name="statebar" parent="." index="3"] -position = Vector2(0, -125) +[node name="statebar" parent="." index="4"] +position = Vector2(0, -106) diff --git a/resources/characters/hen/hen.png b/resources/characters/hen/hen.png new file mode 100644 index 0000000..accbebc Binary files /dev/null and b/resources/characters/hen/hen.png differ diff --git a/resources/characters/hen/hen.png.import b/resources/characters/hen/hen.png.import new file mode 100644 index 0000000..573e6f9 --- /dev/null +++ b/resources/characters/hen/hen.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://o0t3oma5l6tu" +path="res://.godot/imported/hen.png-263ea48660bad3d9456a3b2b2c5a3eb9.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/characters/hen/hen.png" +dest_files=["res://.godot/imported/hen.png-263ea48660bad3d9456a3b2b2c5a3eb9.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/characters/kukechild/huan.png b/resources/characters/kukechild/huan.png new file mode 100644 index 0000000..6f6536e Binary files /dev/null and b/resources/characters/kukechild/huan.png differ diff --git a/resources/characters/kukechild/huan.png.import b/resources/characters/kukechild/huan.png.import new file mode 100644 index 0000000..c7d5ce9 --- /dev/null +++ b/resources/characters/kukechild/huan.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ds3k7aigfrghw" +path="res://.godot/imported/huan.png-f9ab1aa3fddd5df1186c6e924a104ae0.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/characters/kukechild/huan.png" +dest_files=["res://.godot/imported/huan.png-f9ab1aa3fddd5df1186c6e924a104ae0.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/Dog1.wav b/resources/sounds/effect/Dog1.wav new file mode 100644 index 0000000..e059305 Binary files /dev/null and b/resources/sounds/effect/Dog1.wav differ diff --git a/resources/sounds/effect/Dog1.wav.import b/resources/sounds/effect/Dog1.wav.import new file mode 100644 index 0000000..4263076 --- /dev/null +++ b/resources/sounds/effect/Dog1.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://llx2exxpf6k6" +path="res://.godot/imported/Dog1.wav-6367beb95854d7abfbd0a195c0c84690.sample" + +[deps] + +source_file="res://resources/sounds/effect/Dog1.wav" +dest_files=["res://.godot/imported/Dog1.wav-6367beb95854d7abfbd0a195c0c84690.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/KukeChild.gd b/scripts/Contents/Characters/KukeChild.gd index fa4ae6e..75ac187 100644 --- a/scripts/Contents/Characters/KukeChild.gd +++ b/scripts/Contents/Characters/KukeChild.gd @@ -4,7 +4,7 @@ class_name KukeChild var masterMine: KukeMC func register(): - fields[FieldStore.Entity.MAX_HEALTH] = 25 + fields[FieldStore.Entity.MAX_HEALTH] = 20 fields[FieldStore.Entity.MOVEMENT_SPEED] = 0.35 attackCooldownMap[0] = 100 attackCooldownMap[1] = 8000