diff --git a/logic/service/player/cmd.go b/logic/service/player/cmd.go index 138c0c9c..3245ae84 100644 --- a/logic/service/player/cmd.go +++ b/logic/service/player/cmd.go @@ -25,11 +25,10 @@ func (p *Player) SendNoteReadyToFightInfo(b info.NoteReadyToFightInfo) { p.SendPack(t1.Pack(&b)) //准备包由各自发,因为协议不一样 } func (p *Player) SendFightEndInfo(b info.FightOverInfo) { - + p.FightC = nil t1 := NewTomeeHeader(2506, p.Info.UserID) p.SendPack(t1.Pack(&b)) - p.FightC = nil } diff --git a/logic/service/player/player.go b/logic/service/player/player.go index 5e767cba..3637ef9d 100644 --- a/logic/service/player/player.go +++ b/logic/service/player/player.go @@ -331,6 +331,7 @@ func (p *Player) Save() { }() p.FightC.Over(p, info.BattleOverReason.PlayerOffline) //玩家逃跑,但是不能锁线程 }() + <-p.FightC.GetOverChan() //等待结束 } p.Info.TimeToday = p.Info.TimeToday + uint32(time.Now().Unix()) - uint32(p.Onlinetime) //保存电池时间