增加官方比赛功能

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

@@ -14,6 +14,7 @@ import com.incubator.common.util.PropertiesUtil;
 import com.incubator.core.net.http.HttpRequestHandler;
 import com.incubator.core.quartz.QuartzServer;
 import com.incubator.core.quartz.QuartzTask;
+import com.incubator.game.contest.ContestService;
 import com.incubator.game.listener.CenterClientListener;
 import com.incubator.game.listener.HttpInnerListener;
 import com.incubator.core.net.ws.NetHandler;
@@ -225,6 +226,8 @@ public class GGame extends AbstractService {
 //        this.initAllBlobGameData();
         //初始化 房间服务
         RoomService.getInstance().init(5);
+        //初始化 官方比赛服务
+        ContestService.getInstance().init(5);
     }
 
 //    private ProtoData.GlobalAllBlobData.Builder initAllBlobGameData() {

incubator-game/src/main/java/com/incubator/game/contest/Contest.java

@@ -0,0 +1,240 @@
+package com.incubator.game.contest;
+
+import com.incubator.common.log4j.Log4jUtil;
+import com.incubator.game.GGame;
+import com.incubator.game.data.po.ContestPO;
+import com.incubator.game.player.Player;
+import com.incubator.game.room.Room;
+import com.incubator.game.room.RoomService;
+import com.incubator.game.util.PlayerUtil;
+import com.incubator.game.util.ProtoUtil;
+import com.incubator.message.proto.CommonProto;
+import org.slf4j.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * 官方比赛实体类
+ */
+public class Contest {
+
+    protected Logger logger = Log4jUtil.getLogger(getClass());
+
+    /** 比赛数据 **/
+    public ContestPO data;
+
+    /** 激活标记 **/
+    private boolean isActive;
+
+    /** 房间角色 [key:玩家id, value:玩家对象]**/
+    public Map<String, Player> actors = new ConcurrentHashMap<>();
+
+    /** 比赛任务主线程 **/
+    private ScheduledExecutorService scheduler;
+
+    public Contest() {
+        if (this.scheduler == null || this.scheduler.isShutdown()) {
+            this.scheduler = Executors.newSingleThreadScheduledExecutor();
+        }
+    }
+
+    /**
+     * 初始化
+     *
+     * @param roomType
+     * @param contestId
+     */
+    public void init(int roomType, int contestId) {
+        // 初始化比赛
+        this.data = new ContestPO();
+        this.data.contestId = contestId;
+        this.data.startTime = GGame.APP_TIME + (1 * 60 * 1000);
+        this.data.endTime = this.data.startTime + (1 * 60 * 60 * 1000);
+        this.data.contestType = 1;
+        this.data.level = 1;
+        this.data.name = "五常大米第一期大奖赛";
+        this.data.url = "https://pic.616pic.com/ad_preview/00/05/85/62733634ac95e.jpg-0.jpg";
+        this.data.type = roomType;
+    }
+
+    /**
+     * 开启官方比赛主线程
+     */
+    public void startContestTask() {
+        this.isActive = true;
+        this.scheduler.scheduleAtFixedRate(() -> {
+            if (this.isActive) {
+                this.doUpdate();
+            }
+        }, 0, 1, TimeUnit.SECONDS);
+    }
+
+    /**
+     * 比赛主线程逻辑
+     */
+    public void doUpdate() {
+        logger.debug("检测: 官方比赛主线程执行...");
+        switch (this.data.state) {
+            case 0:
+                // 等待开始
+                if (this.checkReadyStart()) {
+                    this.data.state = 1;
+                    this.data.flag = false;
+                    this.data.time = 0;
+                }
+
+                // 120秒未开始直接解散
+//                if (this.data.time >= 120) {
+//                    // 广播
+//                    for (Player tmPlayer : this.data.playerMap.values()) {
+//                        if (tmPlayer != null) {
+//                            tmPlayer.receive(CommonProto.Cmd.DisbandRoom_VALUE, new HashMap<>());
+//                        }
+//                    }
+//                    this.destroy();
+//                }
+                break;
+            case 1:
+                // 比赛开始
+                if (!this.data.flag) {
+                    //开始
+                    if (this.data.time >= 3) {
+                        this.doStart();
+                        this.data.state = 2;
+                        this.data.flag = false;
+                        this.data.time = 0;
+                        logger.debug("检测: 比赛id:{}, 比赛人数:{}, 状态:比赛开始...", this.data.contestId, this.data.actors.size());
+                    }
+                }
+                break;
+            case 2:
+                // 进行中
+                if (!this.data.flag) {
+
+                } else {
+
+                }
+                break;
+            case 3:
+                // 结束
+                if (!this.data.flag) {
+                    this.data.flag = true;
+                    this.data.time = 0;
+                    logger.debug("比赛结束: 比赛id : {}, 比赛人数 : {}", this.data.contestId, this.data.actors.size());
+                }
+//                else {
+//                    // 小于最大局数,切等待状态
+//                    if (this.data.curRound < this.data.maxRound) {
+//                        this.resetRoom();
+//                        this.data.state = 0;
+//                        this.data.flag = false;
+//                        this.data.time = 0;
+//                    } else {
+//                        // 120秒未开始直接解散
+//                        if (this.data.time >= 120) {
+//                            // 广播
+//                            for (Player tmPlayer : this.data.playerMap.values()) {
+//                                if (tmPlayer != null) {
+//                                    tmPlayer.receive(CommonProto.Cmd.DisbandRoom_VALUE, new HashMap<>());
+//                                }
+//                            }
+//                            this.destroy();
+//                        }
+//                    }
+//                }
+                break;
+        }
+
+        this.data.time += 1;
+    }
+
+    /**
+     * 检测是否可以开始 默认3秒后比赛开始
+     *
+     * @return
+     */
+    public boolean checkReadyStart() {
+        if (!this.isStart() || this.data.state != 0) {
+            return false;
+        }
+
+        // 广播3秒倒计时
+//        for (Player tmPlayer : this.data.playerMap.values()) {
+//            if (tmPlayer != null) {
+//                Map<String, Object> data = ProtoUtil.roomToMessage(this, tmPlayer, null);
+//                data.put("state", 1);
+//                data.put("time", 3);
+//                tmPlayer.receive(CommonProto.Cmd.GameStateChange_VALUE, data);
+//            }
+//        }
+
+        return true;
+    }
+
+    /**
+     * 比赛是否可开始
+     *
+     * @return
+     */
+    public boolean isStart() {
+        // 时间是否到了
+        return GGame.APP_TIME >= this.data.startTime;
+    }
+
+    /**
+     * 比赛开始
+     */
+    public void doStart() {
+        // 玩家匹配,分配房间
+        Room room = RoomService.getInstance().creatRoom(null, 1);
+        if (room == null) {
+            logger.error("比赛开始...创建房间出错...比赛 : {}, name : {}", this.data.contestId, this.data.name);
+            return;
+        }
+        // 推送广播,拉玩家进房间
+        for (String id : this.data.actors) {
+            Player tmPlayer = (Player) PlayerUtil.getOnlinePlayer(id);
+            if (tmPlayer == null) {
+                continue;
+            }
+            Map<String, Object> data = new HashMap<>();
+            data.put("roomId", room.roomId);
+            data.put("roomType", room.type);
+            logger.debug("比赛开始 : 比赛 : {}, 玩家 : {}", this.data.contestId, this.actors);
+            tmPlayer.receive(CommonProto.Cmd.MatchOfficialStart_VALUE, data);
+        }
+    }
+
+    /**
+     * 比赛重置逻辑
+     */
+    public void resetContest() {
+
+    }
+
+    /**
+     * 重置比赛，用于对象池回收前清理状态
+     */
+    public void reset() {
+        this.isActive = false;
+    }
+
+    /**
+     * 销毁比赛，释放资源
+     */
+    public void destroy() {
+        this.reset();
+        this.scheduler.shutdownNow();
+        this.scheduler = null;
+        // 重置比赛数据
+        this.resetContest();
+        // 归还比赛对象
+        ContestService.getInstance().releaseContest(this);
+        logger.debug("Contest {} has been destroyed.", this.data.contestId);
+    }
+}

