fix who-wins bug

core/player.py

@@ -74,9 +74,6 @@ def handle_shot_poker(self, pokers):
             self.table.last_shot_poker = pokers
             for p in pokers:
                 self.hand_pokers.remove(p)
-        if not self.hand_pokers:
-            self.table.on_game_over(self)
-            return
 
         import debug
         if self.uid == debug.over_in_advance:
@@ -88,6 +85,10 @@ def handle_shot_poker(self, pokers):
             p.send(response)
         logger.info('Player[%d] shot[%s]', self.uid, str(pokers))
 
+        if not self.hand_pokers:
+            self.table.on_game_over(self)
+            return
+
     def join_table(self, t):
         self.ready = True
         self.table = t

core/table.py

@@ -143,7 +143,7 @@ def on_game_over(self, winner):
         #     return
         coin = self.room.entrance_fee * self.call_score * self.multiple
         for p in self.players:
-            response = [Pt.RSP_GAME_OVER, p.uid, coin if p != winner else coin * 2 - 100]
+            response = [Pt.RSP_GAME_OVER, winner.uid, coin if p != winner else coin * 2 - 100]
             for pp in self.players:
                 if pp != p:
                     response.append([pp.uid, *pp.hand_pokers])

handlers/protocol.py

@@ -43,4 +43,5 @@ class Protocol(IntEnum):
     RSP_CHAT = 44
 
     REQ_RESTART = 45
-    RSP_RESTART = 46
+    RSP_RESTART = 46
+

static/js/game.js

@@ -133,6 +133,7 @@ PG.Game.prototype = {
 //               this.players[loserASeat].pokerInHand = [];
 
                 this.whoseTurn = this.uidToSeat(winner);
+
                 function gameOver() {
                     alert(this.players[this.whoseTurn].isLandlord ? "地主赢" : "农民赢");
                     PG.Socket.send([PG.Protocol.REQ_RESTART]);