From 10e1126cd7be603201c9269247757549c7ea8780 Mon Sep 17 00:00:00 2001 From: xinian Date: Thu, 5 Mar 2026 13:34:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AE=A0=E7=89=A9?= =?UTF-8?q?=E7=AB=9E=E6=8A=80=E5=A5=96=E5=8A=B1=E8=AE=A1=E7=AE=97=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/rpc/user.go | 2 +- logic/controller/fight_pvp_king.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/rpc/user.go b/common/rpc/user.go index 94fa538bc..0de324174 100644 --- a/common/rpc/user.go +++ b/common/rpc/user.go @@ -74,7 +74,7 @@ func (r *RPCfight) ADD(s string) { } func (r *RPCfight) Cancel(s string) { -r.zs.Remove() + // r.zs.Remove() } ///定义map,存储用户对战斗容器的映射,便于外部传入时候进行直接操作 diff --git a/logic/controller/fight_pvp_king.go b/logic/controller/fight_pvp_king.go index 2cb5c6330..07d1e625f 100644 --- a/logic/controller/fight_pvp_king.go +++ b/logic/controller/fight_pvp_king.go @@ -53,6 +53,7 @@ func (h Controller) PetMelee(data *fight.StartPetWarInboundInfo, c *player.Playe func (h Controller) PetKing(data *fight.PetKingJoinInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) { c.Fightinfo.Status = info.BattleMode.PET_TOPLEVEL + var ElementTypeNumbers = []int{1, 2, 3, 5, 11, 4, 6, 7, 9} switch data.Type { case 5: @@ -62,7 +63,6 @@ func (h Controller) PetKing(data *fight.PetKingJoinInboundInfo, c *player.Player case 11: //草","水","火","电","战斗","飞行","机械","地面","冰" // 按顺序：草、水、火、电、战斗、飞行、机械、地面、冰 - var ElementTypeNumbers = []int{1, 2, 3, 5, 11, 4, 6, 7, 9} println("11", c.GetPetInfo()[0].Type(), ElementTypeNumbers[data.FightType-1]) if c.GetPetInfo()[0].Type() != int(ElementTypeNumbers[data.FightType-1]) { @@ -77,9 +77,9 @@ func (h Controller) PetKing(data *fight.PetKingJoinInboundInfo, c *player.Player switch data.Type { case 11: if foi.WinnerId == c.GetInfo().UserID { - c.ItemAdd(80000000+int64(data.FightType), 1) + c.ItemAdd(80000000+int64(ElementTypeNumbers[data.FightType-1]), 1) } else { - p.ItemAdd(80000000+int64(data.FightType), 1) + p.ItemAdd(80000000+int64(ElementTypeNumbers[data.FightType-1]), 1) } default: if foi.WinnerId == c.GetInfo().UserID {