4751594ee8
feat: 更新战斗系统模型结构和Redis消息处理 - 引入gredis依赖用于Redis消息处理 - 将战斗相关的枚举和结构体从info包迁移到model包 - 更新战斗结束原因、攻击值等类型的引用路径 - 添加新的zset工具包到工作区 - 修改Redis消息处理逻辑以正确解析gredis.Message类型 - 在战斗控制器中统一使用model包下的类型定义
107 lines
3.1 KiB
Go
107 lines
3.1 KiB
Go
package fight
|
|
|
|
import (
|
|
"blazing/common/socket/errorcode"
|
|
"blazing/cool"
|
|
"blazing/logic/service/common"
|
|
"blazing/logic/service/fight/action"
|
|
"blazing/logic/service/fight/info"
|
|
"blazing/logic/service/fight/input"
|
|
"blazing/logic/service/player"
|
|
"blazing/modules/config/service"
|
|
"blazing/modules/player/model"
|
|
"math/rand"
|
|
"time"
|
|
)
|
|
|
|
// 创建新战斗,邀请方和被邀请方,或者玩家和野怪方
|
|
func NewFight(p1, p2 common.PlayerI, fn func(model.FightOverInfo)) (*FightC, errorcode.ErrorCode) {
|
|
|
|
// fmt.Println("NewFight", p1.GetInfo().UserID)
|
|
f := &FightC{}
|
|
f.ownerID = p1.GetInfo().UserID
|
|
|
|
f.Switch = make(map[uint32]*action.ActiveSwitchAction)
|
|
f.callback = fn //战斗结束的回调
|
|
f.quit = make(chan struct{})
|
|
f.over = make(chan struct{})
|
|
f.StartTime = time.Now()
|
|
seed := f.StartTime.UnixNano() ^ int64(p1.GetInfo().UserID) ^ int64(p2.GetInfo().UserID) // ^ int64(f.Round) // 用异或运算混合多维度信息
|
|
f.rand = rand.New(rand.NewSource(seed))
|
|
f.Info = p1.Getfightinfo()
|
|
|
|
//这里应该挪到玩家初始化执行
|
|
|
|
f.ReadyInfo.Status = f.Info.Status
|
|
if f.Info.Mode == info.BattleMode.PET_MELEE {
|
|
f.Melee = service.NewMELEEService().Def()
|
|
}
|
|
var err errorcode.ErrorCode
|
|
f.Our, err = f.initplayer(p1)
|
|
if err > 0 {
|
|
return nil, err
|
|
|
|
}
|
|
|
|
f.Opp, err = f.initplayer(p2)
|
|
if err > 0 {
|
|
return nil, err
|
|
|
|
}
|
|
|
|
f.ReadyInfo.OurInfo, f.ReadyInfo.OurPetList = initfightready(f.Our)
|
|
f.ReadyInfo.OpponentInfo, f.ReadyInfo.OpponentPetList = initfightready(f.Opp)
|
|
var loadtime time.Duration = 120 * time.Second
|
|
//说明是PVE
|
|
|
|
f.Broadcast(func(ff *input.Input) {
|
|
ff.SetOPP(f.GetInputByPlayer(ff.Player, true))
|
|
|
|
})
|
|
f.FightStartOutboundInfo = f.buildFightStartInfo()
|
|
if f.Info.Status == info.BattleMode.FIGHT_WITH_NPC {
|
|
|
|
f.Opp.Finished = true //PVE 默认boss数据直接加载完成
|
|
loadtime = 60 * time.Second
|
|
//f.handleNPCFightSpecial(&fightStartInfo)
|
|
|
|
if f.Opp.Player.(*player.AI_player).CanCapture > 0 {
|
|
f.Opp.CanCapture = f.Opp.Player.(*player.AI_player).CanCapture
|
|
f.FightStartOutboundInfo.Info2.Catchable = 1 //可以捕捉就置1
|
|
}
|
|
f.Opp.AttackValue.Prop = f.Opp.Player.(*player.AI_player).Prop
|
|
f.FightStartOutboundInfo.Info2.Prop = f.Opp.AttackValue.Prop
|
|
}
|
|
|
|
f.Broadcast(func(ff *input.Input) {
|
|
|
|
ff.Player.SendPackCmd(2503, &f.ReadyInfo)
|
|
// if p, ok := ff.Player.(*player.Player); ok {
|
|
// p.Service.Info.Save(*p.Info)
|
|
// }
|
|
})
|
|
|
|
cool.Cron.AfterFunc(loadtime, func() {
|
|
//fmt.Println(f.Our.UserID, "战斗超时结算")
|
|
if !f.Our.Finished || !f.Opp.Finished { //如果有任一没有加载完成
|
|
f.closefight = true //阻止继续添加action
|
|
f.Reason = model.BattleOverReason.PlayerOffline
|
|
switch {
|
|
case !f.Opp.Finished: //邀请方没加载完成 先判断邀请方,如果都没加载完成,就算做房主胜利
|
|
f.WinnerId = f.Our.Player.GetInfo().UserID
|
|
case !f.Our.Finished: //被邀请方没加载完成
|
|
f.WinnerId = f.Opp.Player.GetInfo().UserID
|
|
}
|
|
f.Broadcast(func(ff *input.Input) {
|
|
//todo 将血量和技能pp传回enterturn
|
|
|
|
ff.Player.SendPackCmd(2506, &f.FightOverInfo)
|
|
ff.Player.QuitFight()
|
|
})
|
|
}
|
|
|
|
})
|
|
|
|
return f, 0
|
|
}
|