优化代码

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

@@ -7,7 +7,7 @@ import com.incubator.core.net.ws.WSResponse;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.Room;
 import com.incubator.game.room.RoomManager;
-import com.incubator.game.util.MsgUtil;
+import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.game.util.RoomUtils;
 import com.incubator.message.proto.CommonProto;
@@ -66,6 +66,6 @@ public class CreatRoomHandler extends NetHandler {
 		room.startRoomTask();
 
 		// 正常返回
-		response.setData(MsgUtil.roomToMessage(room, player, null));
+		response.setData(ProtoUtil.roomToMessage(room, player, null));
 	}
 }

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

@@ -7,7 +7,7 @@ import com.incubator.core.net.ws.WSResponse;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.Room;
 import com.incubator.game.room.RoomManager;
-import com.incubator.game.util.MsgUtil;
+import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;
 
@@ -63,6 +63,6 @@ public class JoinRoomHandler extends NetHandler {
 		player.data.roomId = room.data.roomId;
 
 		// 正常返回
-		response.setData(MsgUtil.roomToMessage(room, player, null));
+		response.setData(ProtoUtil.roomToMessage(room, player, null));
 	}
 }

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

@@ -8,7 +8,7 @@ import com.incubator.game.data.entity.PlayerInfoPO;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.Room;
 import com.incubator.game.room.RoomManager;
-import com.incubator.game.util.MsgUtil;
+import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;
 
@@ -56,7 +56,7 @@ public class LoginGameHandler extends NetHandler {
 
 		// 正常返回
 		Map<String, Object> map = new HashMap<>();
-		map.put("playerInfo", MsgUtil.playerInfoToMessage(player));
+		map.put("playerInfo", ProtoUtil.playerInfoToMessage(player));
 		map.put("roomId", room != null? room.data.roomId : 0);
 		response.setData(map);
 	}

incubator-game/src/main/java/com/incubator/game/handler/jdgd/JDGDDisCardHandler.java

@@ -9,7 +9,7 @@ import com.incubator.game.player.Player;
 import com.incubator.game.room.RoomManager;
 import com.incubator.game.util.CardUtils;
 import com.incubator.game.util.JDGDUtils;
-import com.incubator.game.util.MsgUtil;
+import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;
 
@@ -105,6 +105,6 @@ public class JDGDDisCardHandler extends NetHandler {
         room.playerDisCard(player, disCardList, cardType);
 
         // 正常返回
-        response.setData(MsgUtil.roomToMessage(room, player, room.data.currentPlayer));
+        response.setData(ProtoUtil.roomToMessage(room, player, room.data.currentPlayer));
     }
 }

incubator-game/src/main/java/com/incubator/game/handler/jdgd/JDGDPassHandler.java

@@ -7,7 +7,7 @@ import com.incubator.core.net.ws.WSResponse;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.RoomManager;
 import com.incubator.game.room.JDGDRoom;
-import com.incubator.game.util.MsgUtil;
+import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;
 
@@ -67,6 +67,6 @@ public class JDGDPassHandler extends NetHandler {
         room.playerPass(player);
 
         // 正常返回
-        response.setData(MsgUtil.roomToMessage(room, player, room.data.currentPlayer));
+        response.setData(ProtoUtil.roomToMessage(room, player, room.data.currentPlayer));
     }
 }

incubator-game/src/main/java/com/incubator/game/handler/jdgd/JDGDReadyHandler.java

@@ -7,7 +7,7 @@ import com.incubator.core.net.ws.WSResponse;
 import com.incubator.game.room.JDGDRoom;
 import com.incubator.game.player.Player;
 import com.incubator.game.room.RoomManager;
-import com.incubator.game.util.MsgUtil;
+import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;
 
@@ -51,6 +51,6 @@ public class JDGDReadyHandler extends NetHandler {
 		room.playerReady(player);
 
 		// 正常返回
-		response.setData(MsgUtil.roomToMessage(room, player, null));
+		response.setData(ProtoUtil.roomToMessage(room, player, null));
 	}
 }

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

@@ -4,7 +4,7 @@ import com.incubator.game.player.Player;
 import com.incubator.core.room.GRoomInterface;
 import com.incubator.game.util.CardUtils;
 import com.incubator.game.util.JDGDUtils;
-import com.incubator.game.util.MsgUtil;
+import com.incubator.game.util.ProtoUtil;
 import com.incubator.message.proto.CommonProto;
 
 import java.util.*;
