优化全局功能模块管理类与玩家各功能模块管理类命名

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

@@ -24,7 +24,7 @@ import com.incubator.game.data.jdbc.LSDBHandler;
 import com.incubator.game.listener.PublicListener;
 import com.incubator.game.player.GPlayer;
 import com.incubator.game.player.PlayerPool;
-import com.incubator.game.room.RoomManager;
+import com.incubator.game.room.RoomService;
 import com.incubator.game.timer.FlushDB;
 import com.incubator.game.timer.RefreshNewDay;
 import com.incubator.game.util.GameDataUtil;
@@ -224,7 +224,7 @@ public class GGame extends AbstractService {
         //加载数据库数据
 //        this.initAllBlobGameData();
         //初始化 房间服务
-        RoomManager.getInstance().init(5);
+        RoomService.getInstance().init(5);
     }
 
 //    private ProtoData.GlobalAllBlobData.Builder initAllBlobGameData() {

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

@@ -7,7 +7,7 @@ import com.incubator.core.net.ws.WSRequest;
 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.room.RoomService;
 import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;
@@ -42,7 +42,7 @@ public class CreatRoomHandler extends NetHandler {
 		}
 
 		// 玩家是否存在房间
-		Room room = RoomManager.getInstance().getRoomByPlayerId(player.getId());
+		Room room = RoomService.getInstance().getRoomByPlayerId(player.getId());
 		if (room != null) {
 			logger.info("玩家已在房间，不可创建房间");
 			response.setCode(CommonProto.Code.PLAYER_ROOM_EXIST_ERR_VALUE);
@@ -51,7 +51,7 @@ public class CreatRoomHandler extends NetHandler {
 		}
 
 		// 创建房间
-		room = RoomManager.getInstance().creatRoom(player, type);
+		room = RoomService.getInstance().creatRoom(player, type);
 
 		if (room == null) {
 			logger.info("系统错误");

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

@@ -7,7 +7,7 @@ import com.incubator.core.net.ws.WSRequest;
 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.room.RoomService;
 import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;
@@ -42,7 +42,7 @@ public class JoinRoomHandler extends NetHandler {
 		}
 
 		// 房间是否存在
-		Room room = RoomManager.getInstance().getRoom(roomId);
+		Room room = RoomService.getInstance().getRoom(roomId);
 		if (room == null) {
 			logger.info("房间已解散");
 			response.setCode(CommonProto.Code.ROOM_NOT_EXIST_ERR_VALUE);
@@ -59,7 +59,7 @@ public class JoinRoomHandler extends NetHandler {
 		}
 
 		// 加入房间
-		room = RoomManager.getInstance().joinRoom(room, player);
+		room = RoomService.getInstance().joinRoom(room, player);
 
 		// 玩家绑定房间
 		player.data.roomId = room.data.roomId;

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

@@ -8,7 +8,7 @@ import com.incubator.core.net.ws.WSResponse;
 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.room.RoomService;
 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 {
 		player.onLogin();
 
 		// 玩家是否在房间
-		Room room = RoomManager.getInstance().getRoomByPlayerId(player.getId());
+		Room room = RoomService.getInstance().getRoomByPlayerId(player.getId());
 
 		// 正常返回
 		Map<String, Object> map = new HashMap<>();

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

@@ -7,7 +7,7 @@ import com.incubator.core.net.ws.WSRequest;
 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.room.RoomService;
 import com.incubator.game.util.CardUtils;
 import com.incubator.game.util.JDGDUtils;
 import com.incubator.game.util.ProtoUtil;
@@ -43,7 +43,7 @@ public class JDGDDisCardHandler extends NetHandler {
         }
 
         // 玩家房间是否存在
-        JDGDRoom room = (JDGDRoom) RoomManager.getInstance().getRoom(player.data.roomId);
+        JDGDRoom room = (JDGDRoom) RoomService.getInstance().getRoom(player.data.roomId);
         if (room == null) {
             logger.info("玩家房间已解散");
             response.setCode(CommonProto.Code.ROOM_NOT_EXIST_ERR_VALUE);

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

@@ -6,7 +6,7 @@ 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.room.RoomManager;
+import com.incubator.game.room.RoomService;
 import com.incubator.game.room.JDGDRoom;
 import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
@@ -41,7 +41,7 @@ public class JDGDPassHandler extends NetHandler {
         }
 
         // 玩家房间是否存在
-        JDGDRoom room = (JDGDRoom) RoomManager.getInstance().getRoom(player.data.roomId);
+        JDGDRoom room = (JDGDRoom) RoomService.getInstance().getRoom(player.data.roomId);
         if (room == null) {
             logger.info("玩家房间已解散");
             response.setCode(CommonProto.Code.ROOM_NOT_EXIST_ERR_VALUE);

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

@@ -7,7 +7,7 @@ import com.incubator.core.net.ws.WSRequest;
 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.room.RoomService;
 import com.incubator.game.util.ProtoUtil;
 import com.incubator.game.util.PlayerUtil;
 import com.incubator.message.proto.CommonProto;
@@ -44,7 +44,7 @@ public class JDGDReadyHandler extends NetHandler {
 		}
 
 		// 玩家房间是否存在
-		JDGDRoom room = (JDGDRoom) RoomManager.getInstance().getRoom(player.data.roomId);
+		JDGDRoom room = (JDGDRoom) RoomService.getInstance().getRoom(player.data.roomId);
 		if (room == null) {
 			logger.info("玩家房间已解散");
 			response.setCode(CommonProto.Code.ROOM_NOT_EXIST_ERR_VALUE);

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

@@ -19,7 +19,7 @@ public class JDGDRoom extends Room implements GRoomInterface {
 
     @Override
     public void init(Player player, int type) {
-        this.data.roomId = RoomManager.getInstance().randomRoomId();
+        this.data.roomId = RoomService.getInstance().randomRoomId();
         this.data.type = type;
         this.data.ownerId = player.getId();
         // todo 默认配置

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

@@ -65,7 +65,7 @@ public class Room {
         // 重置房间数据
         this.data.init();
         // 归还房间对象
-        RoomManager.getInstance().releaseRoom(this);
+        RoomService.getInstance().releaseRoom(this);
         logger.debug("Room {} has been destroyed.", this.data.roomId);
     }
 }

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

@@ -13,11 +13,11 @@ import java.util.concurrent.*;
 /**
  * 房间 管理类
  */
-public class RoomManager {
+public class RoomService {
 
     protected Logger logger = Log4jUtil.getLogger(getClass());
 
-    private static RoomManager instance;
+    private static RoomService instance;
     /** 房间对象池 **/
     public Queue<Room> roomPool;
     /** 最大空闲房间数量 **/
@@ -28,9 +28,9 @@ public class RoomManager {
     /** 房间缓存 [key:房间类型, value:房间实例] **/
     public Map<Integer, Room> roomMap = new ConcurrentHashMap<>();
 
-    public synchronized static RoomManager getInstance() {
+    public synchronized static RoomService getInstance() {
         if (instance == null) {
-            instance = new RoomManager();
+            instance = new RoomService();
         }
         return instance;
     }

incubator-game/src/main/java/com/incubator/game/timer/RefreshNewDay.java

@@ -4,7 +4,7 @@ import com.incubator.core.quartz.QuartzTask;
 import com.incubator.game.GGame;
 import com.incubator.game.player.GPlayer;
 import com.incubator.game.player.Player;
-import com.incubator.game.room.RoomManager;
+import com.incubator.game.room.RoomService;
 import org.quartz.JobExecutionContext;
 import org.quartz.JobExecutionException;
 
@@ -37,6 +37,6 @@ public final class RefreshNewDay extends QuartzTask {
             player.refreshNewDay();
         }
         //2.刷新全局模块数据
-        RoomManager.getInstance().refreshNewDay();
+        RoomService.getInstance().refreshNewDay();
     }
 }