Merge branch 'sk' into develop

This commit is contained in:
sk 2024-12-09 13:11:57 +08:00
commit c8b7647695
1 changed files with 0 additions and 8 deletions

View File

@ -867,10 +867,6 @@ func (this *StateOp) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, param
copy(playerEx.cardsO.Mid[:], common.Int64Toint(params[3:8])) copy(playerEx.cardsO.Mid[:], common.Int64Toint(params[3:8]))
copy(playerEx.cardsO.End[:], common.Int64Toint(params[8:])) copy(playerEx.cardsO.End[:], common.Int64Toint(params[8:]))
playerEx.cardsO.PokerType = 0 playerEx.cardsO.PokerType = 0
tp := sceneEx.logic.GetSpecialType(playerEx.cards)
if tp > 0 {
playerEx.cardsO.PokerType = tp
}
sceneEx.SendSelectCards(playerEx, 0, int64(opcode)) sceneEx.SendSelectCards(playerEx, 0, int64(opcode))
} else { } else {
sceneEx.SendSelectCards(playerEx, int(params[0]), int64(opcode)) sceneEx.SendSelectCards(playerEx, int(params[0]), int64(opcode))
@ -917,10 +913,6 @@ func (this *StateOp) OnPlayerOp(s *base.Scene, p *base.Player, opcode int, param
copy(playerEx.preCardsO.Mid[:], common.Int64Toint(params[3:8])) copy(playerEx.preCardsO.Mid[:], common.Int64Toint(params[3:8]))
copy(playerEx.preCardsO.End[:], common.Int64Toint(params[8:])) copy(playerEx.preCardsO.End[:], common.Int64Toint(params[8:]))
playerEx.preCardsO.PokerType = 0 playerEx.preCardsO.PokerType = 0
tp := sceneEx.logic.GetSpecialType(playerEx.cards)
if tp > 0 {
playerEx.preCardsO.PokerType = tp
}
} }
playerEx.SendToClient(int(thirteen.TWMmoPacketID_PACKET_SCThirteenPlayerOp), pack) playerEx.SendToClient(int(thirteen.TWMmoPacketID_PACKET_SCThirteenPlayerOp), pack)