diff --git a/logic/service/fight/fightc.go b/logic/service/fight/fightc.go index 6cf7cf81..a9255daa 100644 --- a/logic/service/fight/fightc.go +++ b/logic/service/fight/fightc.go @@ -181,8 +181,6 @@ func (b *FightC) IsWin(c *input.Input, cache uint32) bool { if c.Player.GetInfo().UserID == b.ownerID { //如果是房主 bbb = b.Opp.AllPet - } else { - bbb = b.Our.AllPet } for _, v := range bbb { @@ -205,7 +203,6 @@ func (b *FightC) IsWin(c *input.Input, cache uint32) bool { func (f *FightC) Broadcast(t func(ff *input.Input)) { t(f.Our) - t(f.Opp) } @@ -275,7 +272,7 @@ func (f *FightC) battleLoop() { } actions[uint32(action.GetPlayerID())] = action - fmt.Println("玩家%d 执行动作", action.GetPlayerID()) + fmt.Println("玩家%i 执行动作", action.GetPlayerID()) case <-timeout: @@ -342,6 +339,8 @@ func (f *FightC) battleLoop() { WinnerId: f.ownerID, }) f.closefight = true + } else { + tt.CatchPetInfo(info.CatchMonsterOutboundInfo{}) } } else { //说明不是可以捕捉的