diff --git a/logic/controller/fight_boss野怪和地图怪.go b/logic/controller/fight_boss野怪和地图怪.go index ccd405485..ed89c6619 100644 --- a/logic/controller/fight_boss野怪和地图怪.go +++ b/logic/controller/fight_boss野怪和地图怪.go @@ -175,7 +175,7 @@ func (Controller) OnPlayerFightNpcMonster(data1 *fight.FightNpcMonsterInboundInf p.AddPetExp(foi.Winpet, int64(addexp)) - if p.CanGetXUAN() { + if monster.IsShiny() && p.CanGetXUAN() { xuan := 400686 + int64(xmlres.PetMAP[int(refPet.GetID())].Type) ok := p.ItemAdd(xuan, 1) if ok { @@ -192,7 +192,7 @@ func (Controller) OnPlayerFightNpcMonster(data1 *fight.FightNpcMonsterInboundInf count := int64(grand.Intn(2) + 1) ok := p.ItemAdd(item, count) if ok { - items.ADDitem(uint32(item),uint32 (count)) + items.ADDitem(uint32(item), uint32(count)) } } diff --git a/logic/service/fight/effect/effect_42.go b/logic/service/fight/effect/effect_42.go index a2e33c084..4bbe4ca5e 100644 --- a/logic/service/fight/effect/effect_42.go +++ b/logic/service/fight/effect/effect_42.go @@ -7,8 +7,10 @@ import ( "blazing/logic/service/fight/node" "github.com/alpacahq/alpacadecimal" + "github.com/gogf/gf/v2/util/grand" ) +// n回合提示m翻倍 // ---- Effect42 ---- type Effect42 struct { node.EffectNode @@ -33,6 +35,14 @@ func (e *Effect42) Damage_Mul(t *info.DamageZone) bool { //fmt.Println("Effect42_n", t.Damage) return true } +func (e *Effect42) SetArgs(t *input.Input, a ...int) { + + //e.CanStack(-1)//后续的不会顶掉这个效果 + e.EffectNode.SetArgs(t, a...) + + e.Duration(grand.N(int(e.Args()[0].IntPart()), int(e.Args()[1].IntPart()))) //次数类,无限回合 + +} // ---- 注册所有效果 ---- func init() {