diff --git a/src/main/java/cn/airnan/dg/DrawAndGuessApplication.java b/src/main/java/cn/airnan/dg/DrawAndGuessApplication.java index 075823e..5e0977c 100644 --- a/src/main/java/cn/airnan/dg/DrawAndGuessApplication.java +++ b/src/main/java/cn/airnan/dg/DrawAndGuessApplication.java @@ -9,6 +9,7 @@ public class DrawAndGuessApplication { public static void main(String[] args) { SpringApplication.run(DrawAndGuessApplication.class, args); + // 加载题库 TopicService.loadTopics(); } diff --git a/src/main/java/cn/airnan/dg/entity/Brush.java b/src/main/java/cn/airnan/dg/entity/Brush.java index f20e472..2d3acb4 100644 --- a/src/main/java/cn/airnan/dg/entity/Brush.java +++ b/src/main/java/cn/airnan/dg/entity/Brush.java @@ -19,7 +19,7 @@ public class Brush { /** * 画笔粗细 */ - private String width; + private Integer width; /** * 画笔坐标点 */ diff --git a/src/main/java/cn/airnan/dg/entity/Room.java b/src/main/java/cn/airnan/dg/entity/Room.java index 75e41d6..f27402a 100644 --- a/src/main/java/cn/airnan/dg/entity/Room.java +++ b/src/main/java/cn/airnan/dg/entity/Room.java @@ -1,5 +1,6 @@ package cn.airnan.dg.entity; +import cn.airnan.dg.configs.Global; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -85,15 +86,22 @@ public class Room { * @param playerId 发送者的ID(用于排除发送者) */ public void sendMessage(String type, String playerId, String message) { - log.info("【房间消息】{}: {}", id, message); - for (Player player : players) { - // 向除自己之外的玩家发送消息 -// if (!player.getId().equals(playerId)) { -// player.sendMessage(type, message); -// } - // 向房间内所有玩家发送 - player.sendMessage(type, message); + if (type.equals(Global.MSG_TYPE_ROOM_DRAW)) { + log.info("【绘画房间消息】{}: {}", id, message); + for (Player player : players) { + // 向除自己之外的玩家发送消息 + if (!player.getId().equals(playerId)) { + player.sendMessage(type, message); + } + } + } else { + log.info("【全员房间消息】{}: {}", id, message); + for (Player player : players) { + // 向房间内所有玩家发送 + player.sendMessage(type, message); + } } + } }