From 84024aed83d8a96426d8610d2c36cf1f305a3be2 Mon Sep 17 00:00:00 2001
From: xinian <eBCmZThyqEBRX6cZZseEVK+xinian@noreply.cnb.cool>
Date: Mon, 23 Mar 2026 07:36:20 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E6=88=98?=
 =?UTF-8?q?=E6=96=97=E6=95=88=E6=9E=9C=E5=AE=9E=E7=8E=B0=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 logic/service/fight/effect/428.go | 17 ++++-------------
 logic/service/fight/effect/518.go | 12 ++++--------
 2 files changed, 8 insertions(+), 21 deletions(-)

diff --git a/logic/service/fight/effect/428.go b/logic/service/fight/effect/428.go
index e094bfec2..f139db19a 100644
--- a/logic/service/fight/effect/428.go
+++ b/logic/service/fight/effect/428.go
@@ -1,12 +1,9 @@
 package effect
 
 import (
-	element "blazing/common/data/Element"
 	"blazing/logic/service/fight/info"
 	"blazing/logic/service/fight/input"
 	"blazing/logic/service/fight/node"
-
-	"github.com/alpacahq/alpacadecimal"
 )
 
 // 428 - 遇到天敌时附加m点固定伤害
@@ -14,21 +11,15 @@ type Effect428 struct {
 	node.EffectNode
 }
 
-func (e *Effect428) SkillHit_ex() bool {
-	t, _ := element.Calculator.GetOffensiveMultiplier(e.Ctx().Opp.CurrentPet.Type, e.Ctx().Our.CurrentPet.Type)
-	// evs := gconv.Uint32s(strings.Split(xmlres.PetMAP[int(e.Ctx().Our.CurrentPet.ID)].NaturalEnemy, " "))
-	// _, ok := lo.Find(evs, func(t uint32) bool {
-	// 	return t == uint32(e.Ctx().Opp.CurrentPet.ID)
-	// })
-	if t <= 1 {
+func (e *Effect428) Skill_Use() bool {
+
+	if !e.ISNaturalEnemy() {
 		return true
 	}
-	// 附加m点固定伤害
-	additionalDamage := alpacadecimal.NewFromInt(int64(e.Args()[0].IntPart()))
 
 	damageZone := &info.DamageZone{
 		Type:   info.DamageType.Fixed,
-		Damage: additionalDamage,
+		Damage: e.Args()[0],
 	}
 	e.Ctx().Opp.Damage(e.Ctx().Our, damageZone)
 
diff --git a/logic/service/fight/effect/518.go b/logic/service/fight/effect/518.go
index a1ea4514a..83e94105d 100644
--- a/logic/service/fight/effect/518.go
+++ b/logic/service/fight/effect/518.go
@@ -10,19 +10,15 @@ type Effect518 struct {
 	node.EffectNode
 }
 
-func (e *Effect518) SkillHit_ex() bool {
+func (e *Effect518) Skill_Use_ex() bool {
 	damageThreshold := int(e.Args()[0].IntPart())
 	damageDone := e.Ctx().Our.SumDamage
 
 	if damageDone.IntPart() > int64(damageThreshold) {
-		effectType := int(e.Args()[1].IntPart())  // XX类型
-		effectValue := int(e.Args()[2].IntPart()) // 等级+n
+		effectType := int8(e.Args()[1].IntPart())  // XX类型
+		effectValue := int8(e.Args()[2].IntPart()) // 等级+n
 
-		statusEffect := e.Ctx().Our.InitEffect(input.EffectType.Status, effectType)
-		if statusEffect != nil {
-			statusEffect.SetArgs(e.Ctx().Our, effectValue)
-			e.Ctx().Our.AddEffect(e.Ctx().Our, statusEffect)
-		}
+		e.Ctx().Our.SetProp(e.Ctx().Our, effectType, effectValue)
 	}
 
 	return true