admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: 修复宠物竞技奖励计算逻辑错误
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
Details

Browse Source
This commit is contained in:
xinian
2026-03-05 13:34:06 +08:00
committed by cnb
parent 7e3cfa5875
commit 10e1126cd7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
common/rpc/user.go
View File

@@ -74,7 +74,7 @@ func (r *RPCfight) ADD(s string) {
} }
func (r *RPCfight) Cancel(s string) { func (r *RPCfight) Cancel(s string) {
r.zs.Remove() // r.zs.Remove()
} }
///定义map,存储用户对战斗容器的映射,便于外部传入时候进行直接操作 ///定义map,存储用户对战斗容器的映射,便于外部传入时候进行直接操作

6
logic/controller/fight_pvp_king.go
View File

@@ -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) { func (h Controller) PetKing(data *fight.PetKingJoinInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
c.Fightinfo.Status = info.BattleMode.PET_TOPLEVEL c.Fightinfo.Status = info.BattleMode.PET_TOPLEVEL
var ElementTypeNumbers = []int{1, 2, 3, 5, 11, 4, 6, 7, 9}
switch data.Type { switch data.Type {
case 5: case 5:
@@ -62,7 +63,6 @@ func (h Controller) PetKing(data *fight.PetKingJoinInboundInfo, c *player.Player
case 11: case 11:
//草","水","火","电","战斗","飞行","机械","地面","冰" //草","水","火","电","战斗","飞行","机械","地面","冰"
// 按顺序：草、水、火、电、战斗、飞行、机械、地面、冰 // 按顺序：草、水、火、电、战斗、飞行、机械、地面、冰
var ElementTypeNumbers = []int{1, 2, 3, 5, 11, 4, 6, 7, 9}
println("11", c.GetPetInfo()[0].Type(), ElementTypeNumbers[data.FightType-1]) println("11", c.GetPetInfo()[0].Type(), ElementTypeNumbers[data.FightType-1])
if c.GetPetInfo()[0].Type() != int(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 { switch data.Type {
case 11: case 11:
if foi.WinnerId == c.GetInfo().UserID { if foi.WinnerId == c.GetInfo().UserID {
c.ItemAdd(80000000+int64(data.FightType), 1) c.ItemAdd(80000000+int64(ElementTypeNumbers[data.FightType-1]), 1)
} else { } else {
p.ItemAdd(80000000+int64(data.FightType), 1) p.ItemAdd(80000000+int64(ElementTypeNumbers[data.FightType-1]), 1)
} }
default: default:
if foi.WinnerId == c.GetInfo().UserID { if foi.WinnerId == c.GetInfo().UserID {