修改升级上限，后台牌桌结算状态，注释断线重连

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

@@ -103,6 +103,8 @@ public class PlayerInfoPO {
 	public boolean isChangePos;
 	/**当前套圈数*/
 	public int circleNum = 0;
+	/**是否扛旗*/
+	public boolean isFlag;
 
 	/**最优局次和分数*/
 	public Map<Integer,Integer> bestScore = new HashMap<>();

incubator-game/src/main/java/com/incubator/game/player/Player.java

@@ -148,11 +148,12 @@ public class Player extends GPlayer {
         // 有房间就换成托管状态
         Room room = RoomService.getInstance().getRoomByPlayerId(this.getId());
         if (room != null) {
-            if (room.state == 2) {
-                this.data.isAuto = true;
-            } else {
-                room.leaveRoom(this);
-            }
+            room.leaveRoom(this);
+//            if (room.state == 2) {
+//                this.data.isAuto = true;
+//            } else {
+//                room.leaveRoom(this);
+//            }
         }
 
         WkServerStatus wkToRedis = RedisUtil.getWkToRedis(RedisKeyConstant.WK_SERVE, RedisKeyConstant.WK_SERVE_KEY);

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

@@ -523,10 +523,10 @@ public class GDRoom extends Room {
                     this.data.cardList.remove(0);
                 }
                 // todo 测试代码
-                if (this.data.wildCard != 0) {
-                    player.data.remainCards = CardUtils.add(player.data.remainCards, this.data.wildCard);
-                    player.data.remainCards = CardUtils.add(player.data.remainCards, this.data.wildCard);
-                }
+//                if (this.data.wildCard != 0) {
+//                    player.data.remainCards = CardUtils.add(player.data.remainCards, this.data.wildCard);
+//                    player.data.remainCards = CardUtils.add(player.data.remainCards, this.data.wildCard);
+//                }
             }
         }
     }
@@ -1394,7 +1394,7 @@ public class GDRoom extends Room {
                     winPlayer.data.levelIndex = Math.min(winPlayer.data.levelIndex + upLevel, GDUtils.levelPoint.length - 1);
                     int score = winPlayer.data.levelPointView[0] + upLevel;//胜利方牌级
                     if (score>this.data.modev){
-                        upLevel = score - this.data.modev;
+                        upLevel = upLevel -( score - this.data.modev);
                         score = this.data.modev;
                     }
 //                    score = Math.min(score,this.data.modev);
@@ -1677,7 +1677,7 @@ public class GDRoom extends Room {
                         zjUserInfolog.setCreateTime(new Date());
                         zjUserInfolog.setCompeteResult(tmPlayer.data.playerId.equals(winPlayerData.playerId)?"1":"2");//胜负
                         zjUserInfolog.setGameInfo(this.playBack.toString());
-                        zjUserInfolog.setTableStatus(String.valueOf(this.state));
+                        zjUserInfolog.setTableStatus("3");
                         zjUserInfolog.setRuleInfo(this.jsonData.toString());
                         zjUserInfolog.setGameTime(this.time);
                         zjUserInfolog.setCompeteRank(key);

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

@@ -1444,7 +1444,7 @@ public class ZDRoom extends Room {
                             zjUserInfolog.setCreateTime(new Date());
                             zjUserInfolog.setCompeteResult(tmPlayer.data.playerId.equals(winPlayerData.playerId)?"1":"2");
                             zjUserInfolog.setGameInfo(this.playBack.toString());
-                            zjUserInfolog.setTableStatus(String.valueOf(this.state));
+                            zjUserInfolog.setTableStatus("3");
                             zjUserInfolog.setRuleInfo(this.jsonData.toString());
                             zjUserInfolog.setGameTime(this.time);
                             object.put("type","gameInfo");

incubator-game/src/main/java/com/incubator/game/util/ContestUtil.java

@@ -50,8 +50,8 @@ public class ContestUtil {
             contestCO.setSubstituteCost(new BigDecimal(params.get("candidateCost")));
             contestCO.setSubstituteTime(Integer.parseInt(params.get("SubstituteTime")));
         }
-//        ContestService.getInstance().creatContest(contestCO.getGameType(),contestCO.getiD(),contestCO);
-        ContestService.getInstance().creatLobbyContest(contestCO.getGameType(),contestCO.getiD(),contestCO);
+        ContestService.getInstance().creatContest(contestCO.getGameType(),contestCO.getiD(),contestCO);
+//        ContestService.getInstance().creatLobbyContest(contestCO.getGameType(),contestCO.getiD(),contestCO);
         List<Object> objects = ProtoUtil.contestListByRunToMessage();
         Log.info("比赛列表 : List={}", objects);
     }

incubator-game/src/main/java/com/incubator/game/util/GDUtils.java

@@ -252,7 +252,8 @@ public final class GDUtils {
                 // 炸弹：赖子牌可以增强炸弹的级别
                 return compareBomb(previousPoints, currentPoints,curLevel, wildCardCountCurrent, wildCardCountPrevious);
             default:
-                if (disCardsType.equals(CardType.FIVE_BOMB)||
+                if (disCardsType.equals(CardType.FOUR_BOMB)||
+                    disCardsType.equals(CardType.FIVE_BOMB)||
                     disCardsType.equals(CardType.SIX_BOMB)||
                     disCardsType.equals(CardType.SEVEN_BOMB)||
                     disCardsType.equals(CardType.EIGHT_BOMB)