incubator-game/src/main/java/com/incubator/game/contest/ContestService.java

@@ -0,0 +1,156 @@
+package com.incubator.game.contest;
+
+import com.incubator.common.log4j.Log4jUtil;
+import com.incubator.game.player.Player;
+import com.incubator.game.room.Room;
+import com.incubator.game.room.RoomFactory;
+import org.slf4j.Logger;
+
+import java.util.Map;
+import java.util.Queue;
+import java.util.concurrent.*;
+
+/**
+ * 官方比赛 管理类
+ */
+public class ContestService {
+
+    protected Logger logger = Log4jUtil.getLogger(getClass());
+
+    private static ContestService instance;
+    /** 官方比赛对象池 **/
+    public Queue<Contest> contestPool;
+    /** 最大空闲比赛数量 **/
+    private int maxIdleContest;
+    /** 清理线程 **/
+    private ScheduledExecutorService cleaner;
+
+    /** 比赛缓存 **/
+    public Map<Integer, Contest> contestMap = new ConcurrentHashMap<>();
+
+    public synchronized static ContestService getInstance() {
+        if (instance == null) {
+            instance = new ContestService();
+        }
+        return instance;
+    }
+
+    /**
+     * 初始化
+     *
+     * @param maxIdleContest 最大空闲数量
+     */
+    public void init(int maxIdleContest) {
+        logger.info("初始化官方比赛服务...");
+        this.contestPool = new ConcurrentLinkedQueue<>();
+        this.maxIdleContest = maxIdleContest;
+        this.cleaner = Executors.newSingleThreadScheduledExecutor();
+        // 定期清理空闲比赛
+        this.cleaner.scheduleAtFixedRate(this::cleanIdleContest, 10, 30, TimeUnit.SECONDS);
+
+        //todo 测试创建一个比赛，5分钟后开始
+        this.creatContest(1, 1001);
+    }
+
+    /**
+     * 获取比赛对象
+     *
+     * @param roomType 房间类型
+     * @return
+     */
+    public Contest acquireContest(int roomType) {
+        Contest contest = this.contestPool.poll();
+        if (contest == null) {
+            // 创建指定类型的比赛
+            contest = new Contest();
+        }
+        return contest;
+    }
+
+    /**
+     * 归还比赛对象
+     */
+    public void releaseContest(Contest contest) {
+        if (contest != null) {
+            this.contestPool.offer(contest); // 放回池中
+        }
+    }
+
+    /**
+     * 定期清理空闲比赛对象
+     */
+    private void cleanIdleContest() {
+        while (this.contestPool.size() > maxIdleContest) {
+            Contest contest = this.contestPool.poll();
+            if (contest != null) {
+                // 销毁比赛，释放资源
+                contest.destroy();
+            }
+        }
+    }
+
+    /**
+     * 关闭对象池
+     */
+    public void shutdown() {
+        this.cleaner.shutdownNow();
+        this.contestPool.forEach(Contest::destroy);
+        this.contestPool.clear();
+    }
+
+    public int getAvailableContest() {
+        return this.contestPool.size();
+    }
+
+    /**
+     * 获取玩家报名的比赛
+     *
+     * @param playerId
+     * @return
+     */
+    public Contest getContestByPlayerId(String playerId) {
+        for (Contest contest : this.contestMap.values()) {
+            if (contest != null && contest.actors != null && contest.actors.containsKey(playerId)) {
+                return contest;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 创建比赛
+     *
+     * @param roomType
+     * @param contestId
+     * @return
+     */
+    public Contest creatContest(int roomType, int contestId) {
+        // 从对象池获取比赛实例
+        Contest contest = this.acquireContest(roomType);
+        // 初始化比赛数据
+        contest.init(roomType, contestId);
+        // 开始主线程逻辑
+        contest.startContestTask();
+        // 加入缓存
+        this.contestMap.put(contest.data.contestId, contest);
+        return contest;
+    }
+
+    /**
+     * 报名加入比赛
+     *
+     * @param player
+     * @param contestId
+     */
+    public Contest joinContest(Player player, int contestId) {
+        Contest contest = this.contestMap.getOrDefault(contestId, null);
+        if (contest == null) {
+            return null;
+        }
+        // 加入比赛角色缓存
+        if (!contest.actors.containsKey(player.getId())) {
+            contest.actors.put(player.getId(), player);
+        }
+        return contest;
+    }
+}

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

@@ -0,0 +1,54 @@
+package com.incubator.game.data.po;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * 比赛数据实体类
+ * 作者：agui
+ * 自动创建时间：2022-10-01 02:24:37
+ */
+public class ContestPO {
+
+    /** 赛事id */
+    public int contestId;
+    /** 已报名角色id **/
+    public List<String> actors = new ArrayList<>();
+    /** 开始时间 **/
+    public long startTime;
+    /** 结束时间 **/
+    public long endTime;
+
+    /** 比赛类型 1:大奖赛 **/
+    public int contestType;
+    /** 比赛等级 **/
+    public int level;
+    /** 比赛名称 **/
+    public String name;
+    /** 比赛海报地址 **/
+    public String url;
+    /** 比赛房间玩法类型 1:掼蛋 2.转蛋*/
+    public int type;
+
+    /** 检测标记 **/
+    public boolean flag;
+    /** 时间秒数 **/
+    public int time;
+    /** 比赛状态(0等待/报名中 1比赛开始 2进行中 3已结束) **/
+    public int state;
+
+    public ContestPO() {}
+
+    public void init() {
+        this.contestId = 0;
+        this.actors.clear();
+        this.startTime = 0L;
+        this.endTime = 0L;
+        this.contestType = 0;
+        this.level = 0;
+        this.name = "";
+        this.url = "";
+        this.type = 0;
+    }
+
+}

incubator-game/src/main/java/com/incubator/game/handler/GetRoomRuleInfoHandler.java

@@ -6,11 +6,12 @@ import com.incubator.core.net.ws.NetHandler;
 import com.incubator.core.net.ws.WSRequest;
 import com.incubator.core.net.ws.WSResponse;
 import com.incubator.game.player.Player;
+import com.incubator.game.util.GMStruct;
+import com.incubator.game.util.GMUtil;
 import com.incubator.game.util.PlayerUtil;
+import com.incubator.game.util.ProtoUtil;
 import com.incubator.message.proto.CommonProto;
 
-import java.util.HashMap;
-
 /**
  * 获取玩法规则信息 请求
  *
@@ -32,7 +33,7 @@ public class GetRoomRuleInfoHandler extends NetHandler {
 		}
 
 		// 判断参数
-		int type = request.getDataValue("type", Integer.class, 0);
+		int type = request.getDataValue("ty", Integer.class, 0);
 		if (type <= 0) {
 			logger.info("参数错误");
 			response.setCode(CommonProto.Code.PARAMETER_ERR_VALUE);
@@ -40,10 +41,27 @@ public class GetRoomRuleInfoHandler extends NetHandler {
 			return;
 		}
 
+		GMStruct.GameRule gameRule = null;
 		// 获取玩法类型规则
+		switch (type) {
+			case 1:
+				gameRule = GMUtil.getRule(type);
+				break;
+			default:
+				logger.info("未知玩法类型...{}", type);
+				response.setCode(CommonProto.Code.PARAMETER_ERR_VALUE);
+				response.setMessage("未知玩法类型");
+				return;
+		}
 
+		if (gameRule == null) {
+			logger.info("获取规则错误");
+			response.setCode(10);
+			response.setMessage("获取规则错误");
+			return;
+		}
 
 		// 正常返回
-		response.setData(new HashMap<>());
+		response.setData(ProtoUtil.gameRuleToMessage(gameRule));
 	}
 }

incubator-game/src/main/java/com/incubator/game/handler/LoginGameHandler.java

@@ -5,6 +5,8 @@ import com.incubator.common.net.Connection;
 import com.incubator.core.net.ws.NetHandler;
 import com.incubator.core.net.ws.WSRequest;
 import com.incubator.core.net.ws.WSResponse;
+import com.incubator.game.contest.Contest;
+import com.incubator.game.contest.ContestService;
 import com.incubator.game.data.po.PlayerInfoPO;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.Room;
@@ -83,10 +85,17 @@ public class LoginGameHandler extends NetHandler {
 		// 玩家是否在房间
 		Room room = RoomService.getInstance().getRoomByPlayerId(player.getId());
 
+		// 玩家是否报名官方比赛
+		Contest contest = ContestService.getInstance().getContestByPlayerId(player.getId());
+
 		// 正常返回
 		Map<String, Object> map = new HashMap<>();
 		map.put("playerInfo", ProtoUtil.playerInfoToMessage(player));
+		// 玩家绑定的房间号
 		map.put("roomId", room != null? room.roomId : 0);
+		// 官方比赛信息
+		map.put("contestId", contest != null? contest.data.contestId : 0);
+		map.put("contestInfo", ProtoUtil.contestListToMessage());
 		response.setData(map);
 	}
 }

incubator-game/src/main/java/com/incubator/game/handler/contest/JoinContestHandler.java

@@ -0,0 +1,62 @@
+package com.incubator.game.handler.contest;
+
+import com.incubator.common.MessageHandler;
+import com.incubator.common.net.Connection;
+import com.incubator.core.net.ws.NetHandler;
+import com.incubator.core.net.ws.WSRequest;
+import com.incubator.core.net.ws.WSResponse;
+import com.incubator.game.contest.Contest;
+import com.incubator.game.contest.ContestService;
+import com.incubator.game.player.Player;
+import com.incubator.game.util.PlayerUtil;
+import com.incubator.game.util.ProtoUtil;
+import com.incubator.message.proto.CommonProto;
+
+import java.util.HashMap;
+
+/**
+ * 加入比赛/报名 请求
+ *
+ * @author johnc
+ */
+@MessageHandler(id = CommonProto.Cmd.MatchSignUpReq_VALUE)
+public class JoinContestHandler extends NetHandler {
+
+    @Override
+    public void onDate(Connection session, WSRequest request, WSResponse response) {
+        response.setCmd(CommonProto.Cmd.MatchSignUpRes_VALUE);
+
+        Player player = (Player) PlayerUtil.getOnlinePlayer(session.getPlayerId());
+        if (player == null) {
+            logger.info("创建房间失败，找不到玩家");
+            response.setCode(CommonProto.Code.SYSTEM_ERR_VALUE);
+            response.setMessage("操作失败...");
+            return;
+        }
+
+        // 判断参数
+        int contestId = request.getDataValue("contestId", Integer.class, 0);
+        if (contestId <= 0) {
+            logger.info("参数错误");
+            response.setCode(CommonProto.Code.PARAMETER_ERR_VALUE);
+            response.setMessage("参数错误...");
+            return;
+        }
+
+        // 比赛是否存在
+        Contest contest = ContestService.getInstance().contestMap.getOrDefault(contestId, null);
+        if (contest == null) {
+            logger.info("比赛不存在或已结束");
+            response.setCode(CommonProto.Code.CONTEST_NOT_EXIST_ERR_VALUE);
+            response.setMessage("操作失败，房间已解散...");
+            return;
+        }
+        // 扣门票
+
+        // 报名加入比赛
+        contest = ContestService.getInstance().joinContest(player, contest.data.contestId);
+
+        // 正常返回
+        response.setData(ProtoUtil.contestInfoToMessage(contest));
+    }
+}

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

@@ -25,15 +25,19 @@ public class JDGDRoom extends Room implements GRoomInterface {
     public void init(Player player, int type) {
         this.roomId = RoomService.getInstance().randomRoomId();
         this.type = type;
-        this.ownerId = player.getId();
-        if (!this.actors.containsKey(player.getId())) {
-            this.actors.put(player.getId(), player);
+        if (player != null) {
+            this.ownerId = player.getId();
+            if (!this.actors.containsKey(player.getId())) {
+                this.actors.put(player.getId(), player);
+            }
         }
         // todo 默认配置
         this.data = new RoomPO();
         this.data.maxNum = 2;
         this.data.maxRound = 8;
-        this.data.playerMap.put(0, player);
+        if (player != null) {
+            this.data.playerMap.put(0, player);
+        }
         // 初始化级牌点数
         this.data.curLevelPoint = JDGDUtils.levelPoint[this.data.curLevelIndex];
         this.initCardList();

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

@@ -23,7 +23,7 @@ public class Room {
 
     /** 房间号 */
     public int roomId;
-    /** 房间玩法类型 1:经典掼蛋 */
+    /** 房间玩法类型 1:掼蛋 */
     public int type;
     /** 房主playerId **/
     public String ownerId = "";

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

@@ -36,7 +36,7 @@ public final class GMUtil {
 //            Map<String, String> map = JSON.parseObject(json, Map.class);
             System.err.println("1111111111");
         } catch (Exception e) {
-            System.err.println("抓转换json出错");;
+            System.err.println("转换json出错");;
         }
     }
 

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

@@ -1,5 +1,7 @@
 package com.incubator.game.util;
 
+import com.incubator.game.contest.Contest;
+import com.incubator.game.contest.ContestService;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.JDGDRoom;
 import com.incubator.game.room.Room;
@@ -152,4 +154,57 @@ public final class ProtoUtil {
         return data;
     }
 
+    /**
+     * 官方比赛集合转消息
+     *
+     * @return
+     */
+    public static Map<String, Object> contestListToMessage() {
+        Map<String, Object> data = new HashMap<>();
+        for (Contest contest : ContestService.getInstance().contestMap.values()) {
+            if (contest != null) {
+                data.put(String.valueOf(contest.data.contestId), ProtoUtil.contestInfoToMessage(contest));
+            }
+        }
+        return data;
+    }
+
+    /**
+     * 官方比赛集合转消息
+     *
+     * @return
+     */
+    public static Map<String, Object> contestInfoToMessage(Contest contest) {
+        Map<String, Object> data = new HashMap<>();
+        if (contest != null) {
+            data.put("contestId", contest.data.contestId);
+            data.put("contestName", contest.data.name);
+            data.put("contestType", contest.data.contestType);
+            data.put("contestPlayType", contest.data.type);
+            data.put("contestLevel", contest.data.level);
+            data.put("contestTime", contest.data.startTime);
+            data.put("contestState", contest.data.state);
+            data.put("contestPhotoUrl", contest.data.url);
+            data.put("regisCount", 0);
+            data.put("regisMoney", "");
+            data.put("regisMoneyType", "");
+            List<Map<String, Object>> regisList = new ArrayList<>();
+            if (!contest.actors.isEmpty()) {
+                Map<String, Object> playerInfo;
+                for (Player player : contest.actors.values()) {
+                    if (player == null) {
+                        continue;
+                    }
+                    playerInfo = new HashMap<>();
+                    playerInfo.put("id", player.getId());
+                    playerInfo.put("name", player.data.name);
+                    playerInfo.put("avatar", "https://img95.699pic.com/element/40109/0194.png_300.png");
+                    playerInfo.put("sex", player.data.sex);
+                    regisList.add(playerInfo);
+                }
+            }
+            data.put("regisList", regisList);
+        }
+        return data;
+    }
 }