diff --git a/components/Feeds/RainbowCandy.tscn b/components/Feeds/RainbowCandy.tscn index caaaa67..7ce8a3c 100644 --- a/components/Feeds/RainbowCandy.tscn +++ b/components/Feeds/RainbowCandy.tscn @@ -6,9 +6,10 @@ [node name="RainbowCandy" instance=ExtResource("1_2x0kp")] avatarTexture = ExtResource("2_xhiuj") displayName = "彩虹糖" +quality = 3 topic = 4 fields = Array[int]([1, 5, 6, 13, 7, 3]) -fieldValues = Array[float]([0.2, 0.25, 0.05, 2.0, 10.0, -0.4]) +fieldValues = Array[float]([0.2, 0.25, 0.05, 1.0, 15.0, -0.5]) costs = Array[int]([0, 3]) costCounts = Array[int]([700, 100]) @@ -17,5 +18,4 @@ texture = ExtResource("2_xhiuj") [node name="name" parent="container/info" index="1"] displayName = "彩虹糖" -quality = 3 topic = 4 diff --git a/scripts/Contents/Weapons/ChainGun.gd b/scripts/Contents/Weapons/ChainGun.gd index 32657d5..7ea29fa 100644 --- a/scripts/Contents/Weapons/ChainGun.gd +++ b/scripts/Contents/Weapons/ChainGun.gd @@ -3,7 +3,7 @@ extends Weapon func update(to, origin, _entity): origin["atk"] += 2 * to * soulLevel - origin["count"] = 1 * (soulLevel - 1) + origin["count"] = 1 * soulLevel origin["split"] /= 1 + 0.05 * to * soulLevel return origin func attack(entity: EntityBase): diff --git a/scripts/Contents/Weapons/LGBTWeapon.gd b/scripts/Contents/Weapons/LGBTWeapon.gd index 81af7a4..23db512 100644 --- a/scripts/Contents/Weapons/LGBTWeapon.gd +++ b/scripts/Contents/Weapons/LGBTWeapon.gd @@ -4,7 +4,7 @@ class_name LGBTWeapon func update(to: int, origin: Dictionary, _entity: EntityBase): origin["angle"] /= 1 + 0.025 * to * soulLevel - origin["count"] += 1 * (soulLevel - 1) + origin["count"] = soulLevel + 1 origin["atk"] += 2 * to * soulLevel origin["power"] += 0.005 * to * soulLevel origin["trace"] += 0.05 * to * soulLevel diff --git a/scripts/Contents/Weapons/Meowmere.gd b/scripts/Contents/Weapons/Meowmere.gd index 2cb6d88..9281e8f 100644 --- a/scripts/Contents/Weapons/Meowmere.gd +++ b/scripts/Contents/Weapons/Meowmere.gd @@ -3,7 +3,7 @@ extends Weapon func update(to, origin, _entity): origin["atk"] += 3 * to * soulLevel - origin["count"] = 1 * (soulLevel - 1) + origin["count"] = 1 * soulLevel origin["childatk"] += 1.25 * origin["atk"] origin["reduce"] /= 1 + 0.05 * to * soulLevel return origin diff --git a/scripts/Contents/Weapons/Volcano.gd b/scripts/Contents/Weapons/Volcano.gd index 4c904b5..0040a92 100644 --- a/scripts/Contents/Weapons/Volcano.gd +++ b/scripts/Contents/Weapons/Volcano.gd @@ -3,7 +3,7 @@ extends Weapon func update(to: int, origin: Dictionary, _entity: EntityBase): origin["atk"] += 3 * to * soulLevel - origin["count"] += 1 * (soulLevel - 1) + origin["count"] = soulLevel + 1 origin["rotate"] += 0.05 * to * soulLevel origin["life"] += 0.1 * to * soulLevel return origin diff --git a/scripts/Statemachine/EntityBase.gd b/scripts/Statemachine/EntityBase.gd index 898b344..5794f60 100644 --- a/scripts/Statemachine/EntityBase.gd +++ b/scripts/Statemachine/EntityBase.gd @@ -209,7 +209,7 @@ func setStage(stage: int): canRunAi = true currentInvinsible = false func applyLevel(): - fields[FieldStore.Entity.MAX_HEALTH] *= (1 + GameRule.entityHealthIncreasePerWave * (GameRule.difficulty - GameRule.difficultyRange.x + 1)) ** level + fields[FieldStore.Entity.MAX_HEALTH] *= (1 + GameRule.entityHealthIncreasePerWave * (GameRule.difficulty - GameRule.difficultyRange.x + 5)) ** level fields[FieldStore.Entity.DAMAGE_MULTIPILER] *= sqrt((1 + GameRule.entityDamageIncreasePerWave * (GameRule.difficulty - GameRule.difficultyRange.x))) ** level func displace(direction: Vector2, isSprinting: bool = false): return (direction if isSprinting else direction.normalized()) * fields.get(FieldStore.Entity.MOVEMENT_SPEED) * 400 * abs(animatree.get("parameters/blend_position"))