mirror of
https://github.com/Rundll86/Dog-Lynx-And-HCN.git
synced 2026-05-28 06:51:54 +08:00
fix(武器): 为所有武器攻击方法添加返回值
统一所有武器的attack方法,确保返回true以表示攻击成功执行
This commit is contained in:
@@ -18,3 +18,4 @@ func attack(entity: EntityBase):
|
||||
var bullet: Bow = i
|
||||
bullet.count = readStore("count")
|
||||
bullet.atk = readStore("atk")
|
||||
return true
|
||||
|
||||
@@ -2,13 +2,14 @@
|
||||
extends Weapon
|
||||
|
||||
func update(to: int, origin: Dictionary, _entity: EntityBase):
|
||||
origin["atk"] += 1 * to * soulLevel
|
||||
return origin
|
||||
origin["atk"] += 1 * to * soulLevel
|
||||
return origin
|
||||
func attack(entity: EntityBase):
|
||||
var wall = ObstacleBase.generate(
|
||||
ComponentManager.getObstacle("GrassWall"),
|
||||
get_global_mouse_position(),
|
||||
entity.findWeaponAnchor("normal").angle_to_point(get_global_mouse_position()),
|
||||
entity
|
||||
)
|
||||
wall.initHealth(readStore("atk"))
|
||||
var wall = ObstacleBase.generate(
|
||||
ComponentManager.getObstacle("GrassWall"),
|
||||
get_global_mouse_position(),
|
||||
entity.findWeaponAnchor("normal").angle_to_point(get_global_mouse_position()),
|
||||
entity
|
||||
)
|
||||
wall.initHealth(readStore("atk"))
|
||||
return true
|
||||
|
||||
@@ -2,17 +2,18 @@
|
||||
extends Weapon
|
||||
|
||||
func update(to: int, origin: Dictionary, _entity: EntityBase):
|
||||
origin["atk"] += 2 * to * soulLevel
|
||||
origin["count"] += 2 * (soulLevel - 1)
|
||||
return origin
|
||||
origin["atk"] += 2 * to * soulLevel
|
||||
origin["count"] += 2 * (soulLevel - 1)
|
||||
return origin
|
||||
func attack(entity: EntityBase):
|
||||
for i in readStore("count"):
|
||||
for bullet in BulletBase.generate(
|
||||
ComponentManager.getBullet("HXD"),
|
||||
entity,
|
||||
entity.findWeaponAnchor("normal"),
|
||||
entity.findWeaponAnchor("normal").angle_to_point(get_global_mouse_position()) + deg_to_rad(randf_range(-1, 1) * 4)
|
||||
):
|
||||
if bullet is HXDBullet:
|
||||
bullet.maxBouncedTime = readStore("atk")
|
||||
bullet.baseDamage = readStore("atk")
|
||||
for i in readStore("count"):
|
||||
for bullet in BulletBase.generate(
|
||||
ComponentManager.getBullet("HXD"),
|
||||
entity,
|
||||
entity.findWeaponAnchor("normal"),
|
||||
entity.findWeaponAnchor("normal").angle_to_point(get_global_mouse_position()) + deg_to_rad(randf_range(-1, 1) * 4)
|
||||
):
|
||||
if bullet is HXDBullet:
|
||||
bullet.maxBouncedTime = readStore("atk")
|
||||
bullet.baseDamage = readStore("atk")
|
||||
return true
|
||||
|
||||
@@ -2,21 +2,22 @@
|
||||
extends Weapon
|
||||
|
||||
func update(to: int, origin: Dictionary, _entity: EntityBase):
|
||||
origin["atk"] += 1 * to * soulLevel
|
||||
origin["fireatk"] += 0.5 * to * soulLevel
|
||||
origin["max-n"] += 2 * soulLevel
|
||||
return origin
|
||||
origin["atk"] += 1 * to * soulLevel
|
||||
origin["fireatk"] += 0.5 * to * soulLevel
|
||||
origin["max-n"] += 2 * soulLevel
|
||||
return origin
|
||||
func attack(entity: EntityBase):
|
||||
var bulletName = MathTool.randomChoiceFromWeights(["OxygenFire", "AcidN"], [10, 1])
|
||||
for i in randi_range(readStore("min-n"), readStore("max-n")) if bulletName == "AcidN" else 1:
|
||||
for bullet in BulletBase.generate(
|
||||
ComponentManager.getBullet(bulletName),
|
||||
entity,
|
||||
entity.findWeaponAnchor("normal"),
|
||||
entity.position.angle_to_point(get_global_mouse_position()),
|
||||
):
|
||||
if bullet is OxygenFire:
|
||||
bullet.baseDamage = readStore("fireatk")
|
||||
elif bullet is AcidN:
|
||||
bullet.baseDamage = readStore("atk")
|
||||
bullet.lifeTime *= 0.5
|
||||
var bulletName = MathTool.randomChoiceFromWeights(["OxygenFire", "AcidN"], [10, 1])
|
||||
for i in randi_range(readStore("min-n"), readStore("max-n")) if bulletName == "AcidN" else 1:
|
||||
for bullet in BulletBase.generate(
|
||||
ComponentManager.getBullet(bulletName),
|
||||
entity,
|
||||
entity.findWeaponAnchor("normal"),
|
||||
entity.position.angle_to_point(get_global_mouse_position()),
|
||||
):
|
||||
if bullet is OxygenFire:
|
||||
bullet.baseDamage = readStore("fireatk")
|
||||
elif bullet is AcidN:
|
||||
bullet.baseDamage = readStore("atk")
|
||||
bullet.lifeTime *= 0.5
|
||||
return true
|
||||
|
||||
@@ -1,6 +1,11 @@
|
||||
@tool
|
||||
extends Weapon
|
||||
|
||||
func update(to, origin, _entity):
|
||||
origin["atk"] += 1 * to * soulLevel
|
||||
origin["dmg"] += 0.02 * to * soulLevel
|
||||
origin["heal"] += 0.1 * to * soulLevel
|
||||
return origin
|
||||
func attack(entity: EntityBase):
|
||||
playSound("attack")
|
||||
for i in 6:
|
||||
@@ -11,8 +16,4 @@ func attack(entity: EntityBase):
|
||||
bullet.energyCollect = readStore("dmg")
|
||||
bullet.healAmount = readStore("heal")
|
||||
await TickTool.millseconds(15000 / 6.0)
|
||||
func update(to, origin, _entity):
|
||||
origin["atk"] += 1 * to * soulLevel
|
||||
origin["dmg"] += 0.02 * to * soulLevel
|
||||
origin["heal"] += 0.1 * to * soulLevel
|
||||
return origin
|
||||
return true
|
||||
|
||||
@@ -24,3 +24,4 @@ func attack(entity: EntityBase):
|
||||
bullet.damageMultipliers = [readStore("dmg1"), readStore("dmg2"), readStore("dmg3"), readStore("dmg4")]
|
||||
bullet.count = readStore("count")
|
||||
bullet.dmg5 = readStore("dmg5")
|
||||
return true
|
||||
|
||||
Reference in New Issue
Block a user