diff --git a/components/Characters/CyberCat.tscn b/components/Characters/CyberCat.tscn index 3666eb8..6af361f 100644 --- a/components/Characters/CyberCat.tscn +++ b/components/Characters/CyberCat.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_afsds"] [ext_resource type="Script" uid="uid://cnqdjw7i7noxk" path="res://scripts/Contents/Characters/CyberCat.gd" id="2_afsds"] -[ext_resource type="Texture2D" uid="uid://5o6446vmerf5" path="res://resources/bullets/yangyi/cat.jpg" id="3_afsds"] +[ext_resource type="Texture2D" uid="uid://d1ajua4r4tn2k" path="res://resources/characters/cybercat/cybercat.png" id="3_afsds"] [sub_resource type="SpriteFrames" id="SpriteFrames_vkls3"] animations = [{ diff --git a/components/Characters/Kernyr.tscn b/components/Characters/Kernyr.tscn index 9d8c032..7b4880a 100644 --- a/components/Characters/Kernyr.tscn +++ b/components/Characters/Kernyr.tscn @@ -2,7 +2,7 @@ [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_bha5j"] [ext_resource type="Script" uid="uid://m28dwfwmmhmh" path="res://scripts/Contents/Characters/Kernyr.gd" id="2_vkls3"] -[ext_resource type="Texture2D" uid="uid://d34vkibm8a5e7" path="res://resources/characters/kernyr/koshino.jpg" id="3_vkls3"] +[ext_resource type="Texture2D" uid="uid://bsffob0n8pgy6" path="res://resources/characters/kernyr/koshino.png" id="3_vkls3"] [sub_resource type="SpriteFrames" id="SpriteFrames_vkls3"] animations = [{ @@ -32,7 +32,7 @@ sprite_frames = SubResource("SpriteFrames_vkls3") [node name="staticBackground" parent="texture" index="0"] position = Vector2(0, -46) -scale = Vector2(0.3135416, 0.3135416) +scale = Vector2(0.399, 0.399) texture = ExtResource("3_vkls3") [node name="hitbox" parent="texture/hurtbox" index="0"] diff --git a/resources/characters/cybercat/cybercat.png b/resources/characters/cybercat/cybercat.png new file mode 100644 index 0000000..69f1b0a Binary files /dev/null and b/resources/characters/cybercat/cybercat.png differ diff --git a/resources/characters/cybercat/cybercat.png.import b/resources/characters/cybercat/cybercat.png.import new file mode 100644 index 0000000..d9d531e --- /dev/null +++ b/resources/characters/cybercat/cybercat.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://d1ajua4r4tn2k" +path="res://.godot/imported/cybercat.png-a8c58b6cb7cc9bafed292f38f09a7573.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/characters/cybercat/cybercat.png" +dest_files=["res://.godot/imported/cybercat.png-a8c58b6cb7cc9bafed292f38f09a7573.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/kernyr/koshino.png b/resources/characters/kernyr/koshino.png new file mode 100644 index 0000000..0697126 Binary files /dev/null and b/resources/characters/kernyr/koshino.png differ diff --git a/resources/characters/kernyr/koshino.png.import b/resources/characters/kernyr/koshino.png.import new file mode 100644 index 0000000..5bc9b82 --- /dev/null +++ b/resources/characters/kernyr/koshino.png.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bsffob0n8pgy6" +path="res://.godot/imported/koshino.png-57f692a7619a10c1de8d2cb269b2d491.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://resources/characters/kernyr/koshino.png" +dest_files=["res://.godot/imported/koshino.png-57f692a7619a10c1de8d2cb269b2d491.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/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd index 3a2fe96..4127e0a 100644 --- a/scripts/Contents/Wave.gd +++ b/scripts/Contents/Wave.gd @@ -49,8 +49,9 @@ static var WAVE_TESTBOSS_CHICK = [ Wave.create("Chick", 0, 0, true, 0, INF, 1), ] static var WAVE_JUSTJOKE = [ - Wave.create("Kernyr", 0, 0, true, 0, INF, 2), - Wave.create("CyberCat", 0, 0, true, 1, INF, 2) + Wave.create("Kernyr", 0, 0, true, 0, INF, 1), + Wave.create("CyberCat", 0, 0, true, 0, INF, 1), + Wave.create("Deepsea", 0, 0, true, 0, INF, 1) ] static var WAVE_MOWING = [ Wave.create("Hen", 15, 30, false, 0, INF, 1), @@ -60,7 +61,7 @@ static var WAVE_MOWING = [ ] static var WAVE_EMPTY = [] static var waveReleaseConfig = [WAVE_TESTBOSS_ALL, 1] -static var waveDebugConfig = [WAVE_TESTBOSS_ALL, 1] +static var waveDebugConfig = [WAVE_JUSTJOKE, 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]