锁

incubator-game/src/main/java/com/incubator/game/data/po/RoomPO.java

@@ -86,6 +86,8 @@ public class RoomPO {
 	public int wildCard;
 	/** 随机队友-亮牌 **/
 	public int showCard;
+	/** 随机队友-亮牌 **/
+	public  List<String> showCards;
 	/** 掼蛋-是否过 **/
 	public boolean isOver;
 
@@ -98,6 +100,7 @@ public class RoomPO {
 	}
 
 	public void init() {
+		this.showCards = new ArrayList<>();
 		this.roomIp =  "";
 		this.contestId = 0;
 		this.roomId = 0;

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

@@ -440,6 +440,7 @@ public class ZDRoom extends Room {
                     }
                 }
             }
+            this.data.showCards = teammate;
             if (teammate.size() == 2) {
                 List<String> other = new ArrayList<>();
                 for (Player tmPlayer : this.actors.values()) {
@@ -590,6 +591,8 @@ 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);