1.解决创建房间一系列问题;2.增加复式掼蛋加入房间座位分配逻辑

incubator-common/src/main/java/com/incubator/common/util/RandomUtil.java

@@ -135,4 +135,14 @@ public final class RandomUtil {
 		int ran = RandomUtil.getInt(1, 10000);
 		return (ran >= 1 && ran <= per);
 	}
+
+	/**
+	 * 生成格式化的用户名，格式为 user_123456
+	 *
+	 * @return 格式化的用户名
+	 */
+	public static String generateUsername() {
+		int randomNumber = 100000 + getIndex(900000); // 生成6位随机数
+		return "user_" + randomNumber;
+	}
 }

incubator-game/src/main/java/com/incubator/game/GGame.java

@@ -11,6 +11,7 @@ import com.incubator.common.net.netty.handler.websocket.binary.WebSocketServerBi
 import com.incubator.common.net.netty.server.NettyServer;
 import com.incubator.common.thread.NamedThreadFactory;
 import com.incubator.common.util.PropertiesUtil;
+import com.incubator.common.util.RandomUtil;
 import com.incubator.core.net.http.HttpHandler;
 import com.incubator.core.quartz.QuartzServer;
 import com.incubator.core.quartz.QuartzTask;
@@ -95,6 +96,9 @@ public class GGame extends AbstractService {
     /** 本服所有在线玩家 */
     public static Map<String, GPlayer> onlinePlayers = new ConcurrentHashMap<>();
 
+    /** 已生成的用户名集合，确保唯一性 */
+    public static Set<String> generatedUsernames = new HashSet<>();
+
     public static GlobalInfoPO globalInfoPO = new GlobalInfoPO();
 
     private static volatile GGame instance;
@@ -415,4 +419,19 @@ public class GGame extends AbstractService {
         }
     }
 
+    /**
+     * 生成唯一的用户名，格式为 user_123456
+     *
+     * @return 唯一的用户名
+     */
+    public static synchronized String generateUniqueUsername() {
+        String username;
+        do {
+            username = RandomUtil.generateUsername();
+        } while (generatedUsernames.contains(username));
+
+        // 将新生成的用户名加入集合
+        generatedUsernames.add(username);
+        return username;
+    }
 }

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

@@ -29,7 +29,7 @@ public class RoomPO {
 	//**************************配置相关***************************
 
 	/** 玩家 [key:座位号， value:玩家对象] **/
-	public Player[] playerMap = new Player[4];
+	public Player[] playerMap = new Player[maxNum];
 	/** 当前局数 **/
 	public int curRound;
 	/** 庄家位置 **/
@@ -77,7 +77,11 @@ public class RoomPO {
 		this.ownerId = "";
 		this.maxNum = 0;
 		this.maxRound = 0;
-		this.playerMap = new Player[4];
+		if (this.gameType == 3) {
+			this.playerMap = new Player[8];
+		} else {
+			this.playerMap = new Player[4];
+		}
 		this.curRound = 0;
 		this.zhuangPos = -1;
 		this.curLevelPoint = 0;

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

@@ -5,11 +5,10 @@ import com.incubator.common.log4j.Log;
 import com.incubator.common.util.RandomUtil;
 import com.incubator.game.data.po.RoomPO;
 import com.incubator.game.player.Player;
-import com.incubator.game.util.CardUtils;
+import com.incubator.game.util.FSGDUtil;
 import com.incubator.game.util.GDUtils;
 import com.incubator.game.util.Struct;
 import com.incubator.message.proto.CommonProto;
-import org.apache.commons.lang3.StringUtils;
 
 import java.util.*;
 
@@ -34,7 +33,7 @@ public class FSGDRoom extends Room {
         this.data.ownerId = player != null? player.getId() : "";
         this.data.maxNum = jsonData.getInteger("playerNum");
         this.data.maxRound = jsonData.getInteger("maxRound");
-        this.data.playerMap = new Player[this.data.maxRound];
+        this.data.playerMap = new Player[8];
         // 是否有进还贡规则
         this.data.isTribute = jsonData.getInteger("advanceType") == 0;
         // 初始化级牌点数
@@ -75,10 +74,11 @@ public class FSGDRoom extends Room {
             int tableIndex = (this.actors.size() - 1) / 4;
             FSGDTable table = this.tableMap.getOrDefault(tableIndex, null);
             if (table != null) {
+                // 加入桌子
                 table.joinTable(player);
 
                 // 设置队伍
-
+                player.data.teamId = FSGDUtil.assignTeam(this.actors.size() - 1);
 
                 // 推送房间其他7个玩家
                 for (Player tmPlayer : this.actors.values()) {

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

@@ -4,7 +4,6 @@ import com.alibaba.fastjson2.JSONObject;
 import com.incubator.common.log4j.Log;
 import com.incubator.common.util.RandomUtil;
 import com.incubator.game.data.po.FSGDTablePO;
-import com.incubator.game.data.po.RoomPO;
 import com.incubator.game.player.Player;
 import com.incubator.game.util.CardUtils;
 import com.incubator.game.util.GDUtils;

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

@@ -31,6 +31,7 @@ public class GDRoom extends Room {
         this.data.ownerId = player != null? player.getId() : "";
         this.data.maxNum = jsonData.getInteger("playerNum");
         this.data.maxRound = jsonData.getInteger("maxRound");
+        this.data.playerMap = new Player[4];
         // 是否有进还贡规则
         this.data.isTribute = jsonData.getInteger("advanceType") == 0;
 

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

@@ -31,6 +31,7 @@ public class ZDRoom extends Room {
         this.data.ownerId = player != null? player.getId() : "";
         this.data.maxNum = jsonData.getInteger("playerNum");
         this.data.maxRound = jsonData.getInteger("maxRound");
+        this.data.playerMap = new Player[4];
         // 是否有进还贡规则
         this.data.isTribute = jsonData.getInteger("advanceType") == 0;
 

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

@@ -0,0 +1,33 @@
+package com.incubator.game.util;
+
+import java.util.stream.IntStream;
+
+/**
+ * 复式掼蛋工具类
+ *
+ * @author johnc
+ */
+public final class FSGDUtil {
+
+    /** 定义位置常量 **/
+    private static final int[] RED_TEAM_POSITIONS = {1, 3, 5, 7}; // 红队位置
+
+    /**
+     * 根据位置分配队伍
+     *
+     * @param position 位置编号
+     * @return 队伍（红队或蓝队）
+     */
+    public static int assignTeam(int position) {
+        // 红队包含特定位置
+        return IntStream.of(RED_TEAM_POSITIONS).anyMatch(pos -> pos == position) ? 0 : 1;
+//        return IntStream.of(RED_TEAM_POSITIONS).anyMatch(pos -> pos == position) ? "红队" : "蓝队";
+    }
+
+    public static void main(String[] args) {
+        for (int i = 0; i < 8; i++) {
+            System.out.println(assignTeam(i));
+        }
+        System.err.println("111111111111");
+    }
+}