Merge remote-tracking branch 'origin/master'

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

@@ -38,10 +38,6 @@ public class RoomPO {
 	 * 20:20分钟 30:30分钟 40:40分钟 60:60分钟
 	 */
 	public int modev;
-	/** 级牌 0:随机打几 1:固定打2 **/
-	public int tc;
-	/** 积分 0:123 1:124 **/
-	public int pv;
 	//**************************配置相关***************************
 
 	/** 玩家 [key:座位号， value:玩家对象] **/

incubator-game/src/main/java/com/incubator/game/listener/PublicListener.java

@@ -31,9 +31,14 @@ public class PublicListener extends GameServerConnectionListener {
 	@Override
 	public void connectionClosed(Connection connection) {
 		try {
-			GPlayer player = GGame.onlinePlayers.get(connection.getPlayerId());
-			if (player != null && player.getSession().getHashCode() == connection.hashCode()) {
-				((Player) player).destroy();
+			if (connection != null && connection.getPlayerId() != null) {
+				GPlayer player = GGame.onlinePlayers.get(connection.getPlayerId());
+				if (player != null && player.getSession().getHashCode() == connection.hashCode()) {
+					// 执行玩家登出操作
+					((Player) player).destroy();
+				}
+			} else {
+				Log.warn("无法处理玩家退出，PlayerId为空，connection={}", connection);
 			}
 		} catch (Exception e) {
 			Log.error("玩家退出时发生异常: ", e);
@@ -69,10 +74,10 @@ public class PublicListener extends GameServerConnectionListener {
 
 			// 从对象池获取 WSRequest 实例
 			request = WSRequestPool.getRequest(bytes);
-			if (!RequestFilter.isAllowed(conn, request.getCmd())) {
-				Log.warn("请求过于频繁，已被过滤: cmd={}, player={}", request.getCmd(), conn.getPlayerId());
-				return;
-			}
+//			if (!RequestFilter.isAllowed(conn, request.getCmd())) {
+//				Log.warn("请求过于频繁，已被过滤: cmd={}, player={}", request.getCmd(), conn.getPlayerId());
+//				return;
+//			}
 
 			// 获取处理器
 			NetHandler handler = GGame.handlers.get(request.getCmd());

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

@@ -38,18 +38,9 @@ public class ZDRoom extends Room {
         this.data.gameType = jsonData.getInteger("gameType");
         this.data.ownerId = player != null? player.getId() : "";
         this.data.maxNum = 4;
-        // 级牌 0:随机打几 1:固定打2
-        this.data.tc = jsonData.getInteger("tc");
-        // 积分 0:123 1:124
-        this.data.pv = jsonData.getInteger("pv");
         this.data.mode = jsonData.getInteger("mode");
         this.data.modev = jsonData.getInteger("modev");
 
-        // 连续打
-        if (this.data.mode == 1) {
-            this.data.maxRound = 9999;
-        }
-
         // 按局数
         if (this.data.mode == 2) {
             this.data.maxRound = jsonData.getInteger("modev");
@@ -391,11 +382,11 @@ public class ZDRoom extends Room {
             // 随机定庄
             this.data.zhuangPos = RandomUtil.getIndex(this.data.maxNum);
             // 随机打几
-            if (this.data.tc == 0) {
+            if (this.jsonData.getInteger("tc") == 0) {
                 this.data.curLevelIndex = RandomUtil.getIndex(GDUtils.levelPoint.length);
             }
             // 固定打2
-            if (this.data.tc == 1) {
+            if (this.jsonData.getInteger("tc") == 1) {
                 this.data.curLevelIndex = 0;
             }
             this.data.curLevelPoint = GDUtils.levelPoint[this.data.curLevelIndex];
@@ -1141,7 +1132,7 @@ public class ZDRoom extends Room {
             switch (teammateData.getRank()) {
                 case 2:
                     // 搭档2游, +3
-                    if (this.data.pv == 0) {
+                    if (this.jsonData.getInteger("pv") == 0) {
                         scores = 3;
                     } else {
                         scores = 4;