diff --git a/components/Bullets/BossAttack/Bear/ArrowSeven.tscn b/components/Bullets/BossAttack/Bear/ArrowSeven.tscn index 5b0829f..24b3cb4 100644 --- a/components/Bullets/BossAttack/Bear/ArrowSeven.tscn +++ b/components/Bullets/BossAttack/Bear/ArrowSeven.tscn @@ -119,6 +119,7 @@ scale_curve = SubResource("CurveTexture_i5kg3") alpha_curve = SubResource("CurveTexture_wjo54") [node name="ArrowSeven" instance=ExtResource("1_dvf35")] +z_index = 1 position = Vector2(-34, -24) script = ExtResource("2_uqsop") allColor = SubResource("GradientTexture1D_e0qv5") diff --git a/components/Bullets/BossAttack/Bear/LightGun.tscn b/components/Bullets/BossAttack/Bear/LightGun.tscn index 0263ea1..9f09f27 100644 --- a/components/Bullets/BossAttack/Bear/LightGun.tscn +++ b/components/Bullets/BossAttack/Bear/LightGun.tscn @@ -48,6 +48,29 @@ tracks/2/keys = { "points": PackedFloat32Array(-1000, -0.25, 0, 0.25, 0), "times": PackedFloat32Array(0) } +tracks/3/type = "bezier" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("%sword:scale:y") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"handle_modes": PackedInt32Array(0), +"points": PackedFloat32Array(1, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0) +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("%hitbox:disabled") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 1, +"values": [false] +} [sub_resource type="Animation" id="Animation_oinqg"] resource_name = "destroy" @@ -108,6 +131,29 @@ tracks/2/keys = { "points": PackedFloat32Array(-1000, -0.25, 0, 0.25, 0, 1000, -0.25, 0, 0.25, 0), "times": PackedFloat32Array(2.5, 3) } +tracks/3/type = "bezier" +tracks/3/imported = false +tracks/3/enabled = true +tracks/3/path = NodePath("%sword:scale:y") +tracks/3/interp = 1 +tracks/3/loop_wrap = true +tracks/3/keys = { +"handle_modes": PackedInt32Array(0, 0, 0, 0), +"points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0, 1, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), +"times": PackedFloat32Array(0, 0.5, 2.75, 3) +} +tracks/4/type = "value" +tracks/4/imported = false +tracks/4/enabled = true +tracks/4/path = NodePath("%hitbox:disabled") +tracks/4/interp = 1 +tracks/4/loop_wrap = true +tracks/4/keys = { +"times": PackedFloat32Array(0, 2.5), +"transitions": PackedFloat32Array(1, 1), +"update": 1, +"values": [true, false] +} [sub_resource type="AnimationLibrary" id="AnimationLibrary_d5b1d"] _data = { diff --git a/components/Bullets/BossAttack/Bear/SunDance.tscn b/components/Bullets/BossAttack/Bear/SunDance.tscn index 3274b0e..8a55e6f 100644 --- a/components/Bullets/BossAttack/Bear/SunDance.tscn +++ b/components/Bullets/BossAttack/Bear/SunDance.tscn @@ -71,7 +71,7 @@ tracks/0/keys = { [sub_resource type="Animation" id="Animation_kmogx"] resource_name = "spawn" -length = 3.0 +length = 4.5 step = 0.1 tracks/0/type = "bezier" tracks/0/imported = false @@ -82,7 +82,7 @@ tracks/0/loop_wrap = true tracks/0/keys = { "handle_modes": PackedInt32Array(0, 0, 0, 0), "points": PackedFloat32Array(0.5, -0.25, 0, 0.25, 0, 2, -0.25, 0, 0.25, 0, 2, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0, 0.5, 2, 3) +"times": PackedFloat32Array(0, 0.5, 3.5, 4.5) } tracks/1/type = "bezier" tracks/1/imported = false @@ -93,7 +93,7 @@ tracks/1/loop_wrap = true tracks/1/keys = { "handle_modes": PackedInt32Array(0, 0, 0, 0), "points": PackedFloat32Array(0.5, -0.25, 0, 0.25, 0, 2, -0.25, 0, 0.25, 0, 2, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0, 0.5, 2, 3) +"times": PackedFloat32Array(0, 0.5, 3.5, 4.5) } tracks/2/type = "bezier" tracks/2/imported = false @@ -104,7 +104,7 @@ tracks/2/loop_wrap = true tracks/2/keys = { "handle_modes": PackedInt32Array(0, 0, 0, 0), "points": PackedFloat32Array(0, -0.25, 0, 0.25, 0, 0.2, -0.25, 0, 0.25, 0, 0.2, -0.25, 0, 0.25, 0, 0, -0.25, 0, 0.25, 0), -"times": PackedFloat32Array(0, 0.504665, 2.00467, 3) +"times": PackedFloat32Array(0, 0.504665, 3.50467, 4.5) } [sub_resource type="AnimationLibrary" id="AnimationLibrary_fv2s4"] diff --git a/components/Characters/Bear.tscn b/components/Characters/Bear.tscn index 6e42a26..3075e68 100644 --- a/components/Characters/Bear.tscn +++ b/components/Characters/Bear.tscn @@ -1,27 +1,22 @@ -[gd_scene load_steps=30 format=3 uid="uid://m60bwhdpbem8"] +[gd_scene load_steps=26 format=3 uid="uid://m60bwhdpbem8"] [ext_resource type="PackedScene" uid="uid://cvogxi7mktumf" path="res://components/Abstracts/EntityBase.tscn" id="1_3ves7"] [ext_resource type="Script" path="res://scripts/Contents/Characters/Bear.gd" id="2_kh2af"] -[ext_resource type="Texture2D" uid="uid://dmy5lfw3jy2u4" path="res://resources/characters/bear/bear-walk-a.svg" id="2_umdul"] [ext_resource type="AudioStream" uid="uid://dqhrycmnkwojq" path="res://resources/sounds/bossAttack/Bear/Arrow7.ogg" id="3_n5dji"] -[ext_resource type="Texture2D" uid="uid://dxlsg4p1xkqh0" path="res://resources/characters/bear/bear-walk-b.svg" id="3_o77du"] -[ext_resource type="Texture2D" uid="uid://cd5vnifacsc8t" path="res://resources/characters/bear/bear-walk-c.svg" id="4_encki"] [ext_resource type="AudioStream" uid="uid://bxks728nvv83c" path="res://resources/sounds/bossAttack/Bear/SunDance.ogg" id="4_meklc"] -[ext_resource type="Texture2D" uid="uid://dsgtjdeggris7" path="res://resources/characters/bear/bear-walk-d.svg" id="5_mvydi"] [ext_resource type="AudioStream" uid="uid://dhcm3pjj82xhg" path="res://resources/sounds/bossAttack/Bear/ForeverRainbow.ogg" id="5_vej16"] -[ext_resource type="Texture2D" uid="uid://d2mwi15jqmnek" path="res://resources/characters/bear/bear-walk-e.svg" id="6_rwuah"] [ext_resource type="AudioStream" uid="uid://cqh2yvwcy83gg" path="res://resources/sounds/bossAttack/Bear/Sprint.ogg" id="6_x3jmu"] [ext_resource type="AudioStream" uid="uid://ce8xjsh68momv" path="res://resources/sounds/bossAttack/Bear/Arrow7-2.ogg" id="7_0r2df"] -[ext_resource type="Texture2D" uid="uid://cli2fyulk3dsg" path="res://resources/characters/bear/bear-walk-f.svg" id="7_f0c6w"] -[ext_resource type="Texture2D" uid="uid://dadi3ud01bqxk" path="res://resources/characters/bear/bear-walk-g.svg" id="8_4c7bp"] [ext_resource type="AudioStream" uid="uid://dd18jfva1knwm" path="res://resources/sounds/bossAttack/Bear/LightGun.ogg" id="8_qagkm"] -[ext_resource type="Texture2D" uid="uid://017nthmejh3g" path="res://resources/characters/bear/bear-walk-h.svg" id="9_bcby1"] +[ext_resource type="Texture2D" uid="uid://b5e6ndswcmq48" path="res://resources/characters/bear/FurryR.jpg" id="10_m7811"] +[ext_resource type="Shader" path="res://shaders/RedTemprature.gdshader" id="12_j8sas"] +[ext_resource type="Texture2D" uid="uid://df6ly7iydtcwx" path="res://resources/characters/bear/FurryR-mask.png" id="13_v2sdb"] [sub_resource type="SpriteFrames" id="SpriteFrames_6tgxs"] animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("9_bcby1") +"texture": ExtResource("10_m7811") }], "loop": true, "name": &"idle", @@ -29,36 +24,15 @@ animations = [{ }, { "frames": [{ "duration": 1.0, -"texture": ExtResource("2_umdul") -}, { -"duration": 1.0, -"texture": ExtResource("3_o77du") -}, { -"duration": 1.0, -"texture": ExtResource("4_encki") -}, { -"duration": 1.0, -"texture": ExtResource("5_mvydi") -}, { -"duration": 1.0, -"texture": ExtResource("6_rwuah") -}, { -"duration": 1.0, -"texture": ExtResource("7_f0c6w") -}, { -"duration": 1.0, -"texture": ExtResource("8_4c7bp") -}, { -"duration": 1.0, -"texture": ExtResource("9_bcby1") +"texture": ExtResource("10_m7811") }], "loop": true, "name": &"walk", "speed": 5.0 }] -[sub_resource type="CircleShape2D" id="CircleShape2D_hekxf"] -radius = 114.215 +[sub_resource type="RectangleShape2D" id="RectangleShape2D_akdh6"] +size = Vector2(335, 344) [sub_resource type="Curve" id="Curve_u430e"] _data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), 0.0, 0.0, 0, 0] @@ -109,6 +83,9 @@ color_ramp = SubResource("GradientTexture1D_o57pq") color_initial_ramp = SubResource("GradientTexture1D_53df5") alpha_curve = SubResource("CurveTexture_4vlq0") +[sub_resource type="ShaderMaterial" id="ShaderMaterial_6h05p"] +shader = ExtResource("12_j8sas") + [node name="Bear" instance=ExtResource("1_3ves7")] script = ExtResource("2_kh2af") displayName = "狗熊" @@ -131,15 +108,16 @@ stream = ExtResource("7_0r2df") [node name="attack5" type="AudioStreamPlayer2D" parent="sounds" index="10"] stream = ExtResource("8_qagkm") +[node name="attack6" type="AudioStreamPlayer2D" parent="sounds" index="11"] +stream = ExtResource("8_qagkm") + [node name="texture" parent="." index="2"] position = Vector2(0, -80) sprite_frames = SubResource("SpriteFrames_6tgxs") -animation = &"walk" -frame = 3 -frame_progress = 0.835241 [node name="hitbox" parent="texture/hurtbox" index="0"] -shape = SubResource("CircleShape2D_hekxf") +position = Vector2(-2.5, -1) +shape = SubResource("RectangleShape2D_akdh6") [node name="normal" type="Node2D" parent="texture/weapons" index="0"] @@ -149,10 +127,14 @@ z_index = -1 emitting = false amount = 20 process_material = SubResource("ParticleProcessMaterial_5v3nj") -texture = ExtResource("2_umdul") +texture = ExtResource("10_m7811") + +[node name="mask" type="Sprite2D" parent="texture" index="7"] +material = SubResource("ShaderMaterial_6h05p") +texture = ExtResource("13_v2sdb") [node name="statebar" parent="." index="3"] -position = Vector2(0, -175) +position = Vector2(0, -284) [node name="movebox" parent="." index="4"] disabled = true diff --git a/resources/characters/bear/FurryR-mask.png b/resources/characters/bear/FurryR-mask.png new file mode 100644 index 0000000..6123065 Binary files /dev/null and b/resources/characters/bear/FurryR-mask.png differ diff --git a/resources/characters/bear/bear-walk-h.svg.import b/resources/characters/bear/FurryR-mask.png.import similarity index 59% rename from resources/characters/bear/bear-walk-h.svg.import rename to resources/characters/bear/FurryR-mask.png.import index d544522..eb9469d 100644 --- a/resources/characters/bear/bear-walk-h.svg.import +++ b/resources/characters/bear/FurryR-mask.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://017nthmejh3g" -path="res://.godot/imported/bear-walk-h.svg-fcb9aa15698478a6549cbc3aa462410c.ctex" +uid="uid://df6ly7iydtcwx" +path="res://.godot/imported/FurryR-mask.png-7ef07aa257a3542c582e940925964025.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://resources/characters/bear/bear-walk-h.svg" -dest_files=["res://.godot/imported/bear-walk-h.svg-fcb9aa15698478a6549cbc3aa462410c.ctex"] +source_file="res://resources/characters/bear/FurryR-mask.png" +dest_files=["res://.godot/imported/FurryR-mask.png-7ef07aa257a3542c582e940925964025.ctex"] [params] @@ -32,6 +32,3 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/resources/characters/bear/FurryR.jpg b/resources/characters/bear/FurryR.jpg new file mode 100644 index 0000000..8f3c45b Binary files /dev/null and b/resources/characters/bear/FurryR.jpg differ diff --git a/resources/characters/bear/bear-walk-a.svg.import b/resources/characters/bear/FurryR.jpg.import similarity index 59% rename from resources/characters/bear/bear-walk-a.svg.import rename to resources/characters/bear/FurryR.jpg.import index 9cb3e3a..a347386 100644 --- a/resources/characters/bear/bear-walk-a.svg.import +++ b/resources/characters/bear/FurryR.jpg.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dmy5lfw3jy2u4" -path="res://.godot/imported/bear-walk-a.svg-93fd083f00a295cc99fc33e0b9644b85.ctex" +uid="uid://b5e6ndswcmq48" +path="res://.godot/imported/FurryR.jpg-f305957108e2f1f86811a398be97c85f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://resources/characters/bear/bear-walk-a.svg" -dest_files=["res://.godot/imported/bear-walk-a.svg-93fd083f00a295cc99fc33e0b9644b85.ctex"] +source_file="res://resources/characters/bear/FurryR.jpg" +dest_files=["res://.godot/imported/FurryR.jpg-f305957108e2f1f86811a398be97c85f.ctex"] [params] @@ -32,6 +32,3 @@ process/hdr_as_srgb=false process/hdr_clamp_exposure=false process/size_limit=0 detect_3d/compress_to=1 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/resources/characters/bear/bear-walk-a.svg b/resources/characters/bear/bear-walk-a.svg deleted file mode 100644 index c03d218..0000000 --- a/resources/characters/bear/bear-walk-a.svg +++ /dev/null @@ -1,127 +0,0 @@ - - - - - bear-walk-a - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/characters/bear/bear-walk-b.svg b/resources/characters/bear/bear-walk-b.svg deleted file mode 100644 index 566c527..0000000 --- a/resources/characters/bear/bear-walk-b.svg +++ /dev/null @@ -1,129 +0,0 @@ - - - - - bear-walk-b - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/characters/bear/bear-walk-b.svg.import b/resources/characters/bear/bear-walk-b.svg.import deleted file mode 100644 index 5524b42..0000000 --- a/resources/characters/bear/bear-walk-b.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dxlsg4p1xkqh0" -path="res://.godot/imported/bear-walk-b.svg-dc22a923fe6e2415ad92fab16d813465.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resources/characters/bear/bear-walk-b.svg" -dest_files=["res://.godot/imported/bear-walk-b.svg-dc22a923fe6e2415ad92fab16d813465.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/resources/characters/bear/bear-walk-c.svg b/resources/characters/bear/bear-walk-c.svg deleted file mode 100644 index 9d25c20..0000000 --- a/resources/characters/bear/bear-walk-c.svg +++ /dev/null @@ -1,124 +0,0 @@ - - - - - bear-walk-c - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/characters/bear/bear-walk-c.svg.import b/resources/characters/bear/bear-walk-c.svg.import deleted file mode 100644 index 75fa73d..0000000 --- a/resources/characters/bear/bear-walk-c.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cd5vnifacsc8t" -path="res://.godot/imported/bear-walk-c.svg-abf6c5cda9669f0ae75e797667f235ff.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resources/characters/bear/bear-walk-c.svg" -dest_files=["res://.godot/imported/bear-walk-c.svg-abf6c5cda9669f0ae75e797667f235ff.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/resources/characters/bear/bear-walk-d.svg b/resources/characters/bear/bear-walk-d.svg deleted file mode 100644 index 41f0d93..0000000 --- a/resources/characters/bear/bear-walk-d.svg +++ /dev/null @@ -1,123 +0,0 @@ - - - - - bear-walk-d - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/characters/bear/bear-walk-d.svg.import b/resources/characters/bear/bear-walk-d.svg.import deleted file mode 100644 index c9cf370..0000000 --- a/resources/characters/bear/bear-walk-d.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dsgtjdeggris7" -path="res://.godot/imported/bear-walk-d.svg-b6e7957a7094ec492096a133e466fa52.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resources/characters/bear/bear-walk-d.svg" -dest_files=["res://.godot/imported/bear-walk-d.svg-b6e7957a7094ec492096a133e466fa52.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/resources/characters/bear/bear-walk-e.svg b/resources/characters/bear/bear-walk-e.svg deleted file mode 100644 index 6094498..0000000 --- a/resources/characters/bear/bear-walk-e.svg +++ /dev/null @@ -1,135 +0,0 @@ - - - - - bear-walk-e - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/characters/bear/bear-walk-e.svg.import b/resources/characters/bear/bear-walk-e.svg.import deleted file mode 100644 index 578798c..0000000 --- a/resources/characters/bear/bear-walk-e.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://d2mwi15jqmnek" -path="res://.godot/imported/bear-walk-e.svg-df8abec6a38d36c2076db4429144f119.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resources/characters/bear/bear-walk-e.svg" -dest_files=["res://.godot/imported/bear-walk-e.svg-df8abec6a38d36c2076db4429144f119.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/resources/characters/bear/bear-walk-f.svg b/resources/characters/bear/bear-walk-f.svg deleted file mode 100644 index d9fbafc..0000000 --- a/resources/characters/bear/bear-walk-f.svg +++ /dev/null @@ -1,137 +0,0 @@ - - - - - bear-walk-f - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/characters/bear/bear-walk-f.svg.import b/resources/characters/bear/bear-walk-f.svg.import deleted file mode 100644 index 95409bf..0000000 --- a/resources/characters/bear/bear-walk-f.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://cli2fyulk3dsg" -path="res://.godot/imported/bear-walk-f.svg-5fc9e8983c2f4ba6d48d654ac29f91ed.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resources/characters/bear/bear-walk-f.svg" -dest_files=["res://.godot/imported/bear-walk-f.svg-5fc9e8983c2f4ba6d48d654ac29f91ed.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/resources/characters/bear/bear-walk-g.svg b/resources/characters/bear/bear-walk-g.svg deleted file mode 100644 index ff90ff3..0000000 --- a/resources/characters/bear/bear-walk-g.svg +++ /dev/null @@ -1,132 +0,0 @@ - - - - - bear-walk-g - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/resources/characters/bear/bear-walk-g.svg.import b/resources/characters/bear/bear-walk-g.svg.import deleted file mode 100644 index d15454e..0000000 --- a/resources/characters/bear/bear-walk-g.svg.import +++ /dev/null @@ -1,37 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://dadi3ud01bqxk" -path="res://.godot/imported/bear-walk-g.svg-e33007b2436bd764d1911f97db734ea3.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://resources/characters/bear/bear-walk-g.svg" -dest_files=["res://.godot/imported/bear-walk-g.svg-e33007b2436bd764d1911f97db734ea3.ctex"] - -[params] - -compress/mode=0 -compress/high_quality=false -compress/lossy_quality=0.7 -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/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 -svg/scale=1.0 -editor/scale_with_editor_scale=false -editor/convert_colors_with_editor_theme=false diff --git a/resources/characters/bear/bear-walk-h.svg b/resources/characters/bear/bear-walk-h.svg deleted file mode 100644 index 0fb6c79..0000000 --- a/resources/characters/bear/bear-walk-h.svg +++ /dev/null @@ -1,157 +0,0 @@ - - - - - bear-walk-h - Created with Sketch. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd b/scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd index d694ef6..7ba9662 100644 --- a/scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd +++ b/scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd @@ -25,6 +25,8 @@ func spawn(): await TickTool.millseconds(2500) points.emitting = true func setColor(color: Color): - track.material.set_shader_parameter("color", color) + var result = Color(color) + result.a = 0 + track.material.set_shader_parameter("color", result) sword.modulate = color - points.process_material.color = color \ No newline at end of file + points.process_material.color = color diff --git a/scripts/Contents/Characters/Bear.gd b/scripts/Contents/Characters/Bear.gd index f80b084..8733f4b 100644 --- a/scripts/Contents/Characters/Bear.gd +++ b/scripts/Contents/Characters/Bear.gd @@ -13,11 +13,12 @@ func register(): attackCooldownMap[4] = 4500 attackCooldownMap[5] = 5500 attackCooldownMap[6] = 10000 - sprintMultiplier = 60 + attackCooldownMap[7] = 9000 + sprintMultiplier = 80 func spawn(): texture.play("walk") func ai(): - PresetEntityAI.follow(self, currentFocusedBoss, 200) + PresetEntityAI.follow(self, currentFocusedBoss, 400) for i in len(attackCooldownMap.keys()): tryAttack(i) func attack(type): @@ -61,10 +62,9 @@ func attack(type): return false elif type == 5: playSound("attack5") - var target = currentFocusedBoss.position var count = randi_range(10, 15) for i in range(count): - for bullet in BulletBase.generate(preload("res://components/Bullets/BossAttack/Bear/LightGun.tscn"), self, target, 0): + for bullet in BulletBase.generate(preload("res://components/Bullets/BossAttack/Bear/LightGun.tscn"), self, currentFocusedBoss.position, 0): bullet.rotation = deg_to_rad(360.0 / count * i) await TickTool.millseconds(1670.0 / count) return false @@ -72,10 +72,23 @@ func attack(type): playSound("attack6") for i in 16: for bullet in BulletBase.generate(preload("res://components/Bullets/BossAttack/Bear/LightGun.tscn"), self, currentFocusedBoss.position, 0): - bullet.position += MathTool.randv2_range(300) - bullet.look_at(currentFocusedBoss.position) + bullet.position += MathTool.randv2_range(600) + bullet.look_at(currentFocusedBoss.position + MathTool.randv2_range(50)) await TickTool.millseconds(100) return false + elif type == 7: + playSound("attack7") + var angle = deg_to_rad(70) + for j in 4: + var initAngle = randf_range(0, 360) + for i in 16: + for bullet in BulletBase.generate(preload("res://components/Bullets/BossAttack/Bear/LightGun.tscn"), self, currentFocusedBoss.position, 0): + bullet.rotation_degrees += initAngle + bullet.rotation -= angle / 2 + bullet.rotation += angle / 16 * i + bullet.look_at(currentFocusedBoss.position) + await TickTool.millseconds(1000) + return false return true func sprint(): move(Vector2(sign((currentFocusedBoss.position - position).x * sprintMultiplier), 0), true) diff --git a/shaders/RedTemprature.gdshader b/shaders/RedTemprature.gdshader new file mode 100644 index 0000000..090f990 --- /dev/null +++ b/shaders/RedTemprature.gdshader @@ -0,0 +1,5 @@ +shader_type canvas_item; +void fragment() { + COLOR.r=1.0; + COLOR.a*=0.5; +} \ No newline at end of file