转蛋增加积分规则

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

@@ -66,6 +66,8 @@ public class RoomPO {
 	public List<String> passList = new ArrayList<>();
 	/** 接风判断标识 **/
 	public Player jieFengPlayer = null;
+	/** 倍数 **/
+	public int multiple = 0;
 	/** 结算列表[key:1-4游, value:SettlementData] **/
 	public Map<Integer, Struct.SettlementData> result = new HashMap<>();
 	/** 是否进还贡逻辑 **/
@@ -107,6 +109,7 @@ public class RoomPO {
 		this.disCardPlayer = null;
 		this.passList.clear();
 		this.jieFengPlayer = null;
+		this.multiple = 0;
 		this.result.clear();
 		this.isTribute = false;
 		this.tributeList.clear();

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

@@ -18,9 +18,6 @@ import java.util.*;
  */
 public class ZDRoom extends Room {
 
-    //倍数
-    public int multiple = 1;
-
     public ZDRoom() {}
 
     @Override
@@ -871,6 +868,17 @@ public class ZDRoom extends Room {
         // 设置出牌堆
         this.data.curDisCardList = disCardList;
         this.data.curDisCardType = disCardType;
+        if (GDUtils.isBomb(disCardType)) {
+            // 翻倍 0不翻倍 1加倍 2翻倍
+            if (this.jsonData.getInteger("dv") == 1) {
+                // 加倍
+                this.data.multiple += 2;
+            }
+            if (this.jsonData.getInteger("dv") == 2) {
+                // 翻倍
+                this.data.multiple *= 2;
+            }
+        }
         // 设置当前出牌的玩家
         this.data.disCardPlayer = player;
 
@@ -1121,7 +1129,6 @@ public class ZDRoom extends Room {
         if (this.data.maxNum == 4) {
             // 分
             int scores = 0;
-
             // 头游搭档数据
             Struct.TeammateData teammateData = this.getTeammate(winPlayer.data.teammateId);
             switch (teammateData.getRank()) {
@@ -1151,7 +1158,15 @@ public class ZDRoom extends Room {
                             .append(" 4游, +").append(scores);
                     break;
             }
-
+            // 翻倍 0不翻倍 1加倍 2翻倍
+            if (this.jsonData.getInteger("dv") == 1) {
+                // 加倍
+                scores += Math.max(this.data.multiple, 0);
+            }
+            if (this.jsonData.getInteger("dv") == 2) {
+                // 翻倍
+                scores *= (this.data.multiple > 0? this.data.multiple : 1);
+            }
             for (Struct.SettlementData settlementData : this.data.result.values()) {
                 if (settlementData != null) {
                     Player tmPlayer = this.actors.getOrDefault(settlementData.playerId, null);
@@ -1216,6 +1231,8 @@ public class ZDRoom extends Room {
         this.data.curDisCardType = null;
         this.data.disCardPlayer = null;
         this.data.passList.clear();
+        this.data.jieFengPlayer = null;
+        this.data.multiple = 0;
         this.data.tributeState = 0;
         this.data.tributeCardMap.clear();
         this.data.cardList.clear();