昔念
f90581e0f6
feat(fight): 优化擂台战斗逻辑与状态管理 - 修改了擂台主人设置逻辑，引入 `Set` 方法统一处理玩家信息更新 - 增加对擂主是否可战斗的判断，防止无效挑战 - 调整连胜计算和广播机制，确保数据一致性 - 修复擂台挑战失败时的状态回滚问题 - 引入错误码替代硬编码返回值，提高代码可读性与维护性 - 统一访问擂台玩家的方式，移除冗余字段
96 lines
2.7 KiB
Go
96 lines
2.7 KiB
Go
package controller
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
"sync/atomic"
|
|
|
|
"blazing/logic/service/fight"
|
|
"blazing/logic/service/fight/info"
|
|
"blazing/logic/service/player"
|
|
)
|
|
|
|
// 准备战斗
|
|
func (h Controller) OnReadyToFight(data *fight.ReadyToFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
if c.FightC == nil {
|
|
return nil, errorcode.ErrorCodes.ErrBattleEnded
|
|
}
|
|
c.FightC.ReadyFight(c)
|
|
return nil, -1
|
|
}
|
|
|
|
// 使用技能包
|
|
func (h Controller) UseSkill(data *fight.UseSkillInInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
if c.FightC == nil {
|
|
return nil, errorcode.ErrorCodes.ErrBattleEnded
|
|
}
|
|
c.FightC.UseSkill(c, (data.SkillId))
|
|
return nil, 0
|
|
}
|
|
|
|
// 战斗逃跑
|
|
func (h Controller) Escape(data *fight.EscapeFightInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
|
|
if c.FightC == nil {
|
|
return nil, errorcode.ErrorCodes.ErrBattleEnded
|
|
}
|
|
|
|
if atomic.LoadUint32(&c.Fightinfo.Mode) == 0 {
|
|
|
|
return nil, errorcode.ErrorCodes.ErrBattleNotStarted //，没开始对战
|
|
}
|
|
if atomic.LoadUint32(&c.Fightinfo.Mode) == 1 { //用户对战不能逃跑
|
|
|
|
return nil, errorcode.ErrorCodes.ErrCannotFleePlayerBattle
|
|
}
|
|
c.FightC.Over(c, info.BattleOverReason.PlayerEscape)
|
|
return nil, 0
|
|
}
|
|
|
|
// 切换精灵
|
|
func (h Controller) ChangePet(data *fight.ChangePetInboundInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
if c.FightC == nil {
|
|
return nil, errorcode.ErrorCodes.ErrBattleEnded
|
|
}
|
|
|
|
c.FightC.ChangePet(c, data.CatchTime)
|
|
return nil, -1
|
|
}
|
|
|
|
// 切换精灵
|
|
func (h Controller) Capture(data *fight.CatchMonsterInboundInfo, c *player.Player) (result *info.CatchMonsterOutboundInfo, err errorcode.ErrorCode) {
|
|
if c.FightC == nil {
|
|
return nil, errorcode.ErrorCodes.ErrBattleEnded
|
|
}
|
|
c.FightC.Capture(c, data.CapsuleId)
|
|
return nil, -1
|
|
}
|
|
|
|
// 加载进度
|
|
func (h Controller) LoadPercent(data *fight.LoadPercentInboundInfo, c *player.Player) (result *info.LoadPercentOutboundInfo, err errorcode.ErrorCode) {
|
|
if c.FightC == nil {
|
|
return nil, -1
|
|
}
|
|
|
|
c.FightC.LoadPercent(c, int32(data.Percent))
|
|
return nil, -1
|
|
}
|
|
func (h Controller) UsePetItemInboundInfo(data *fight.UsePetItemInboundInfo, c *player.Player) (result *info.UsePetIteminfo, err errorcode.ErrorCode) {
|
|
|
|
if c.FightC == nil {
|
|
return nil, errorcode.ErrorCodes.ErrBattleEnded
|
|
}
|
|
|
|
c.FightC.UseItem(c, data.CatchTime, data.ItemId)
|
|
|
|
return nil, -1
|
|
}
|
|
func (h Controller) FightChat(data *fight.ChatInfo, c *player.Player) (result *fight.NullOutboundInfo, err errorcode.ErrorCode) {
|
|
if c.FightC == nil {
|
|
return nil, errorcode.ErrorCodes.ErrBattleEnded
|
|
}
|
|
|
|
c.FightC.Chat(c, data.Message)
|
|
|
|
return nil, -1
|
|
}
|