昔念
e54d4bacaa
feat(fight): 增加战斗模式枚举并重构战斗逻辑判断 - 引入完整的 BattleMode 枚举定义，替代原有的 BattleStatus，明确区分各类战斗场景 - 在多个控制器中替换对旧 Status 字段的依赖，统一使用 Mode 判断战斗状态 - 修复部分函数调用前未检查 FightC 是否为空的问题，增加 ErrBattleEnded 错误返回 - 调整
69 lines
1.5 KiB
Go
69 lines
1.5 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
|
|
"blazing/logic/service/common"
|
|
"blazing/logic/service/fight"
|
|
"blazing/logic/service/fight/info"
|
|
"blazing/logic/service/player"
|
|
)
|
|
|
|
//大乱斗
|
|
|
|
func (h Controller) PET_MELEE(data *fight.StartPetWarInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.Fightinfo.Mode = info.BattleMode.PET_MELEE
|
|
c.Fightinfo.Status = info.BattleMode.PET_MELEE
|
|
|
|
err = c.JoinFight(func(p common.PlayerI) bool {
|
|
_, err = fight.NewFight(p, c, func(foi *info.FightOverInfo) {
|
|
if foi.Reason == 0 { //我放获胜
|
|
|
|
if foi.WinnerId == c.GetInfo().UserID {
|
|
c.Info.MessWin += 1
|
|
} else {
|
|
p.GetInfo().MessWin += 1
|
|
}
|
|
|
|
}
|
|
|
|
}) ///开始对战,房主方以及被邀请方
|
|
if err > 0 { //说明有报错
|
|
|
|
return false
|
|
}
|
|
|
|
return true
|
|
})
|
|
|
|
return
|
|
}
|
|
func (h Controller) PET_King(data *fight.PetKingJoinInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
c.Fightinfo.Status = info.BattleMode.PET_TOPLEVEL
|
|
|
|
switch data.Type {
|
|
case 5:
|
|
c.Fightinfo.Mode = info.BattleMode.SINGLE_MODE
|
|
case 6:
|
|
c.Fightinfo.Mode = info.BattleMode.MULTI_MODE
|
|
}
|
|
err = c.JoinFight(func(p common.PlayerI) bool {
|
|
fight.NewFight(p, c, func(foi *info.FightOverInfo) {
|
|
if foi.Reason == 0 { //我放获胜
|
|
if foi.WinnerId == c.GetInfo().UserID {
|
|
c.Info.MonKingWin += 1
|
|
} else {
|
|
p.GetInfo().MonKingWin += 1
|
|
}
|
|
|
|
}
|
|
}) ///开始对战,房主方以及被邀请方
|
|
|
|
return true
|
|
})
|
|
|
|
return
|
|
}
|