转蛋-1随机搭档-亮牌调整

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

@@ -85,7 +85,7 @@ public class RoomPO {
 	/** 当前赖子 红星级牌 **/
 	public int wildCard;
 	/** 随机队友-亮牌 **/
-	public int teamShowCards;
+	public int showCard;
 
 	/** 比赛Id */
 	public long contestId;
@@ -126,6 +126,6 @@ public class RoomPO {
 		this.towKingList.clear();
 		this.cardList.clear();
 		this.wildCard = 0;
-		this.teamShowCards = 0;
+		this.showCard = 0;
 	}
 }

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

@@ -352,7 +352,7 @@ public class ZDRoom extends Room {
                     this.data.cardList.remove(0);
                 }
                 // 设置翻牌队友
-                if (CardUtils.contains(player.data.remainCards, this.data.teamShowCards) && teammate.size() < 2) {
+                if (CardUtils.contains(player.data.remainCards, this.data.showCard) && teammate.size() < 2) {
                     if (!teammate.contains(player.getId())) {
                         teammate.add(player.getId());
                     }
@@ -431,17 +431,21 @@ public class ZDRoom extends Room {
             this.data.curRound += 1;
             // 随机定庄
             this.data.zhuangPos = RandomUtil.getIndex(this.data.maxNum);
-            // 随机队友-系统翻牌
-            this.data.teamShowCards = GDUtils.randomTeamShowCards();
             // 随机打几
             if (this.jsonData.getInteger("tc") == 0) {
-                this.data.curLevelIndex = RandomUtil.getIndex(GDUtils.levelPoint.length);
+                this.data.curLevelIndex = RandomUtil.getIndex(GDUtils.randomTeam.length);
+                // 随机队友-系统翻牌
+                this.data.showCard = GDUtils.randomTeam[this.data.curLevelIndex];
             }
             // 固定打2
             if (this.jsonData.getInteger("tc") == 1) {
-                this.data.curLevelIndex = 0;
+                this.data.curLevelIndex = 12;
+                // 随机队友-系统翻牌
+                this.data.showCard = GDUtils.randomTeam[this.data.curLevelIndex];
             }
-            this.data.curLevelPoint = GDUtils.levelPoint[this.data.curLevelIndex];
+            // 级牌下标
+            int index = (this.data.curLevelIndex + 1) % GDUtils.randomTeam.length;
+            this.data.curLevelPoint = (GDUtils.randomTeam[index] & 0xF);
             // 发牌
             this.doSendCard();
             // 进还贡数据
@@ -1460,7 +1464,7 @@ public class ZDRoom extends Room {
         data.put("curRound", this.data.curRound);
         data.put("curTime", this.data.curTime);
         data.put("zhuangPos", this.data.zhuangPos);
-        data.put("teamShowCards", this.data.teamShowCards);
+        data.put("showCard", this.data.showCard);
         // 当前级牌点数
         data.put("curLevelPoint", this.data.curLevelPoint);
         // 是否有进还贡
@@ -1513,7 +1517,7 @@ public class ZDRoom extends Room {
         data.put("maxRound", this.data.maxRound);
         data.put("curRound", this.data.curRound);
         data.put("zhuangPos", this.data.zhuangPos);
-        data.put("teamShowCards", this.data.teamShowCards);
+        data.put("showCard", this.data.showCard);
         // 当前级牌点数
         data.put("curLevelPoint", this.data.curLevelPoint);
         // 是否有进还贡