From e86e1794ca8b263fed319409def33242c234601a Mon Sep 17 00:00:00 2001
From: Airnan <zhangyuge946@163.com>
Date: Sun, 14 Apr 2024 16:26:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=8F=AA=E6=9C=89?=
 =?UTF-8?q?=E7=BB=98=E7=94=BB=E4=BA=8B=E4=BB=B6=E6=98=AF=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E7=BB=99=E9=9D=9E=E8=87=AA=E5=B7=B1=E7=9A=84=E6=88=BF=E9=97=B4?=
 =?UTF-8?q?=E4=BA=BA=E5=91=98=EF=BC=8C=E5=85=B6=E4=BD=99=E6=B6=88=E6=81=AF?=
 =?UTF-8?q?=E6=88=BF=E9=97=B4=E5=85=A8=E5=91=98=E5=8F=91=E9=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cn/airnan/dg/DrawAndGuessApplication.java |  1 +
 src/main/java/cn/airnan/dg/entity/Brush.java  |  2 +-
 src/main/java/cn/airnan/dg/entity/Room.java   | 24 ++++++++++++-------
 3 files changed, 18 insertions(+), 9 deletions(-)

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);
+            }
         }
+
     }
 
 }