diff --git a/libs/data_cache/target/classes/com/data/util/Utility.class b/libs/data_cache/target/classes/com/data/util/Utility.class index 9ba95ba..d3ccf35 100644 Binary files a/libs/data_cache/target/classes/com/data/util/Utility.class and b/libs/data_cache/target/classes/com/data/util/Utility.class differ diff --git a/libs/game_common/src/main/java/com/game/GameController.java b/libs/game_common/src/main/java/com/game/GameController.java index 09c329a..158ccb8 100644 --- a/libs/game_common/src/main/java/com/game/GameController.java +++ b/libs/game_common/src/main/java/com/game/GameController.java @@ -215,12 +215,22 @@ public class GameController implements IController{ /** - * 房间解散投票请求 + * 处理房间解散投票请求 + * 当玩家对房间解散投票做出响应时，该方法会被调用 + * 它的主要作用是根据玩家的投票结果来处理房间的解散流程 + * + * @param sender 发起投票请求的会话 + * @param params 投票结果参数，包含玩家的投票结果（同意或不同意） + * @param gid 游戏ID，用于标识特定的游戏 + * @param owner 投票的房间所有者，即做出投票响应的玩家 */ @ActionKey(Router.GAME_DISMISS_ROOM_VOTE) - public void routerDismissRoomVote(Session sender,ITObject params,int gid,Player owner) { - boolean agree = params.getBoolean("result"); - owner.room.dismissRunable.responseDismiss(owner, agree); + public void routerDismissRoomVote(Session sender, ITObject params, int gid, Player owner) { + // 获取玩家的投票结果，true表示同意解散，false表示不同意解散 + boolean agree = params.getBoolean("result"); + + // 调用房间解散流程中的响应方法，根据玩家的投票结果来执行相应的逻辑 + owner.room.dismissRunable.responseDismiss(owner, agree); } diff --git a/libs/game_common/src/main/java/com/game/data/Room.java b/libs/game_common/src/main/java/com/game/data/Room.java index 211338d..7227295 100644 --- a/libs/game_common/src/main/java/com/game/data/Room.java +++ b/libs/game_common/src/main/java/com/game/data/Room.java @@ -34,6 +34,7 @@ import com.taurus.permanent.data.Session; import redis.clients.jedis.Jedis; + /** * 基本房间对象 * @@ -263,8 +264,14 @@ public class Room implements Runnable { this.win = new ArrayList<>(); this.loss = new ArrayList<>(); this.config = TObject.newFromJsonData(redis_room_map.get("options")); + hpData = this.config.getTObject("hpData"); + System.out.println("数据1"+hpData); + System.out.println("数据："+redis_room_map.get("hpData")); + System.out.println("数据3"+hpData.getInt("maxRound")); + Integer num = hpData.getInt("maxRound"); this.maxPlayers = Integer.parseInt(redis_room_map.get("maxPlayers")); - this.maxRound = Integer.parseInt(redis_room_map.get("times")); +// this.maxRound = Integer.parseInt(redis_room_map.get("times")); + this.maxRound = hpData.getInt("maxRound"); this.config.putInt("maxPlayers", this.maxPlayers); this.config.putInt("times", this.maxRound); this.pay = Integer.parseInt(redis_room_map.get("pay")); @@ -594,6 +601,9 @@ public class Room implements Runnable { } } + + + /** * 游戏结束 */ @@ -610,8 +620,7 @@ public class Room implements Runnable { this.saveRecRound(); if (total) { - - this.saveMilitaryTotal(false); + this.saveMilitaryTotal(true); } else { roomResult(); diff --git a/libs/game_common/src/main/java/com/game/data/RoomDismiss.java b/libs/game_common/src/main/java/com/game/data/RoomDismiss.java index 0cbde6f..e91368a 100644 --- a/libs/game_common/src/main/java/com/game/data/RoomDismiss.java +++ b/libs/game_common/src/main/java/com/game/data/RoomDismiss.java @@ -5,9 +5,11 @@ import java.util.List; import java.util.Map.Entry; import com.data.util.ErrorCode; +import com.game.Constant; import com.game.Global; import com.game.data.Timer.ITaskHandler; import com.game.room.state.RoomDestoryGameState; +import com.taurus.core.entity.ITObject; /** * 房间解散处理 @@ -53,49 +55,83 @@ public class RoomDismiss { this.dismissCallback(player); } - public void responseDismiss(Player player, boolean agree) { - if (start == false || player.dismissState != 0) { - return; - } - if (agree) { - player.dismissState = 1; - } else { - player.dismissState = 2; - } - dismissCallback(player); - } + /** + * 处理玩家的解散请求响应 + * 此方法主要用于处理玩家对解散邀请的回应只有当游戏尚未开始且玩家的解散状态为待定（0）时，才允许更新玩家的解散状态 + * + * @param player 玩家对象，表示作出回应的玩家 + * @param agree 布尔值，表示玩家是否同意解散true表示同意，false表示不同意 + */ +public void responseDismiss(Player player, boolean agree) { + // 检查游戏是否尚未开始且玩家的解散状态为待定如果条件不满足，则直接返回，不进行后续操作 + if (start == false || player.dismissState != 0) { + return; + } + // 根据玩家的回应更新玩家的解散状态 + if (agree) { + player.dismissState = 1; // 玩家同意解散，设置状态为1 + } else { + player.dismissState = 2; // 玩家不同意解散，设置状态为2 + } + + // 调用回调方法，通知玩家解散状态已更新 + dismissCallback(player); +} + + + /** + * 处理玩家解散房间的回调方法 + * + * @param player 发起解散请求的玩家 + */ private void dismissCallback(Player player) { - int agreeCount = 0; - int notAgreeCount = 0; - for (Player p : playerList) { - if (p.dismissState == 1) { - agreeCount += 1; - } else if (p.dismissState == 2) { - notAgreeCount += 1; - } - } + int agreeCount = 0; + int notAgreeCount = 0; + // 遍历玩家列表，统计同意和不同意解散房间的玩家数量 + for (Player p : playerList) { + if (p.dismissState == 1) { + agreeCount += 1; + } else if (p.dismissState == 2) { + notAgreeCount += 1; + } + } - agree = notAgreeCount == 0 && agreeCount == playerList.size(); + // 判断所有玩家是否都同意解散房间 + agree = notAgreeCount == 0 && agreeCount == playerList.size(); - if (agree) { - interruptTimer(); - } else { - if (notAgreeCount > 0) { - Global.gameCtr.dismisRoomFail(owner); - interruptTimer(); - } else { - Global.gameCtr.dismissRoom(askPlayer, null, playerList, getLeftTime()); - } - - } + // 如果所有玩家都同意，解散房间 + if (agree) { +// // 结束房间内的游戏 +// player.room.saveMilitaryTotal(true); + interruptTimer(); + } else { + // 如果有玩家不同意，通知游戏控制器解散房间失败 + if (notAgreeCount > 0) { + Global.gameCtr.dismisRoomFail(owner); + interruptTimer(); + } else { + // 如果没有玩家明确表示不同意，继续等待并通知游戏控制器 + Global.gameCtr.dismissRoom(askPlayer, null, playerList, getLeftTime()); + } + } } + /** + * 中断定时器 + * + * 此方法用于中断并释放当前对象初始化的定时器如果定时器不为空，则停止定时器的操作， + * 并将定时器引用置为null，以准备将其销毁最后，调用checkDestroy方法来检查对象是否可以被销毁 + */ private void interruptTimer() { - if (timer != null) - timer.stop(); - timer = null; - checkDestroy(); + // 检查定时器是否已被初始化且不为null + if (timer != null) + // 停止定时器的操作 + timer.stop(); + // 将定时器引用置为null，表示不再使用定时器 + timer = null; + // 调用方法检查对象是否可以被销毁 + checkDestroy(); } private void startDismiss(Player player) { @@ -137,7 +173,7 @@ public class RoomDismiss { private void checkDestroy() { start = false; if (agree) { -// owner.saveMilitaryTotal(true); + owner.saveMilitaryTotal(true); owner.stateMachine.changeState(Global.getState(RoomDestoryGameState.class)); } agree = true; diff --git a/libs/game_common/target/classes/com/game/GameController.class b/libs/game_common/target/classes/com/game/GameController.class index 6926a6b..573073a 100644 Binary files a/libs/game_common/target/classes/com/game/GameController.class and b/libs/game_common/target/classes/com/game/GameController.class differ diff --git a/libs/game_common/target/classes/com/game/data/Room.class b/libs/game_common/target/classes/com/game/data/Room.class index bf445c5..e6fe76c 100644 Binary files a/libs/game_common/target/classes/com/game/data/Room.class and b/libs/game_common/target/classes/com/game/data/Room.class differ diff --git a/libs/game_common/target/classes/com/game/data/RoomDismiss$1.class b/libs/game_common/target/classes/com/game/data/RoomDismiss$1.class index 841db89..868ec10 100644 Binary files a/libs/game_common/target/classes/com/game/data/RoomDismiss$1.class and b/libs/game_common/target/classes/com/game/data/RoomDismiss$1.class differ diff --git a/libs/game_common/target/classes/com/game/data/RoomDismiss.class b/libs/game_common/target/classes/com/game/data/RoomDismiss.class index e3732e8..4d8be25 100644 Binary files a/libs/game_common/target/classes/com/game/data/RoomDismiss.class and b/libs/game_common/target/classes/com/game/data/RoomDismiss.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/entity/TDataSerializer.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/entity/TDataSerializer.class index 23bc694..d685d43 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/entity/TDataSerializer.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/entity/TDataSerializer.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventDispatcher$EventRunner.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventDispatcher$EventRunner.class index e6eb992..97bb1aa 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventDispatcher$EventRunner.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventDispatcher$EventRunner.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventDispatcher.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventDispatcher.class index cad314e..890897b 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventDispatcher.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventDispatcher.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventManager.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventManager.class index 98b595c..d414e3a 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventManager.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/events/EventManager.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/plugin/PluginService.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/plugin/PluginService.class index 02620aa..fc57b9c 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/plugin/PluginService.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/plugin/PluginService.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/FixedIndexThreadPool$Work.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/FixedIndexThreadPool$Work.class index ecc9fcc..abd9ea1 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/FixedIndexThreadPool$Work.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/FixedIndexThreadPool$Work.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/FixedIndexThreadPool.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/FixedIndexThreadPool.class index 7d81c4f..1cf3dc0 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/FixedIndexThreadPool.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/FixedIndexThreadPool.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/MD5.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/MD5.class index a18c8ef..0892342 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/MD5.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/MD5.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/SHA1.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/SHA1.class index cf747a3..93e26cc 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/SHA1.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/SHA1.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/task/TaskScheduler$ScheduledTask.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/task/TaskScheduler$ScheduledTask.class index 192d75a..05c5b41 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/task/TaskScheduler$ScheduledTask.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/task/TaskScheduler$ScheduledTask.class differ diff --git a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/task/TaskScheduler.class b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/task/TaskScheduler.class index a16832a..a6cecfb 100644 Binary files a/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/task/TaskScheduler.class and b/libs/taurus-server/taurus-core/target/classes/com/taurus/core/util/task/TaskScheduler.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/Main.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/Main.class index 24af58b..bcd38cb 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/Main.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/Main.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer$NetworkEvtListener.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer$NetworkEvtListener.class index 7914b7a..67d83e0 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer$NetworkEvtListener.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer$NetworkEvtListener.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer$TPThreadFactory.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer$TPThreadFactory.class index 8ec1dc0..d2cf4ff 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer$TPThreadFactory.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer$TPThreadFactory.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer.class index d9ee4e4..7fa7c0e 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/TPServer.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BaseCoreService.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BaseCoreService.class index a06b9c9..e3f82e6 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BaseCoreService.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BaseCoreService.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine$1.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine$1.class index f17fa24..dc5ffe0 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine$1.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine$1.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine$PacketWriteWork.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine$PacketWriteWork.class index 1a5bbd0..daa8f29 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine$PacketWriteWork.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine$PacketWriteWork.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine.class index b46124b..efbac1d 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/BitSwarmEngine.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ConnectionFilter.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ConnectionFilter.class index e6e4e16..c4a2e41 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ConnectionFilter.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ConnectionFilter.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/DefaultConstants.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/DefaultConstants.class index ed4effc..40587e8 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/DefaultConstants.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/DefaultConstants.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/IConnectionFilter.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/IConnectionFilter.class index bdd593d..f73b19d 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/IConnectionFilter.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/IConnectionFilter.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$ExecutorConfig.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$ExecutorConfig.class index 80d1948..727245d 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$ExecutorConfig.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$ExecutorConfig.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$ExtensionConfig.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$ExtensionConfig.class index 54462c3..6d94327 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$ExtensionConfig.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$ExtensionConfig.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$IpFilterConfig.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$IpFilterConfig.class index a7a65d6..037a2ce 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$IpFilterConfig.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$IpFilterConfig.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$SocketAddress.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$SocketAddress.class index e513054..b9c7d30 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$SocketAddress.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$SocketAddress.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$WebSocketConfig.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$WebSocketConfig.class index 04b7a4c..601f73c 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$WebSocketConfig.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig$WebSocketConfig.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig.class index 1e11805..9bbe8cc 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerConfig.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerState.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerState.class index f51d88a..17c35c9 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerState.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/ServerState.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager$1.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager$1.class new file mode 100644 index 0000000..bba2e55 Binary files /dev/null and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager$1.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager$SessionCleaner.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager$SessionCleaner.class index e3686fa..85b91f1 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager$SessionCleaner.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager$SessionCleaner.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager.class index d5d807a..a04e759 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController$1.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController$1.class index d964474..c33e671 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController$1.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController$1.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController$2.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController$2.class index d24ddd4..51ab255 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController$2.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController$2.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController.class index b446459..e4273de 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SystemController.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/TPEvents.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/TPEvents.class index 0204d25..e2cf056 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/TPEvents.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/TPEvents.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/BindableSocket.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/BindableSocket.class index 7596927..dfa9fbd 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/BindableSocket.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/BindableSocket.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/IPacketQueue.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/IPacketQueue.class index 73e32c0..a839197 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/IPacketQueue.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/IPacketQueue.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/ISocketChannel.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/ISocketChannel.class index acfbf4a..71f2370 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/ISocketChannel.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/ISocketChannel.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/NonBlockingPacketQueue.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/NonBlockingPacketQueue.class index 5b411e0..13aabb6 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/NonBlockingPacketQueue.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/NonBlockingPacketQueue.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/PackDataType.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/PackDataType.class index a211361..1dc926c 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/PackDataType.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/PackDataType.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/Packet.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/Packet.class index 58bd362..58340e4 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/Packet.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/Packet.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/Session.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/Session.class index abb2ab0..25ddbc9 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/Session.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/Session.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/SessionType.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/SessionType.class index 865db8e..ca9602f 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/SessionType.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/data/SessionType.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/BinaryIoHandler.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/BinaryIoHandler.class index 358f11c..5a3a352 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/BinaryIoHandler.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/BinaryIoHandler.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/IOHandler.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/IOHandler.class index bad03c1..cf7d569 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/IOHandler.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/IOHandler.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/PacketReadState.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/PacketReadState.class index a016df1..3ba5680 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/PacketReadState.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/PacketReadState.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/PendingPacket.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/PendingPacket.class index ce2f36c..4bef9ac 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/PendingPacket.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/PendingPacket.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/ProcessedPacket.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/ProcessedPacket.class index 68b197d..a8371b4 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/ProcessedPacket.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/ProcessedPacket.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/ProtocolHandler.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/ProtocolHandler.class index ff6694b..faca5b7 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/ProtocolHandler.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/io/ProtocolHandler.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/NormalSocketChannel.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/NormalSocketChannel.class index 3f34b70..db5406e 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/NormalSocketChannel.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/NormalSocketChannel.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketAcceptor.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketAcceptor.class index 002bce1..34b2814 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketAcceptor.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketAcceptor.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketReader$PacketReaderWork.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketReader$PacketReaderWork.class index 37d668c..526f75e 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketReader$PacketReaderWork.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketReader$PacketReaderWork.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketReader.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketReader.class index 2170d75..d534d50 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketReader.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketReader.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketWriter.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketWriter.class index 3beab6e..6cde0ff 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketWriter.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/normal/SocketWriter.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/util/GhostUserHunter.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/util/GhostUserHunter.class index 3794eee..6f57b9d 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/util/GhostUserHunter.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/util/GhostUserHunter.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/UndertowWebSocketChannel.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/UndertowWebSocketChannel.class index d9fc2ed..3b5ae48 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/UndertowWebSocketChannel.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/UndertowWebSocketChannel.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService$WSConnectionListener.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService$WSConnectionListener.class index 83fb704..fd548d1 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService$WSConnectionListener.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService$WSConnectionListener.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService$WSListener.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService$WSListener.class index b6b9259..b7211dd 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService$WSListener.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService$WSListener.class differ diff --git a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService.class b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService.class index 623df44..f068b49 100644 Binary files a/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService.class and b/libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/websocket/WebSocketService.class differ diff --git a/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/T1Controller.class b/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/T1Controller.class index e5ccdf3..4e8fff3 100644 Binary files a/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/T1Controller.class and b/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/T1Controller.class differ diff --git a/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/T2Controller.class b/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/T2Controller.class index f83dec8..dcf7ddc 100644 Binary files a/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/T2Controller.class and b/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/T2Controller.class differ diff --git a/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/TestExtension.class b/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/TestExtension.class index e07d18f..84476ce 100644 Binary files a/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/TestExtension.class and b/libs/taurus-server/taurus-permanent/target/test-classes/com/taurus/TestExtension.class differ diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXGameController.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXGameController.java index d45122e..4ada2d7 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXGameController.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXGameController.java @@ -111,7 +111,7 @@ public void RouterAction(Session sender, ITObject params, int gid, Player owner) // 获取房间的胜利者 EXPlayer win = owner.win; - if (win != null) { + if (win != null ) { // 创建一个数组，用于存储房间内所有玩家的信息 ITArray info = new TArray(); // 遍历房间内的所有玩家 @@ -150,8 +150,8 @@ public void RouterAction(Session sender, ITObject params, int gid, Player owner) // 将当前玩家的信息添加到info数组中 info.addTObject(obj); } - // 将所有玩家的信息存储到mp对象中 - mp.putTArray("info", info); + // 将所有玩家的信息存储到mp对象中 + mp.putTArray("info", info); } // 根据胜利者的情况，存储胜利者的座位号 @@ -172,6 +172,7 @@ public void RouterAction(Session sender, ITObject params, int gid, Player owner) public void roomResult(EXRoom owner) { ITObject result = getRoomResultData(owner, false); result.putInt("type", 0); + owner.nextRound++; owner.broadCastToClient(0, Config.GAME_EVT_RESULT1, result); } @@ -281,7 +282,8 @@ public void dealCard(EXRoom room) { } param.putInt("bank_seat", exPlayer.room.bankerSeat); - param.putInt("round", room.round); + param.putInt("round", room.nextRound); + if (Global.loggerDebug) { Global.logger.info(room + " deal card:" + exPlayer.cardInhand); } @@ -301,6 +303,10 @@ public void dealCard(EXRoom room) { room.counts=2; } } + + + + param.putInt("raiseRound", room.raiseRound); exPlayer.sendEvent(Config.GAME_EVT_PLAYER_DEAL, param); } diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXRoom.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXRoom.java index bde1438..e428b9a 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXRoom.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/EXRoom.java @@ -69,7 +69,7 @@ public class EXRoom extends Room { //存储下局次数 - public int nextRound = 0; + public int nextRound = 1; /** @@ -77,6 +77,13 @@ public class EXRoom extends Room { */ public int callCount = 0; + /** + * 是否所有玩家都allin + */ + public int isAllIn = 0; + + + public EXPlayer win; public EXRoom(String roomid, Map redis_room_map) { @@ -108,7 +115,23 @@ public class EXRoom extends Room { if (!this.config.containsKey(Config.ROOM_CONFIG_ROUND)){ this.config.putInt(Config.ROOM_CONFIG_ROUND, 1); } + if (!this.config.containsKey(Config.ROOM_CONFIG_BASE_SCORE)){ + this.config.putInt(Config.ROOM_CONFIG_BASE_SCORE, 0); + } + if (this.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==0){ + this.sidePot = 1; + } + if (this.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==1){ + this.sidePot = 2; + } + if (this.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==2) { + this.sidePot = 5; + } + +// System.out.println("底注"+this.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)); +// int num = this.config.getInt(Config.ROOM_CONFIG_BASE_SCORE); +// System.out.println(num); } public void clear() { diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerAllInState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerAllInState.java index a9495cc..f3d1a0b 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerAllInState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerAllInState.java @@ -29,10 +29,16 @@ public class EXPlayerAllInState extends StateBase { @Override public void enter(EXPlayer owner) { + + if (owner.betScore == 0) { return; } EXRoom room = owner.getRoom(); + room.isAllIn++; + + System.out.println("底池分数："+room.sidePot); + if (owner.fold) { // 已经弃牌则转入下一位玩家 TObject param = new TObject(); @@ -62,9 +68,15 @@ public class EXPlayerAllInState extends StateBase { room.callCount = 1; List actions = new ArrayList(); - if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1){ + if (room.isAllIn== room.playerMapById.size()){ + over(owner); + return; + } + + if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1 && room.counts==2){ actions.add(Integer.parseInt(Config.GAME_ALL_IN)); } + actions.add(Integer.parseInt(Config.GAME_FOLD)); ITArray actionArray = Util.toTArray(actions); param.putTArray("actions", actionArray); @@ -81,6 +93,9 @@ public class EXPlayerAllInState extends StateBase { // 记录房间当前操作 room.actionType = Integer.parseInt(Config.GAME_BET); toNextState(owner); + + + } @Override @@ -94,7 +109,8 @@ public class EXPlayerAllInState extends StateBase { EXRoom room = owner.getRoom(); room.bankerSeat = owner.seat; room.win = owner; - room.roomResult(); +// room.roomResult(); + room.endGame(); } @Override @@ -122,9 +138,24 @@ public class EXPlayerAllInState extends StateBase { + "--lostScore:" + player.lostScore); } + + if (room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==0){ + owner.betScore=20; + } + + if (room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==1){ + owner.betScore=50; + } + if (room.config.getInt(Config.ROOM_CONFIG_BASE_SCORE)==2) { + owner.betScore=100; + } + + System.out.println("all in 下注分数1："+owner.betScore); + // 扣除下注分数 owner.lostScore = 0 - owner.betScore; // room.callScore = 0; + System.out.println("底池分数："+room.sidePot); room.sidePot += owner.betScore; room.raiseRound = 0; // 广播协议 diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerBetState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerBetState.java index 03a9d52..f05af4c 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerBetState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerBetState.java @@ -64,7 +64,7 @@ public class EXPlayerBetState extends StateBase { actions.add(Integer.parseInt(Config.GAME_CALL)); actions.add(Integer.parseInt(Config.GAME_FOLD)); actions.add(Integer.parseInt(Config.GAME_RAISE)); - if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1){ + if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1 && room.counts==2){ actions.add(Integer.parseInt(Config.GAME_ALL_IN)); } // actions.add(Integer.parseInt(Config.GAME_ALL_IN)); diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerCallState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerCallState.java index c23d0dd..2fe6c46 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerCallState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerCallState.java @@ -77,7 +77,7 @@ public class EXPlayerCallState extends StateBase { actions.add(Integer.parseInt(Config.GAME_CHECK)); } // actions.add(Integer.parseInt(Config.GAME_ALL_IN)); - if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1){ + if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1 && room.counts==2){ actions.add(Integer.parseInt(Config.GAME_ALL_IN)); } ITArray actionArray = Util.toTArray(actions); diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerCheckState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerCheckState.java index a348d4b..93254d2 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerCheckState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerCheckState.java @@ -40,7 +40,7 @@ public class EXPlayerCheckState extends StateBase { actions.add(Integer.parseInt(Config.GAME_FOLD)); // actions.add(Integer.parseInt(Config.GAME_ALL_IN)); - if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1){ + if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1 && room.counts==2){ actions.add(Integer.parseInt(Config.GAME_ALL_IN)); } diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerFoldState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerFoldState.java index 952a954..1d52a54 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerFoldState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerFoldState.java @@ -73,8 +73,13 @@ public class EXPlayerFoldState extends StateBase { public void over(EXRoom room) { EXPlayer player = CardCheck.CheckCall(room); room.win = player; - room.roomResult(); - room.endGame(); + if (room.nextRound==room.maxRound){ + room.endGame(); + }else { + room.roomResult(); + } + + } /** diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerRaiseState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerRaiseState.java index 5004922..51b2e40 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerRaiseState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/player/state/EXPlayerRaiseState.java @@ -69,7 +69,7 @@ public class EXPlayerRaiseState extends StateBase { actions.add(Integer.parseInt(Config.GAME_FOLD)); // actions.add(Integer.parseInt(Config.GAME_ALL_IN)); - if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1){ + if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1 && room.counts==2){ actions.add(Integer.parseInt(Config.GAME_ALL_IN)); } diff --git a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomDealState.java b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomDealState.java index 2763271..cce2bd9 100644 --- a/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomDealState.java +++ b/puke/suoha/game_pk_suoha/src/main/java/extend/pk/room/state/EXRoomDealState.java @@ -78,7 +78,7 @@ public class EXRoomDealState extends StateBase { actions.add(Integer.parseInt(Config.GAME_FOLD)); // actions.add(Integer.parseInt(Config.GAME_CHECK)); - if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1){ + if (room.config.getInt(Config.ROOM_CONFIG_ALLIN)==1 && room.counts==2){ actions.add(Integer.parseInt(Config.GAME_ALL_IN)); } diff --git a/libs/taurus-server/taurus-permanent/target/classes/game-config.xml b/puke/suoha/game_pk_suoha/target/classes/config/game-config.xml similarity index 100% rename from libs/taurus-server/taurus-permanent/target/classes/game-config.xml rename to puke/suoha/game_pk_suoha/target/classes/config/game-config.xml diff --git a/libs/taurus-server/taurus-permanent/target/classes/log4j.properties b/puke/suoha/game_pk_suoha/target/classes/config/log4j.properties similarity index 100% rename from libs/taurus-server/taurus-permanent/target/classes/log4j.properties rename to puke/suoha/game_pk_suoha/target/classes/config/log4j.properties diff --git a/libs/taurus-server/taurus-permanent/target/classes/taurus-core.xml b/puke/suoha/game_pk_suoha/target/classes/config/taurus-core.xml similarity index 100% rename from libs/taurus-server/taurus-permanent/target/classes/taurus-core.xml rename to puke/suoha/game_pk_suoha/target/classes/config/taurus-core.xml diff --git a/libs/taurus-server/taurus-permanent/target/classes/config/taurus-permanent.xml b/puke/suoha/game_pk_suoha/target/classes/config/taurus-permanent.xml similarity index 100% rename from libs/taurus-server/taurus-permanent/target/classes/config/taurus-permanent.xml rename to puke/suoha/game_pk_suoha/target/classes/config/taurus-permanent.xml diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/CardGroup.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/CardGroup.class new file mode 100644 index 0000000..a64c634 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/CardGroup.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/CardObj.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/CardObj.class new file mode 100644 index 0000000..da9b5c1 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/CardObj.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/Config.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/Config.class new file mode 100644 index 0000000..f1152fa Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/Config.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXActionEvent.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXActionEvent.class new file mode 100644 index 0000000..9475840 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXActionEvent.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXGameController.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXGameController.class new file mode 100644 index 0000000..e5c2d95 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXGameController.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXMainServer.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXMainServer.class new file mode 100644 index 0000000..daec647 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXMainServer.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXPlayBack.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXPlayBack.class new file mode 100644 index 0000000..40dffa3 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXPlayBack.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXPlayer.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXPlayer.class new file mode 100644 index 0000000..84ff922 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXPlayer.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXRoom.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXRoom.class new file mode 100644 index 0000000..8417b80 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXRoom.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXScore.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXScore.class new file mode 100644 index 0000000..2e2115b Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/EXScore.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/RoomCard.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/RoomCard.class new file mode 100644 index 0000000..f9f2e78 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/RoomCard.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/SettleLog.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/SettleLog.class new file mode 100644 index 0000000..e916a1b Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/SettleLog.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerAllInState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerAllInState.class new file mode 100644 index 0000000..ceba6b9 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerAllInState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerBetState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerBetState.class new file mode 100644 index 0000000..25392d2 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerBetState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerCallState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerCallState.class new file mode 100644 index 0000000..a0c5e52 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerCallState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerCheckState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerCheckState.class new file mode 100644 index 0000000..8caed13 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerCheckState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerFoldState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerFoldState.class new file mode 100644 index 0000000..1dd610b Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerFoldState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerRaiseState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerRaiseState.class new file mode 100644 index 0000000..abc0860 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerRaiseState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerWaitState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerWaitState.class new file mode 100644 index 0000000..a33d4ff Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/player/state/EXPlayerWaitState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomDealState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomDealState.class new file mode 100644 index 0000000..520c608 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomDealState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomSetpState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomSetpState.class new file mode 100644 index 0000000..35218ed Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomSetpState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomStartGameState.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomStartGameState.class new file mode 100644 index 0000000..722db13 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/room/state/EXRoomStartGameState.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/uitl/CardCheck.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/uitl/CardCheck.class new file mode 100644 index 0000000..c08c5a1 Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/uitl/CardCheck.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/extend/pk/uitl/CardUtil.class b/puke/suoha/game_pk_suoha/target/classes/extend/pk/uitl/CardUtil.class new file mode 100644 index 0000000..2a314ce Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/classes/extend/pk/uitl/CardUtil.class differ diff --git a/puke/suoha/game_pk_suoha/target/classes/game-config.xml b/puke/suoha/game_pk_suoha/target/classes/game-config.xml new file mode 100644 index 0000000..6ab3871 --- /dev/null +++ b/puke/suoha/game_pk_suoha/target/classes/game-config.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + 192.168.1.5 + 192.168.1.5 + 8890 + 8490 + 90 + true + \ No newline at end of file diff --git a/puke/suoha/game_pk_suoha/target/classes/log4j.properties b/puke/suoha/game_pk_suoha/target/classes/log4j.properties new file mode 100644 index 0000000..6786dba --- /dev/null +++ b/puke/suoha/game_pk_suoha/target/classes/log4j.properties @@ -0,0 +1,20 @@ + +log4j.rootLogger = INFO,consoleAppender,fileAppender + +# ConsoleAppender +log4j.appender.consoleAppender=org.apache.log4j.ConsoleAppender +log4j.appender.consoleAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.consoleAppender.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%t] %c{2} %3x - %m%n + + +# Regular FileAppender +log4j.appender.fileAppender=org.apache.log4j.DailyRollingFileAppender +log4j.appender.fileAppender.layout=org.apache.log4j.PatternLayout +log4j.appender.fileAppender.File=${WORKDIR}/logs/web_main.log +log4j.appender.fileAppender.layout.ConversionPattern=%d{dd MMM yyyy | HH:mm:ss,SSS} | %-5p | %t | %c{3} | %3x | %m%n +log4j.appender.fileAppender.Encoding=UTF-8 +log4j.appender.fileAppender.DatePattern='.'yyyy-MM-dd +log4j.appender.dailyFile.Append=true + +# The file is rolled over very day +log4j.appender.fileAppender.DatePattern ='.'yyyy-MM-dd \ No newline at end of file diff --git a/puke/suoha/game_pk_suoha/target/classes/taurus-core.xml b/puke/suoha/game_pk_suoha/target/classes/taurus-core.xml new file mode 100644 index 0000000..6e548c0 --- /dev/null +++ b/puke/suoha/game_pk_suoha/target/classes/taurus-core.xml @@ -0,0 +1,51 @@ + + + log4j.properties + + + redis + com.taurus.core.plugin.redis.RedisPlugin + + + + 80 + + 20 + + 5 + + -1 + + true + + true + + true + + 100 + + 60000 + + 30000 + + 1800000 + + true + + + + + + + + + + + + + + \ No newline at end of file diff --git a/libs/taurus-server/taurus-permanent/target/classes/taurus-permanent.xml b/puke/suoha/game_pk_suoha/target/classes/taurus-permanent.xml similarity index 100% rename from libs/taurus-server/taurus-permanent/target/classes/taurus-permanent.xml rename to puke/suoha/game_pk_suoha/target/classes/taurus-permanent.xml diff --git a/puke/suoha/game_pk_suoha/target/test-classes/game_pk_suoha/MainSuoha.class b/puke/suoha/game_pk_suoha/target/test-classes/game_pk_suoha/MainSuoha.class new file mode 100644 index 0000000..4ea823e Binary files /dev/null and b/puke/suoha/game_pk_suoha/target/test-classes/game_pk_suoha/MainSuoha.class differ