1
1
mirror of https://github.com/Rundll86/Dog-Lynx-And-HCN.git synced 2026-05-28 06:51:54 +08:00

feat: 添加水晶着色器并更新角色资源

refactor: 调整角色动画和武器系统
style: 优化代码格式和注释
This commit is contained in:
2025-11-05 22:13:13 +08:00
parent c45a0e570b
commit e64a8b2f9f
109 changed files with 284 additions and 28 deletions
+13 -13
View File
@@ -1,6 +1,6 @@
[gd_scene load_steps=40 format=3 uid="uid://cvogxi7mktumf"]
[ext_resource type="Script" path="res://scripts/Statemachine/EntityBase.gd" id="1_mvol6"]
[ext_resource type="Script" uid="uid://ds3j3f82li68h" path="res://scripts/Statemachine/EntityBase.gd" id="1_mvol6"]
[ext_resource type="Texture2D" uid="uid://dwwpkn4q07ja2" path="res://icon.svg" id="2_7lpu0"]
[ext_resource type="AudioStream" uid="uid://cn876dtp1ypqx" path="res://resources/sounds/effect/Collect.wav" id="2_qt0aq"]
[ext_resource type="PackedScene" uid="uid://dcjqjqere8ets" path="res://components/UI/EntityStateBar.tscn" id="2_uje1g"]
@@ -71,9 +71,9 @@ tracks/0/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_daot2"]
_data = {
"RESET": SubResource("Animation_sxh2u"),
"left": SubResource("Animation_vxanw"),
"right": SubResource("Animation_nuh11")
&"RESET": SubResource("Animation_sxh2u"),
&"left": SubResource("Animation_vxanw"),
&"right": SubResource("Animation_nuh11")
}
[sub_resource type="AnimationNodeAnimation" id="AnimationNodeAnimation_ao5k4"]
@@ -165,8 +165,8 @@ tracks/2/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_kbmff"]
_data = {
"RESET": SubResource("Animation_3wcjn"),
"hurt": SubResource("Animation_wl2we")
&"RESET": SubResource("Animation_3wcjn"),
&"hurt": SubResource("Animation_wl2we")
}
[sub_resource type="Animation" id="Animation_n7kxn"]
@@ -281,9 +281,9 @@ tracks/2/keys = {
[sub_resource type="AnimationLibrary" id="AnimationLibrary_vvkcp"]
_data = {
"RESET": SubResource("Animation_n7kxn"),
"enter": SubResource("Animation_lg0kn"),
"exit": SubResource("Animation_nfj4q")
&"RESET": SubResource("Animation_n7kxn"),
&"enter": SubResource("Animation_lg0kn"),
&"exit": SubResource("Animation_nfj4q")
}
[sub_resource type="Curve" id="Curve_cs3iy"]
@@ -410,7 +410,7 @@ shape = SubResource("CircleShape2D_buhm1")
[node name="animator" type="AnimationPlayer" parent="texture"]
unique_name_in_owner = true
libraries = {
"": SubResource("AnimationLibrary_daot2")
&"": SubResource("AnimationLibrary_daot2")
}
[node name="animatree" type="AnimationTree" parent="texture/animator"]
@@ -423,13 +423,13 @@ parameters/blend_position = 1.36
[node name="hurtAnimator" type="AnimationPlayer" parent="texture"]
unique_name_in_owner = true
libraries = {
"": SubResource("AnimationLibrary_kbmff")
&"": SubResource("AnimationLibrary_kbmff")
}
[node name="stageAnimator" type="AnimationPlayer" parent="texture"]
unique_name_in_owner = true
libraries = {
"": SubResource("AnimationLibrary_vvkcp")
&"": SubResource("AnimationLibrary_vvkcp")
}
[node name="weapons" type="Node2D" parent="texture"]
@@ -445,9 +445,9 @@ process_material = SubResource("ParticleProcessMaterial_kndb2")
unique_name_in_owner = true
emitting = false
amount = 100
process_material = SubResource("ParticleProcessMaterial_f3xas")
one_shot = true
explosiveness = 1.0
process_material = SubResource("ParticleProcessMaterial_f3xas")
[node name="statebar" parent="." instance=ExtResource("2_uje1g")]
unique_name_in_owner = true
+6 -9
View File
@@ -1,21 +1,20 @@
[gd_scene load_steps=12 format=3 uid="uid://b0ncrvm8u4pox"]
[gd_scene load_steps=11 format=3 uid="uid://b0ncrvm8u4pox"]
[ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_goqmy"]
[ext_resource type="Script" path="res://scripts/Contents/Characters/Chick.gd" id="2_r6bub"]
[ext_resource type="Texture2D" uid="uid://7pkplcqqxvnp" path="res://resources/characters/chick/chick-a.svg" id="2_syddq"]
[ext_resource type="Texture2D" uid="uid://dj5dvqb8gsedr" path="res://resources/characters/chick/chick-b.svg" id="3_064jv"]
[ext_resource type="Script" uid="uid://b2gg1fh0bflu7" path="res://scripts/Contents/Characters/Chick.gd" id="2_r6bub"]
[ext_resource type="AudioStream" uid="uid://b7pxuov1id0ho" path="res://resources/sounds/effect/Pew.mp3" id="3_ik1xf"]
[ext_resource type="AudioStream" uid="uid://bgo8p1l77xrbe" path="res://resources/sounds/effect/Magic Spell.wav" id="4_2qabh"]
[ext_resource type="AudioStream" uid="uid://b10u6iir6uvqn" path="res://resources/sounds/effect/BigLaser.wav" id="4_mrsne"]
[ext_resource type="AudioStream" uid="uid://cee6rxv2uqynh" path="res://resources/sounds/effect/Flame.ogg" id="5_vcsbb"]
[ext_resource type="PackedScene" uid="uid://dny25qkcvtaa2" path="res://components/Effects/FirePot.tscn" id="6_kvx3n"]
[ext_resource type="AudioStream" uid="uid://dn6bijr513wyp" path="res://resources/sounds/effect/Drum Boing.wav" id="7_qjhwc"]
[ext_resource type="Texture2D" uid="uid://k0hcr5u2xlk6" path="res://resources/characters/chick/fox.png" id="8_k8ox8"]
[sub_resource type="SpriteFrames" id="SpriteFrames_xji3d"]
animations = [{
"frames": [{
"duration": 1.0,
"texture": ExtResource("2_syddq")
"texture": ExtResource("8_k8ox8")
}],
"loop": true,
"name": &"idle",
@@ -23,10 +22,7 @@ animations = [{
}, {
"frames": [{
"duration": 1.0,
"texture": ExtResource("2_syddq")
}, {
"duration": 1.0,
"texture": ExtResource("3_064jv")
"texture": ExtResource("8_k8ox8")
}],
"loop": true,
"name": &"walk",
@@ -60,6 +56,7 @@ stream = ExtResource("7_qjhwc")
[node name="texture" parent="." index="2"]
position = Vector2(0, -37)
sprite_frames = SubResource("SpriteFrames_xji3d")
animation = &"walk"
[node name="normal" type="Node2D" parent="texture/weapons" index="0"]
position = Vector2(30, -12)
+12 -2
View File
@@ -1,7 +1,7 @@
[gd_scene load_steps=15 format=3 uid="uid://bm7ymrri6pykb"]
[gd_scene load_steps=18 format=3 uid="uid://bm7ymrri6pykb"]
[ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_e5pl8"]
[ext_resource type="Script" path="res://scripts/Contents/Characters/Rooster.gd" id="2_oqdqd"]
[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"]
@@ -9,8 +9,11 @@
[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://bb1uh8k7gkhr7" path="res://components/Weapons/VectorStar.tscn" id="4_omfco"]
[ext_resource type="PackedScene" uid="uid://cxabqjo7skxev" path="res://components/Weapons/BigLaser.tscn" id="5_jpf7h"]
[ext_resource type="AudioStream" uid="uid://dmxh3bpk8vyy5" path="res://resources/sounds/effect/Coin.mp3" id="5_xnbhq"]
[ext_resource type="PackedScene" uid="uid://b2qhes4apaxsj" path="res://components/Weapons/NuclearBomb.tscn" id="6_ldigc"]
[ext_resource type="AudioStream" uid="uid://4wuuf1osk0yv" path="res://resources/sounds/effect/Low Boing.wav" id="6_m5px1"]
[ext_resource type="PackedScene" uid="uid://frwt0fgrpskb" path="res://components/Weapons/Meowmere.tscn" id="7_u4w6u"]
[ext_resource type="AudioStream" uid="uid://b10u6iir6uvqn" path="res://resources/sounds/effect/BigLaser.wav" id="8_7dhim"]
[sub_resource type="SpriteFrames" id="SpriteFrames_4v2ol"]
@@ -50,6 +53,13 @@ debugRebuild = false
[node name="VectorStar" parent="weaponStore" index="1" instance=ExtResource("4_omfco")]
[node name="BigLaser" parent="weaponStore" index="2" instance=ExtResource("5_jpf7h")]
[node name="NuclearBomb" parent="weaponStore" index="3" instance=ExtResource("6_ldigc")]
debugRebuild = false
[node name="Meowmere" parent="weaponStore" index="4" instance=ExtResource("7_u4w6u")]
[node name="sprint" parent="sounds" index="0"]
stream = ExtResource("4_66s6c")
+1 -1
View File
@@ -12,7 +12,7 @@ config_version=5
config/name="ChickenVSBear"
run/main_scene="res://components/Scenes/World.tscn"
config/features=PackedStringArray("4.3", "GL Compatibility")
config/features=PackedStringArray("4.5", "GL Compatibility")
config/icon="res://icon.svg"
[display]
Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

+40
View File
@@ -0,0 +1,40 @@
[remap]
importer="texture"
type="CompressedTexture2D"
uid="uid://k0hcr5u2xlk6"
path="res://.godot/imported/fox.png-4f35dda7835b4b99df8da1b16cc06ef1.ctex"
metadata={
"vram_texture": false
}
[deps]
source_file="res://resources/characters/chick/fox.png"
dest_files=["res://.godot/imported/fox.png-4f35dda7835b4b99df8da1b16cc06ef1.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
+1
View File
@@ -0,0 +1 @@
uid://cvlclu7l8ule7
+1
View File
@@ -0,0 +1 @@
uid://bom1pho1ivw1h
+1
View File
@@ -0,0 +1 @@
uid://b74jed1hoi0r6
@@ -0,0 +1 @@
uid://dqeyybijpnr7d
@@ -0,0 +1 @@
uid://crbn487ovawao
@@ -0,0 +1 @@
uid://c3kvunlhwbwlu
@@ -0,0 +1 @@
uid://s4x12fc67qyf
@@ -0,0 +1 @@
uid://fbrwaknikai8
+1
View File
@@ -0,0 +1 @@
uid://byf2b31r0dwh0
@@ -0,0 +1 @@
uid://nygobyigq5sp
@@ -0,0 +1 @@
uid://c2cw6tei72cv7
+1
View File
@@ -0,0 +1 @@
uid://d3bvwks7ty3af
+1
View File
@@ -0,0 +1 @@
uid://dlg4g03ppdd2x
@@ -0,0 +1 @@
uid://b1y68fg5fwdnj
+1
View File
@@ -0,0 +1 @@
uid://dhv4nd02hoolr
@@ -0,0 +1 @@
uid://dm3ftlkrogh8p
@@ -0,0 +1 @@
uid://cvkucdol0sl2l
+1
View File
@@ -0,0 +1 @@
uid://bpqqhog5853f6
@@ -0,0 +1 @@
uid://t1q1eq8fk0ro
@@ -0,0 +1 @@
uid://cqljq5nyy7sgu
@@ -0,0 +1 @@
uid://tkgkjb7v65j8
+1
View File
@@ -0,0 +1 @@
uid://bw3j6376wbsm
+1
View File
@@ -0,0 +1 @@
uid://bc2jvevaic06f
@@ -0,0 +1 @@
uid://cscu6wr43h3ky
@@ -0,0 +1 @@
uid://iylhd18nf5a1
+1
View File
@@ -0,0 +1 @@
uid://cgmnlpa2w6n72
+1
View File
@@ -0,0 +1 @@
uid://b2gg1fh0bflu7
+1
View File
@@ -0,0 +1 @@
uid://dsfht8qodraln
@@ -0,0 +1 @@
uid://cnkiruxkx0qgu
@@ -0,0 +1 @@
uid://cekuqnfohprpb
@@ -0,0 +1 @@
uid://cthtupc6dtbav
+1
View File
@@ -0,0 +1 @@
uid://bub7ku5qf2tpo
+1
View File
@@ -0,0 +1 @@
uid://cegfj4bplbf08
+1
View File
@@ -0,0 +1 @@
uid://ba0tgtpjp34k8
+1
View File
@@ -0,0 +1 @@
uid://codlmfbuyis33
@@ -0,0 +1 @@
uid://bm4drvag20frp
+3 -3
View File
@@ -8,7 +8,7 @@ var from: float = 0
var to: float = 0
var per: int = 0
static var current: int = 0
static var current: int = 9
static var WAVE_NORMAL = [
Wave.create("Hen", 1, 5, false, 0, INF, 1),
Wave.create("Chick", 0, 0, true, 9, INF, 15),
@@ -17,8 +17,8 @@ static var WAVE_NORMAL = [
]
static var WAVE_TESTBOSS_ALL = [
Wave.create("Chick", 0, 0, true, 0, INF, 10),
Wave.create("KukeMC", 0, 0, true, 0, INF, 10),
Wave.create("Bear", 0, 0, true, 0, INF, 10),
Wave.create("KukeMC", 0, 0, true, 1, INF, 10),
Wave.create("Bear", 0, 0, true, 2, INF, 10),
]
static var WAVE_TESTBOSS_KUKE = [
Wave.create("KukeMC", 0, 0, true, 0, INF, 10),
+1
View File
@@ -0,0 +1 @@
uid://c1x041e7oefs3
+1
View File
@@ -0,0 +1 @@
uid://dx3ctln16ynbl
+1
View File
@@ -0,0 +1 @@
uid://dev0urlc13rxc
@@ -0,0 +1 @@
uid://cj72d1ckmojex
+1
View File
@@ -0,0 +1 @@
uid://jr5idpte8epy
@@ -0,0 +1 @@
uid://bmmf864uc3atu
@@ -0,0 +1 @@
uid://ctjdfkr4sef7y
@@ -0,0 +1 @@
uid://cfgdvytfnwe8l
@@ -0,0 +1 @@
uid://bxcyflpnuajnn
@@ -0,0 +1 @@
uid://bqalhq6akgpoc
@@ -0,0 +1 @@
uid://cyvl1b2trt25e
+1
View File
@@ -0,0 +1 @@
uid://y551ijop8ydy
+1
View File
@@ -0,0 +1 @@
uid://c15otrxi5wdhn
+1
View File
@@ -0,0 +1 @@
uid://b0joqfmviyewf
+1
View File
@@ -0,0 +1 @@
uid://bxwgt7rlke3xf
+1
View File
@@ -0,0 +1 @@
uid://dp7c02tob106n
+1
View File
@@ -0,0 +1 @@
uid://dpai3dqenq645
+1
View File
@@ -0,0 +1 @@
uid://be7b037tpuy7x
@@ -0,0 +1 @@
uid://cmfnvbmbf87cr
+1
View File
@@ -0,0 +1 @@
uid://bwccqf6qw7wxr
@@ -0,0 +1 @@
uid://0iwnvhdh645p
+1
View File
@@ -104,6 +104,7 @@ var currentStage: int = 0
var spawnTime: float = 0
func _ready():
var peer=ENetMultiplayerPeer.new()
spawnTime = WorldManager.getTime()
register()
var selfStatebar: EntityStateBar = $"%statebar"
+1
View File
@@ -0,0 +1 @@
uid://ds3j3f82li68h
@@ -0,0 +1 @@
uid://cvrkf1f5ke6rh
+1
View File
@@ -0,0 +1 @@
uid://qllscdsldcpq
+1
View File
@@ -0,0 +1 @@
uid://cosrwhfwqba7c
@@ -0,0 +1 @@
uid://ddrkjfd6utfej
+1
View File
@@ -0,0 +1 @@
uid://cfxrtel5gjia0
+1
View File
@@ -0,0 +1 @@
uid://cl2orf01mb827
+1
View File
@@ -0,0 +1 @@
uid://clyli5ui8nysk
+1
View File
@@ -0,0 +1 @@
uid://cgb01lelfg73p
+1
View File
@@ -0,0 +1 @@
uid://bp8catom6i0ul
+1
View File
@@ -0,0 +1 @@
uid://btmuq7daclqig
+1
View File
@@ -0,0 +1 @@
uid://bph6blsdbiklk
@@ -0,0 +1 @@
uid://ck0k1md827tcn
+1
View File
@@ -0,0 +1 @@
uid://vjqqs3jvkd2b
+1
View File
@@ -0,0 +1 @@
uid://ohfsaaweoxpb
+1
View File
@@ -0,0 +1 @@
uid://nt81whieye7h
+1
View File
@@ -0,0 +1 @@
uid://c7odfwtug8ds4
+1
View File
@@ -0,0 +1 @@
uid://dayxiga661iiw
+1
View File
@@ -0,0 +1 @@
uid://dvievhvloal18
+1
View File
@@ -0,0 +1 @@
uid://dit53478a81kd
+1
View File
@@ -0,0 +1 @@
uid://ct2utx82wdtp
+1
View File
@@ -0,0 +1 @@
uid://bk06kpxr0k4rb
+1
View File
@@ -0,0 +1 @@
uid://exs0vgrq6wsc
+1
View File
@@ -0,0 +1 @@
uid://k7fu6idrqho8
+1
View File
@@ -0,0 +1 @@
uid://d1j3s7vpsndjt
@@ -0,0 +1 @@
uid://bs45p8w83d4b4
@@ -0,0 +1 @@
uid://bsj5oatiwbpan
@@ -0,0 +1 @@
uid://d2oyyyg0b4qqd
+1
View File
@@ -0,0 +1 @@
uid://dyhh71xntyj7n
+1
View File
@@ -0,0 +1 @@
uid://ds1yvfs414ni2
+1
View File
@@ -0,0 +1 @@
uid://c6nruemk8h1l
+1
View File
@@ -0,0 +1 @@
uid://d3aopn2f23pmi
+1
View File
@@ -0,0 +1 @@
uid://u6weu6llk46k
+1
View File
@@ -0,0 +1 @@
uid://dfd73rom161o4
+1
View File
@@ -0,0 +1 @@
uid://le5wwd7wfwnj

Some files were not shown because too many files have changed in this diff Show More