@@ -133,7 +133,7 @@ public class JDGDRoom extends Room implements GRoomInterface {
         // 推送房间其他3个玩家
         for (Player tmPlayer : this.data.playerMap.values()) {
             if (tmPlayer != null && !Objects.equals(tmPlayer.getId(), player.getId())) {
-                Map<String, Object> data = MsgUtil.roomToMessage(this, tmPlayer, null);
+                Map<String, Object> data = ProtoUtil.roomToMessage(this, tmPlayer, null);
                 tmPlayer.receive(CommonProto.Cmd.ReadyStateUpdate_VALUE, data);
             }
         }
@@ -153,7 +153,7 @@ public class JDGDRoom extends Room implements GRoomInterface {
         // 广播3秒倒计时
         for (Player tmPlayer : this.data.playerMap.values()) {
             if (tmPlayer != null) {
-                Map<String, Object> data = MsgUtil.roomToMessage(this, 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);
@@ -226,7 +226,7 @@ public class JDGDRoom extends Room implements GRoomInterface {
         // 广播
         for (Player tmPlayer : this.data.playerMap.values()) {
             if (tmPlayer != null) {
-                Map<String, Object> data = MsgUtil.roomToMessage(this, tmPlayer, this.data.currentPlayer);
+                Map<String, Object> data = ProtoUtil.roomToMessage(this, tmPlayer, this.data.currentPlayer);
                 data.put("state", 2);
                 data.put("time", 20);
 //                CardUtils.printCards(tmPlayer.data.remainCards);
@@ -375,7 +375,7 @@ public class JDGDRoom extends Room implements GRoomInterface {
             // 广播其他3人
             for (Player tmPlayer : this.data.playerMap.values()) {
                 if (tmPlayer != null && !Objects.equals(tmPlayer.getId(), player.getId())) {
-                    Map<String, Object> data = MsgUtil.roomToMessage(this, tmPlayer, this.data.currentPlayer);
+                    Map<String, Object> data = ProtoUtil.roomToMessage(this, tmPlayer, this.data.currentPlayer);
                     tmPlayer.receive(CommonProto.Cmd.OtherPlayCards_VALUE, data);
                 }
             }
@@ -411,7 +411,7 @@ public class JDGDRoom extends Room implements GRoomInterface {
         // 广播其他3人
         for (Player tmPlayer : this.data.playerMap.values()) {
             if (tmPlayer != null && !Objects.equals(tmPlayer.getId(), player.getId())) {
-                Map<String, Object> data = MsgUtil.roomToMessage(this, tmPlayer, this.data.currentPlayer);
+                Map<String, Object> data = ProtoUtil.roomToMessage(this, tmPlayer, this.data.currentPlayer);
                 data.put("curDiscardList", new int[0]);
                 tmPlayer.receive(CommonProto.Cmd.OtherPlayCards_VALUE, data);
             }
@@ -482,7 +482,7 @@ public class JDGDRoom extends Room implements GRoomInterface {
         for (Player tmPlayer : this.data.playerMap.values()) {
             if (tmPlayer != null) {
                 // 结算信息
-                Map<String, Object> data = MsgUtil.roomToMessage(this, tmPlayer, this.data.currentPlayer);
+                Map<String, Object> data = ProtoUtil.roomToMessage(this, tmPlayer, this.data.currentPlayer);
                 tmPlayer.receive(CommonProto.Cmd.GameStateChange_VALUE, data);
             }
         }

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

@@ -3,7 +3,7 @@ package com.incubator.game.room;
 import com.incubator.common.log4j.Log4jUtil;
 import com.incubator.common.util.RandomUtil;
 import com.incubator.game.player.Player;
-import com.incubator.game.util.MsgUtil;
+import com.incubator.game.util.ProtoUtil;
 import com.incubator.message.proto.CommonProto;
 import org.slf4j.Logger;
 
@@ -104,7 +104,7 @@ public class RoomManager {
         // 推送房间其他3个玩家
         for (Player tmPlayer : room.data.playerMap.values()) {
             if (tmPlayer != null && !Objects.equals(tmPlayer.getId(), player.getId())) {
-                Map<String, Object> data = MsgUtil.roomToMessage(room, tmPlayer, null);
+                Map<String, Object> data = ProtoUtil.roomToMessage(room, tmPlayer, null);
                 tmPlayer.receive(CommonProto.Cmd.RoomPlayerJoin_VALUE, data);
             }
         }

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

@@ -8,7 +8,7 @@ import java.util.*;
 /**
  * 消息工具类
  */
-public final class MsgUtil {
+public final class ProtoUtil {
 
     /**
      * 玩家信息转消息