diff --git a/components/Bullets/SoulBall.tscn b/components/Bullets/SoulBall.tscn index 15fb374..f9d94a0 100644 --- a/components/Bullets/SoulBall.tscn +++ b/components/Bullets/SoulBall.tscn @@ -44,6 +44,7 @@ script = ExtResource("2_eaa43") displayName = "灵魂" speed = 25.0 damage = 1.5 +penerate = 1.0 lifeTime = 1000.0 [node name="texture" parent="." index="0"] @@ -55,6 +56,3 @@ process_material = SubResource("ParticleProcessMaterial_vwon6") texture = ExtResource("2_fmlef") lifetime = 0.5 local_coords = true - -[node name="hitbox" parent="." index="1"] -visible = false diff --git a/components/Characters/Rooster.tscn b/components/Characters/Rooster.tscn index c3fb311..933d353 100644 --- a/components/Characters/Rooster.tscn +++ b/components/Characters/Rooster.tscn @@ -1,14 +1,13 @@ -[gd_scene load_steps=15 format=3 uid="uid://bm7ymrri6pykb"] +[gd_scene load_steps=14 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="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_cyreu"] +[ext_resource type="PackedScene" uid="uid://c5y4g70evwy46" path="res://components/Weapons/SevenSoul.tscn" id="3_qbknw"] [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_re2px"] [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"] @@ -41,15 +40,12 @@ radius = 41.0122 [node name="Rooster" instance=ExtResource("1_e5pl8")] script = ExtResource("2_oqdqd") displayName = "公鸡" +currentInvinsible = true [node name="weaponStore" parent="." index="0"] process_mode = 4 -[node name="PurpleCrystal" parent="weaponStore" index="0" instance=ExtResource("3_cyreu")] -debugRebuild = false - -[node name="VectorStar" parent="weaponStore" index="1" instance=ExtResource("4_re2px")] -debugRebuild = false +[node name="SevenSoul" parent="weaponStore" index="0" instance=ExtResource("3_qbknw")] [node name="sprint" parent="sounds" index="0"] stream = ExtResource("4_66s6c") diff --git a/components/Weapons/SevenSoul.tscn b/components/Weapons/SevenSoul.tscn index 88120f2..282d06c 100644 --- a/components/Weapons/SevenSoul.tscn +++ b/components/Weapons/SevenSoul.tscn @@ -12,12 +12,11 @@ displayName = "bilioicik" quality = 2 typeTopic = 3 store = { -"atk": 1 +"atk": 3 } descriptionTemplate = "召唤7条人类灵魂,每条以10Hz的频率造成$atk点伤害。" needEnergy = 150.0 -cooldown = 120000.0 -debugRebuild = true +cooldown = 2000.0 [node name="attack" parent="sounds" index="0"] stream = ExtResource("4_tmgox") diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd index ad3faae..8531bb6 100644 --- a/scripts/Contents/Wave.gd +++ b/scripts/Contents/Wave.gd @@ -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, 1, INF, 10), - Wave.create("Bear", 0, 0, true, 2, INF, 10), + Wave.create("KukeMC", 0, 0, true, 0, INF, 10), + Wave.create("Bear", 0, 0, true, 0, INF, 10), ] static var WAVE_TESTBOSS_KUKE = [ Wave.create("KukeMC", 0, 0, true, 0, INF, 10), @@ -30,7 +30,7 @@ static var WAVE_TESTBOSS_CHICK = [ Wave.create("Chick", 0, 0, true, 0, INF, 10), ] static var WAVE_EMPTY = [] -static var data = WAVE_TESTBOSS_BEAR +static var data = WAVE_TESTBOSS_ALL static func customStart(): if false: