锁

incubator-game/src/main/java/com/incubator/game/room/ZDRoom.java

@@ -428,9 +428,9 @@ public class ZDRoom extends Room {
         // 随机搭档
         if (this.jsonData.getInteger("team") == 1) {
             // 第一把之后才换位置
-            if (this.data.curRound == 1) {
-                return;
-            }
+//            if (this.data.curRound == 1) {
+//                return;
+//            }
             List<String> teammate = new ArrayList<>();
             for (Player tmPlayer : this.actors.values()) {
                 if (tmPlayer != null && CardUtils.contains(tmPlayer.data.remainCards, this.data.showCard)) {
@@ -440,7 +440,6 @@ public class ZDRoom extends Room {
                     }
                 }
             }
-            this.data.showCards = teammate;
             if (teammate.size() == 2) {
                 List<String> other = new ArrayList<>();
                 for (Player tmPlayer : this.actors.values()) {
@@ -591,8 +590,6 @@ public class ZDRoom extends Room {
                         data.put("zhuangPos", !this.data.tributeList.isEmpty() && !this.isTwoKing()? -1 : this.data.zhuangPos);
                     }
                     data.put("tributeInfo", tributeInfo);
-                    data.put("showCards",  this.data.showCards);
-                    data.put("showCard",  this.data.showCard);
                     data.put("state", 2);
                     data.put("time", !this.data.tributeList.isEmpty()? 40 : 20);
                     Log.debug("玩家 : {}, 手牌 : {}", tmPlayer.data.name, tmPlayer.data.remainCards);