diff --git a/components/Bullets/ArrowSeven.tscn b/components/Bullets/ArrowSeven.tscn index 24b3cb4..b6d517a 100644 --- a/components/Bullets/ArrowSeven.tscn +++ b/components/Bullets/ArrowSeven.tscn @@ -17,6 +17,7 @@ gradient = SubResource("Gradient_wd04q") [sub_resource type="ShaderMaterial" id="ShaderMaterial_1nfgk"] shader = ExtResource("3_j0g0m") shader_parameter/color = Color(1, 1, 1, 1) +shader_parameter/mixProgress = 0.5 [sub_resource type="SpriteFrames" id="SpriteFrames_q4xus"] animations = [{ @@ -78,15 +79,16 @@ _data = { "spawn": SubResource("Animation_kmogx") } -[sub_resource type="ShaderMaterial" id="ShaderMaterial_7e3fr"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_k643k"] shader = ExtResource("5_lyybq") shader_parameter/k = -0.223 shader_parameter/color = Color(1, 1, 1, 1) shader_parameter/scale = 10.0 -[sub_resource type="ShaderMaterial" id="ShaderMaterial_w3sk0"] +[sub_resource type="ShaderMaterial" id="ShaderMaterial_0bv2k"] shader = ExtResource("3_j0g0m") shader_parameter/color = Color(1, 1, 1, 1) +shader_parameter/mixProgress = 0.5 [sub_resource type="CapsuleShape2D" id="CapsuleShape2D_yjmap"] radius = 5.0 @@ -120,7 +122,6 @@ 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") displayName = "七彩矢" @@ -139,13 +140,13 @@ libraries = { [node name="superlight" type="Node2D" parent="texture" index="1"] unique_name_in_owner = true z_index = -1 -material = SubResource("ShaderMaterial_7e3fr") +material = SubResource("ShaderMaterial_k643k") script = ExtResource("5_ppdpf") size = Vector2(100, 200) [node name="frontlight" type="Node2D" parent="texture" index="2"] unique_name_in_owner = true -material = SubResource("ShaderMaterial_w3sk0") +material = SubResource("ShaderMaterial_0bv2k") scale = Vector2(0.968786, 0.968786) script = ExtResource("5_ppdpf") size = Vector2(40, 40) diff --git a/scripts/Contents/Bullets/BossAttack/Bear/ArrowSeven.gd b/scripts/Contents/Bullets/BossAttack/Bear/ArrowSeven.gd index d6423b6..7a217b2 100644 --- a/scripts/Contents/Bullets/BossAttack/Bear/ArrowSeven.gd +++ b/scripts/Contents/Bullets/BossAttack/Bear/ArrowSeven.gd @@ -13,8 +13,7 @@ var forwarded: bool = false func register(): speed = 1 - damage = 5 - penerate = 1 + damage = 2 func spawn(): myColor = allColor.gradient.sample(randf()) superlight.material = superlight.material.duplicate() diff --git a/scripts/Contents/Bullets/BossAttack/Bear/ForeverRainbow.gd b/scripts/Contents/Bullets/BossAttack/Bear/ForeverRainbow.gd index bee8b55..94bccd9 100644 --- a/scripts/Contents/Bullets/BossAttack/Bear/ForeverRainbow.gd +++ b/scripts/Contents/Bullets/BossAttack/Bear/ForeverRainbow.gd @@ -5,7 +5,7 @@ extends BulletBase var myColor: Color func register(): - damage = 15 + damage = 3 penerate = 1 func spawn(): myColor = allColor.gradient.sample(randf()) diff --git a/scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd b/scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd index 61e176f..4d795f7 100644 --- a/scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd +++ b/scripts/Contents/Bullets/BossAttack/Bear/LightGun.gd @@ -10,7 +10,7 @@ extends BulletBase var myColor: Color func register(): speed = 1 - damage = 5 + damage = 1.5 penerate = 1 func spawn(): myColor = allColor.gradient.sample(randf()) diff --git a/scripts/Contents/Bullets/BossAttack/Bear/SunDance.gd b/scripts/Contents/Bullets/BossAttack/Bear/SunDance.gd index 8eb4758..4670558 100644 --- a/scripts/Contents/Bullets/BossAttack/Bear/SunDance.gd +++ b/scripts/Contents/Bullets/BossAttack/Bear/SunDance.gd @@ -11,7 +11,7 @@ var myColor: Color func register(): speed = 0 - damage = 10 + damage = 4 penerate = 1 func spawn(): myColor = allColor.gradient.sample(randf()) diff --git a/scripts/Contents/Characters/Bear.gd b/scripts/Contents/Characters/Bear.gd index c958e7f..13438a0 100644 --- a/scripts/Contents/Characters/Bear.gd +++ b/scripts/Contents/Characters/Bear.gd @@ -23,15 +23,25 @@ func register(): func spawn(): texture.play("walk") mask.visible = false + if MathTool.rate(0.01): + setStage(2) func ai(): PresetEntityAI.follow(self, currentFocusedBoss, 400) for i in len(attackCooldownMap.keys()): tryAttack(i) func enterStage(stage): mask.visible = !!stage - fields[FieldStore.Entity.MOVEMENT_SPEED] = 0.75 - fields[FieldStore.Entity.DAMAGE_MULTIPILER] = 1.5 - fields[FieldStore.Entity.ATTACK_SPEED] = 2 + if stage == 0: + fields[FieldStore.Entity.MOVEMENT_SPEED] = 0.5 + fields[FieldStore.Entity.DAMAGE_MULTIPILER] = 1 + fields[FieldStore.Entity.ATTACK_SPEED] = 1 + elif stage == 1: + fields[FieldStore.Entity.MOVEMENT_SPEED] = 0.6 + fields[FieldStore.Entity.DAMAGE_MULTIPILER] = 1.15 + fields[FieldStore.Entity.ATTACK_SPEED] = 1.15 + elif stage == 2: + fields[FieldStore.Entity.MOVEMENT_SPEED] = 0.25 + fields[FieldStore.Entity.DAMAGE_MULTIPILER] = 9999 await TickTool.millseconds(2000) func attack(type): var weaponPos = findWeaponAnchor("normal")