From c698851efead84981b81b6cbc28b661c682cde9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=97=E5=BA=86=E5=B8=85?= <9175754+miao-qingshuai@user.noreply.gitee.com> Date: Tue, 17 Jun 2025 19:49:39 +0800 Subject: [PATCH] =?UTF-8?q?refactor(game):=20=E9=87=8D=E6=9E=84=E6=B8=B8?= =?UTF-8?q?=E6=88=8F=E7=9B=B8=E5=85=B3=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除了 PlayerInitState 类 - 新增 RoomWaitState 类 - 修改了 RoomDestoryGameState 和 PlayerReloadState 类 - 优化了 EventController 中的 redisGroupMemberRound 方法 - 更新了 Global 类中的 logger 属性 --- .idea/encodings.xml | 12 - .idea/jarRepositories.xml | 5 + .idea/misc.xml | 9 +- .idea/runConfigurations.xml | 10 + .idea/vcs.xml | 6 + config/game-config.xml | 20 ++ config/log4j.properties | 20 ++ config/taurus-core.xml | 51 +++ config/taurus-permanent.xml | 75 +++++ game_web/.idea/game_web.iml | 9 + game_web/event_mgr/target/ROOT.war | Bin 6203108 -> 6203165 bytes .../ROOT/WEB-INF/lib/data_cache-1.0.1.jar | Bin 30285 -> 30289 bytes .../ROOT/WEB-INF/lib/taurus-core-1.0.1.jar | Bin 113820 -> 113823 bytes .../ROOT/WEB-INF/lib/taurus-web-1.0.1.jar | Bin 18843 -> 18874 bytes .../classes/com/evt/mgr/EventController.class | Bin 5235 -> 5326 bytes .../evt/mgr/EventReceiver$GroupRunnable.class | Bin 2253 -> 2332 bytes .../classes/com/evt/mgr/EventReceiver.class | Bin 1536 -> 1524 bytes .../classes/com/evt/mgr/EventServer.class | Bin 4157 -> 4154 bytes .../com/evt/mgr/GroupPublisherService.class | Bin 2428 -> 2393 bytes .../target/classes/com/evt/mgr/IHandler.class | Bin 248 -> 248 bytes .../target/classes/com/evt/mgr/Utils.class | Bin 6193 -> 6240 bytes .../mgr/handler/HandlerGroupMemberRound.class | Bin 3724 -> 3701 bytes .../evt/mgr/handler/HandlerGroupRound.class | Bin 3149 -> 3126 bytes .../evt/mgr/handler/HandlerHpConsume.class | Bin 13536 -> 13457 bytes .../com/evt/mgr/handler/HandlerLose.class | Bin 669 -> 669 bytes .../com/evt/mgr/handler/HandlerOver.class | Bin 3678 -> 3647 bytes .../com/evt/mgr/handler/HandlerPay.class | Bin 2626 -> 2628 bytes .../com/evt/mgr/handler/HandlerWin.class | Bin 666 -> 666 bytes .../com/evt/mgr/job/CleanGroupLogJob.class | Bin 3297 -> 3296 bytes .../com/evt/mgr/job/CleanTimeOutRoomJob.class | Bin 10028 -> 10055 bytes .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/inputFiles.lst | 30 +- .../default-testCompile/inputFiles.lst | 2 +- .../target/classes/com/mgr/group/Config.class | Bin 389 -> 389 bytes .../target/classes/com/mgr/group/Global.class | Bin 927 -> 947 bytes .../com/mgr/group/GroupController$1.class | Bin 5835 -> 5808 bytes .../com/mgr/group/GroupController.class | Bin 7672 -> 7610 bytes .../com/mgr/group/GroupSubscriber$1.class | Bin 2549 -> 2395 bytes .../com/mgr/group/GroupSubscriber.class | Bin 6358 -> 6044 bytes .../classes/com/mgr/group/MainServer$1.class | Bin 2444 -> 2393 bytes .../com/mgr/group/MainServer$2$1.class | Bin 742 -> 732 bytes .../classes/com/mgr/group/MainServer$2.class | Bin 1571 -> 1560 bytes .../classes/com/mgr/group/MainServer$3.class | Bin 1198 -> 1179 bytes .../classes/com/mgr/group/MainServer$4.class | Bin 1171 -> 1159 bytes .../classes/com/mgr/group/MainServer.class | Bin 5308 -> 5326 bytes .../target/classes/com/mgr/group/Router.class | Bin 1304 -> 1304 bytes .../com/mgr/group/SessionManager$1.class | Bin 976 -> 966 bytes .../com/mgr/group/SessionManager.class | Bin 2423 -> 2422 bytes .../classes/com/mgr/group/WebMain.class | Bin 1332 -> 1444 bytes .../com/mgr/group/data/CommandData.class | Bin 847 -> 851 bytes .../classes/com/mgr/group/data/Group.class | Bin 13538 -> 13511 bytes .../classes/com/mgr/group/data/Player.class | Bin 1272 -> 1276 bytes .../com/mgr/group/data/PlayerCache.class | Bin 926 -> 926 bytes .../classes/com/mgr/group/data/Room.class | Bin 5840 -> 5799 bytes .../com/mgr/group/data/RoomCache.class | Bin 3924 -> 3989 bytes .../classes/com/mgr/group/data/User.class | Bin 4688 -> 4700 bytes .../test-classes/group_room_mgr/Main.class | Bin 537 -> 537 bytes .../target/classes/com/pack/MainServer.class | Bin 2201 -> 2249 bytes .../target/classes/com/pack/Utils.class | Bin 5032 -> 5079 bytes .../com/pack/service/CommandService.class | Bin 3460 -> 3365 bytes .../com/pack/service/PackServerProject.class | Bin 5834 -> 5882 bytes .../com/pack/service/PackUtilService$1.class | Bin 2960 -> 2995 bytes .../PackUtilService$BaseConfigData.class | Bin 3408 -> 3383 bytes .../com/pack/service/PackUtilService.class | Bin 11781 -> 11782 bytes .../com/pack/service/ServletAllGame.class | Bin 3197 -> 3282 bytes .../target/test-classes/pack_tools/Main.class | Bin 529 -> 529 bytes .../target/test-classes/pack_tools/TT.class | Bin 523 -> 523 bytes .../src/main/java/com/group/Protocol.java | 7 + .../group/controller/GroupRoomController.java | 6 +- .../classes/com/group/MainServer$1.class | Bin 697 -> 687 bytes .../target/classes/com/group/MainServer.class | Bin 5417 -> 5500 bytes .../target/classes/com/group/Protocol.class | Bin 5423 -> 5423 bytes .../classes/com/group/WebInterceptor.class | Bin 4340 -> 4308 bytes .../group/controller/GroupController.class | Bin 25659 -> 25749 bytes .../group/controller/GroupLogController.class | Bin 14836 -> 14862 bytes .../controller/GroupRoomController.class | Bin 2702 -> 2664 bytes .../com/group/job/UpdatePlayRoomJob.class | Bin 24432 -> 24881 bytes .../com/group/service/GroupLogService.class | Bin 47313 -> 48668 bytes .../group/service/GroupPublisherService.class | Bin 3363 -> 3363 bytes .../com/group/service/GroupRoomService.class | Bin 30181 -> 32144 bytes .../com/group/service/GroupService.class | Bin 107193 -> 109718 bytes .../DataClearUtils$clear_data_t.class | Bin 2718 -> 2685 bytes .../DataClearUtils$clear_data_test.class | Bin 2727 -> 2694 bytes .../web_group/DataClearUtils.class | Bin 2708 -> 2686 bytes .../target/test-classes/web_group/Main.class | Bin 527 -> 527 bytes .../classes/com/mjlogin/MainServer$1.class | Bin 602 -> 592 bytes .../classes/com/mjlogin/MainServer.class | Bin 2672 -> 2689 bytes .../target/classes/com/mjlogin/Protocol.class | Bin 1609 -> 1609 bytes .../classes/com/mjlogin/WebInterceptor.class | Bin 2139 -> 2119 bytes .../com/mjlogin/service/AccountService.class | Bin 33892 -> 33999 bytes .../com/mjlogin/service/IndexService.class | Bin 2606 -> 2613 bytes .../com/mjlogin/service/MilitaryService.class | Bin 4792 -> 4819 bytes .../com/mjlogin/service/RoomService.class | Bin 11032 -> 11124 bytes .../com/mjlogin/util/sms/RedisKey.class | Bin 270 -> 270 bytes .../mjlogin/util/sms/SMSThread$SendTask.class | Bin 1587 -> 1541 bytes .../com/mjlogin/util/sms/SMSThread.class | Bin 1733 -> 1712 bytes .../mjlogin/util/sms/SMSVerification.class | Bin 5016 -> 5000 bytes .../target/test-classes/web_login/Main.class | Bin 527 -> 527 bytes .../classes/com/data/bean/AccountBean.class | Bin 1283 -> 1286 bytes .../classes/com/data/bean/BaseBean.class | Bin 699 -> 699 bytes .../classes/com/data/bean/GameBean.class | Bin 3534 -> 3571 bytes .../classes/com/data/bean/GroupBean.class | Bin 2173 -> 2173 bytes .../com/data/bean/GroupMemberBean.class | Bin 1761 -> 1761 bytes .../classes/com/data/bean/GroupPlayBean.class | Bin 3690 -> 3698 bytes .../classes/com/data/cache/AccountCache.class | Bin 1398 -> 1422 bytes .../classes/com/data/cache/BaseCache.class | Bin 6243 -> 6167 bytes .../classes/com/data/cache/GameCache.class | Bin 1390 -> 1414 bytes .../classes/com/data/cache/GroupCache.class | Bin 3824 -> 3851 bytes .../com/data/cache/GroupMemberCache.class | Bin 1353 -> 1338 bytes .../com/data/cache/GroupPlayCache.class | Bin 5536 -> 5399 bytes .../classes/com/data/util/ConsumeCode.class | Bin 1161 -> 1161 bytes .../classes/com/data/util/CountUtil.class | Bin 5278 -> 5194 bytes .../classes/com/data/util/ErrorCode.class | Bin 3358 -> 3358 bytes .../classes/com/data/util/EventType.class | Bin 910 -> 910 bytes libs/data_cache/target/data_cache.jar | Bin 30286 -> 30289 bytes .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/inputFiles.lst | 34 +- .../main/java/com/game/EventController.java | 81 +++-- .../main/java/com/game/GameController.java | 5 + .../src/main/java/com/game/Global.java | 3 +- .../src/main/java/com/game/data/Room.java | 3 + .../main/java/com/game/data/RoomDismiss.java | 2 +- .../game/player/state/PlayerInitState.java | 47 --- .../game/player/state/PlayerReloadState.java | 4 + .../game/room/state/RoomDestoryGameState.java | 1 - .../com/game/room/state/RoomReloadState.java | 3 + .../classes/com/game/EventController.class | Bin 8209 -> 8341 bytes .../classes/com/game/GameController.class | Bin 17876 -> 18094 bytes .../classes/com/game/GameInterceptor$1.class | Bin 1948 -> 1931 bytes .../classes/com/game/GameInterceptor.class | Bin 2434 -> 2417 bytes .../target/classes/com/game/Global.class | Bin 3441 -> 3441 bytes .../classes/com/game/MainServer$1.class | Bin 1745 -> 1702 bytes .../classes/com/game/MainServer$2.class | Bin 1315 -> 1305 bytes .../com/game/MainServer$GameSetting.class | Bin 636 -> 640 bytes .../target/classes/com/game/MainServer.class | Bin 7055 -> 7059 bytes .../classes/com/game/data/BasePlayBack.class | Bin 3871 -> 3888 bytes .../classes/com/game/data/JoinRoomData.class | Bin 467 -> 467 bytes .../classes/com/game/data/Player$1.class | Bin 1657 -> 1638 bytes .../classes/com/game/data/Player$2.class | Bin 2050 -> 2037 bytes .../target/classes/com/game/data/Player.class | Bin 11721 -> 11720 bytes .../target/classes/com/game/data/Room.class | Bin 39096 -> 39096 bytes .../classes/com/game/data/RoomDismiss$1.class | Bin 1311 -> 1323 bytes .../classes/com/game/data/RoomDismiss.class | Bin 5228 -> 5246 bytes .../com/game/manager/RoomManager$1.class | Bin 2051 -> 2147 bytes .../com/game/manager/RoomManager.class | Bin 5631 -> 5595 bytes .../com/game/manager/SessionManager$1.class | Bin 1189 -> 1179 bytes .../com/game/manager/SessionManager.class | Bin 2486 -> 2483 bytes .../game/player/state/PlayerEndState.class | Bin 2376 -> 2290 bytes .../game/player/state/PlayerInitState.class | Bin 2119 -> 2040 bytes .../game/player/state/PlayerPopupState.class | Bin 1328 -> 1308 bytes .../game/player/state/PlayerReadyState.class | Bin 1711 -> 1691 bytes .../game/player/state/PlayerReloadState.class | Bin 1290 -> 1290 bytes .../room/state/RoomDestoryGameState.class | Bin 871 -> 871 bytes .../com/game/room/state/RoomEndState.class | Bin 2571 -> 2627 bytes .../com/game/room/state/RoomInitState.class | Bin 2476 -> 2496 bytes .../com/game/room/state/RoomReloadState.class | Bin 2420 -> 2494 bytes .../game/room/state/RoomStartGameState.class | Bin 398 -> 398 bytes .../com/game/room/state/RoomWaitState.class | Bin 1991 -> 2008 bytes libs/game_common/target/game_common-1.0.0.jar | Bin 90366 -> 90429 bytes .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/inputFiles.lst | 74 ++-- .../java/com/taurus/core/util/Logger.java | 2 +- .../taurus/core/entity/TDataSerializer.class | Bin 22740 -> 23190 bytes .../events/EventDispatcher$EventRunner.class | Bin 1512 -> 1531 bytes .../taurus/core/events/EventDispatcher.class | Bin 3037 -> 3089 bytes .../com/taurus/core/events/EventManager.class | Bin 2350 -> 2438 bytes .../taurus/core/plugin/PluginService.class | Bin 5703 -> 5719 bytes .../core/util/FixedIndexThreadPool$Work.class | Bin 2519 -> 2614 bytes .../core/util/FixedIndexThreadPool.class | Bin 2553 -> 2540 bytes .../classes/com/taurus/core/util/MD5.class | Bin 2095 -> 2121 bytes .../classes/com/taurus/core/util/SHA1.class | Bin 2287 -> 2313 bytes .../task/TaskScheduler$ScheduledTask.class | Bin 1020 -> 1020 bytes .../taurus/core/util/task/TaskScheduler.class | Bin 5650 -> 5591 bytes .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/inputFiles.lst | 98 +++--- .../default-testCompile/inputFiles.lst | 2 +- .../target/surefire-reports/TEST-Test.xml | 49 ++- .../target/surefire-reports/Test.txt | 2 +- .../target/taurus-core-1.0.1-sources.jar | Bin 60016 -> 60023 bytes .../taurus-core/target/taurus-core-1.0.1.jar | Bin 113820 -> 113823 bytes .../java/com/taurus/permanent/TPServer.java | 4 + .../src/resources/config/taurus-permanent.xml | 75 +++++ .../src/resources/game-config.xml | 20 ++ .../src/resources/log4j.properties | 20 ++ .../src/resources/taurus-core.xml | 51 +++ .../src/resources/taurus-permanent.xml | 75 +++++ .../classes/com/taurus/permanent/Main.class | Bin 570 -> 570 bytes .../TPServer$NetworkEvtListener.class | Bin 1984 -> 1868 bytes .../permanent/TPServer$TPThreadFactory.class | Bin 1744 -> 1770 bytes .../com/taurus/permanent/TPServer.class | Bin 10776 -> 10670 bytes .../permanent/core/BaseCoreService.class | Bin 1767 -> 1784 bytes .../permanent/core/BitSwarmEngine$1.class | Bin 840 -> 830 bytes .../core/BitSwarmEngine$PacketWriteWork.class | Bin 1639 -> 1630 bytes .../permanent/core/BitSwarmEngine.class | Bin 12295 -> 12545 bytes .../permanent/core/ConnectionFilter.class | Bin 4317 -> 4276 bytes .../permanent/core/DefaultConstants.class | Bin 843 -> 855 bytes .../permanent/core/IConnectionFilter.class | Bin 529 -> 529 bytes .../core/ServerConfig$ExecutorConfig.class | Bin 652 -> 656 bytes .../core/ServerConfig$ExtensionConfig.class | Bin 540 -> 544 bytes .../core/ServerConfig$IpFilterConfig.class | Bin 719 -> 723 bytes .../core/ServerConfig$SocketAddress.class | Bin 977 -> 981 bytes .../core/ServerConfig$WebSocketConfig.class | Bin 592 -> 596 bytes .../taurus/permanent/core/ServerConfig.class | Bin 5347 -> 5339 bytes .../taurus/permanent/core/ServerState.class | Bin 1102 -> 1130 bytes .../permanent/core/SessionManager$1.class | Bin 242 -> 0 bytes .../core/SessionManager$SessionCleaner.class | Bin 1153 -> 1021 bytes .../permanent/core/SessionManager.class | Bin 9832 -> 9705 bytes .../permanent/core/SystemController$1.class | Bin 687 -> 686 bytes .../permanent/core/SystemController$2.class | Bin 1268 -> 1245 bytes .../permanent/core/SystemController.class | Bin 11103 -> 11027 bytes .../com/taurus/permanent/core/TPEvents.class | Bin 622 -> 622 bytes .../permanent/data/BindableSocket.class | Bin 1153 -> 1153 bytes .../taurus/permanent/data/IPacketQueue.class | Bin 424 -> 424 bytes .../permanent/data/ISocketChannel.class | Bin 438 -> 438 bytes .../data/NonBlockingPacketQueue.class | Bin 2336 -> 2311 bytes .../taurus/permanent/data/PackDataType.class | Bin 1048 -> 1076 bytes .../com/taurus/permanent/data/Packet.class | Bin 3335 -> 3325 bytes .../com/taurus/permanent/data/Session.class | Bin 8944 -> 9008 bytes .../taurus/permanent/data/SessionType.class | Bin 1097 -> 1133 bytes .../taurus/permanent/io/BinaryIoHandler.class | Bin 8375 -> 8339 bytes .../com/taurus/permanent/io/IOHandler.class | Bin 2214 -> 2204 bytes .../taurus/permanent/io/PacketReadState.class | Bin 1202 -> 1242 bytes .../taurus/permanent/io/PendingPacket.class | Bin 940 -> 940 bytes .../taurus/permanent/io/ProcessedPacket.class | Bin 705 -> 705 bytes .../taurus/permanent/io/ProtocolHandler.class | Bin 2081 -> 2082 bytes .../normal/NormalSocketChannel.class | Bin 1867 -> 1861 bytes .../permanent/normal/SocketAcceptor.class | Bin 11270 -> 11244 bytes .../SocketReader$PacketReaderWork.class | Bin 2389 -> 2369 bytes .../permanent/normal/SocketReader.class | Bin 9444 -> 9357 bytes .../permanent/normal/SocketWriter.class | Bin 10468 -> 10383 bytes .../permanent/util/GhostUserHunter.class | Bin 4011 -> 4104 bytes .../websocket/UndertowWebSocketChannel.class | Bin 1673 -> 1673 bytes ...ebSocketService$WSConnectionListener.class | Bin 1656 -> 1654 bytes .../WebSocketService$WSListener.class | Bin 2625 -> 2611 bytes .../websocket/WebSocketService.class | Bin 8822 -> 8717 bytes .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/inputFiles.lst | 66 ++-- .../default-testCompile/inputFiles.lst | 6 +- .../TEST-com.taurus.TestExtension.xml | 49 ++- .../target/taurus-permanent-1.0.1.jar | Bin 84916 -> 84921 bytes .../com/taurus/T1Controller.class | Bin 1167 -> 1167 bytes .../com/taurus/T2Controller.class | Bin 1321 -> 1321 bytes .../com/taurus/TestExtension.class | Bin 724 -> 724 bytes .../classes/com/taurus/web/Controller.class | Bin 3591 -> 3648 bytes .../classes/com/taurus/web/JettyServer.class | Bin 4918 -> 4856 bytes .../com/taurus/web/ServletHealthCheck.class | Bin 1074 -> 1074 bytes .../classes/com/taurus/web/SessionInfo.class | Bin 343 -> 343 bytes .../com/taurus/web/StatusServlet.class | Bin 4336 -> 4414 bytes .../classes/com/taurus/web/TWebServer$1.class | Bin 596 -> 595 bytes .../classes/com/taurus/web/TWebServer$2.class | Bin 855 -> 840 bytes .../classes/com/taurus/web/TWebServer.class | Bin 10671 -> 10720 bytes .../classes/com/taurus/web/WebException.class | Bin 494 -> 494 bytes .../classes/com/taurus/web/WebFilter.class | Bin 2740 -> 2718 bytes .../classes/com/taurus/web/WebUtils.class | Bin 1985 -> 1982 bytes .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/inputFiles.lst | 18 +- .../default-testCompile/inputFiles.lst | 2 +- .../surefire-reports/TEST-com.taurus.Test.xml | 49 ++- .../surefire-reports/com.taurus.Test.txt | 2 +- .../taurus-web/target/taurus-web-1.0.1.jar | Bin 18872 -> 18874 bytes .../target/test-classes/com/taurus/Test.class | Bin 377 -> 377 bytes .../target/classes/extend/pk/CardGroup.class | Bin 1683 -> 1714 bytes .../target/classes/extend/pk/CardObj.class | Bin 1019 -> 985 bytes .../target/classes/extend/pk/Config.class | Bin 2543 -> 2543 bytes .../classes/extend/pk/EXActionEvent.class | Bin 501 -> 501 bytes .../classes/extend/pk/EXGameController.class | Bin 14336 -> 14910 bytes .../classes/extend/pk/EXMainServer.class | Bin 2338 -> 2338 bytes .../target/classes/extend/pk/EXPlayBack.class | Bin 2333 -> 2333 bytes .../target/classes/extend/pk/EXPlayer.class | Bin 3398 -> 3395 bytes .../target/classes/extend/pk/EXRoom.class | Bin 9880 -> 10003 bytes .../target/classes/extend/pk/EXScore.class | Bin 756 -> 756 bytes .../target/classes/extend/pk/RoomCard.class | Bin 13426 -> 13610 bytes .../target/classes/extend/pk/SettleLog.class | Bin 2202 -> 2202 bytes .../player/state/EXPlayerBaoChunState.class | Bin 5603 -> 5623 bytes .../player/state/EXPlayerDiscardState.class | Bin 10577 -> 10670 bytes .../pk/player/state/EXPlayerPassState$1.class | Bin 944 -> 932 bytes .../pk/player/state/EXPlayerPassState.class | Bin 2348 -> 2283 bytes .../state/EXPlayerPiaoNiaoTipState.class | Bin 2213 -> 2177 bytes .../state/EXPlayerTongYiBaoChunState.class | Bin 4105 -> 4114 bytes .../pk/room/state/EXRoomBaoChunState.class | Bin 2752 -> 2765 bytes .../pk/room/state/EXRoomDealState$1$1.class | Bin 852 -> 870 bytes .../pk/room/state/EXRoomDealState$1.class | Bin 1068 -> 1090 bytes .../pk/room/state/EXRoomDealState.class | Bin 3136 -> 3148 bytes .../pk/room/state/EXRoomPiaoState.class | Bin 2037 -> 2023 bytes .../pk/room/state/EXRoomSetpState.class | Bin 1605 -> 1596 bytes .../pk/room/state/EXRoomStartGameState.class | Bin 1844 -> 1830 bytes .../classes/extend/pk/uitl/CardCheck.class | Bin 24067 -> 24897 bytes .../classes/extend/pk/uitl/CardConfig.class | Bin 2249 -> 2275 bytes .../classes/extend/pk/uitl/CardUtil.class | Bin 7140 -> 7326 bytes .../test-classes/game_pk_chuntian/Main.class | Bin 503 -> 503 bytes .../game_pk_suoha/config/game-config.xml | 21 +- .../game_pk_suoha/config/taurus-core.xml | 15 +- .../game_pk_suoha/config/taurus-permanent.xml | 20 +- .../src/main/java/extend/pk/Config.java | 31 +- .../main/java/extend/pk/EXGameController.java | 315 ++++++++++++------ .../src/main/java/extend/pk/EXRoom.java | 48 ++- .../src/main/java/extend/pk/RoomCard.java | 4 + .../pk/player/state/EXPlayerAllInState.java | 8 +- .../pk/player/state/EXPlayerBetState.java | 19 +- .../pk/player/state/EXPlayerCallState.java | 32 +- .../pk/player/state/EXPlayerCheckState.java | 13 +- .../pk/player/state/EXPlayerRaiseState.java | 56 +++- .../pk/player/state/EXPlayerWaitState.java | 1 + .../extend/pk/room/state/EXRoomDealState.java | 12 +- .../extend/pk/room/state/EXRoomSetpState.java | 15 +- .../pk/room/state/EXRoomStartGameState.java | 34 +- .../src/main/resources/config/game-config.xml | 20 ++ .../main/resources/config/log4j.properties | 20 ++ .../src/main/resources/config/taurus-core.xml | 51 +++ .../resources/config/taurus-permanent.xml | 75 +++++ .../src/main/resources/game-config.xml | 20 ++ .../src/main/resources/log4j.properties | 20 ++ .../src/main/resources/taurus-core.xml | 51 +++ .../src/main/resources/taurus-permanent.xml | 75 +++++ .../target/classes/extend/pk/Config.class | Bin 1643 -> 2049 bytes .../classes/extend/pk/EXGameController.class | Bin 8454 -> 8879 bytes .../target/classes/extend/pk/EXRoom.class | Bin 6069 -> 7182 bytes .../target/classes/extend/pk/RoomCard.class | Bin 3692 -> 3684 bytes .../pk/player/state/EXPlayerAllInState.class | Bin 5482 -> 5491 bytes .../pk/player/state/EXPlayerBetState.class | Bin 5494 -> 5501 bytes .../pk/player/state/EXPlayerCallState.class | Bin 5206 -> 5896 bytes .../pk/player/state/EXPlayerCheckState.class | Bin 2587 -> 3023 bytes .../pk/player/state/EXPlayerFoldState.class | Bin 4107 -> 4165 bytes .../pk/player/state/EXPlayerRaiseState.class | Bin 4417 -> 5305 bytes .../pk/room/state/EXRoomDealState.class | Bin 4271 -> 4394 bytes .../pk/room/state/EXRoomSetpState.class | Bin 1405 -> 1772 bytes .../pk/room/state/EXRoomStartGameState.class | Bin 1844 -> 1830 bytes .../game_pk_suoha/target/game_pk_suoha.jar | Bin 47231 -> 55666 bytes .../target/maven-archiver/pom.properties | 2 +- .../compile/default-compile/createdFiles.lst | 20 +- .../compile/default-compile/inputFiles.lst | 48 +-- .../default-testCompile/inputFiles.lst | 2 +- 332 files changed, 1609 insertions(+), 560 deletions(-) create mode 100644 .idea/runConfigurations.xml create mode 100644 .idea/vcs.xml create mode 100644 config/game-config.xml create mode 100644 config/log4j.properties create mode 100644 config/taurus-core.xml create mode 100644 config/taurus-permanent.xml create mode 100644 game_web/.idea/game_web.iml delete mode 100644 libs/game_common/src/main/java/com/game/player/state/PlayerInitState.java create mode 100644 libs/taurus-server/taurus-permanent/src/resources/config/taurus-permanent.xml create mode 100644 libs/taurus-server/taurus-permanent/src/resources/game-config.xml create mode 100644 libs/taurus-server/taurus-permanent/src/resources/log4j.properties create mode 100644 libs/taurus-server/taurus-permanent/src/resources/taurus-core.xml create mode 100644 libs/taurus-server/taurus-permanent/src/resources/taurus-permanent.xml delete mode 100644 libs/taurus-server/taurus-permanent/target/classes/com/taurus/permanent/core/SessionManager$1.class create mode 100644 puke/suoha/game_pk_suoha/src/main/resources/config/game-config.xml create mode 100644 puke/suoha/game_pk_suoha/src/main/resources/config/log4j.properties create mode 100644 puke/suoha/game_pk_suoha/src/main/resources/config/taurus-core.xml create mode 100644 puke/suoha/game_pk_suoha/src/main/resources/config/taurus-permanent.xml create mode 100644 puke/suoha/game_pk_suoha/src/main/resources/game-config.xml create mode 100644 puke/suoha/game_pk_suoha/src/main/resources/log4j.properties create mode 100644 puke/suoha/game_pk_suoha/src/main/resources/taurus-core.xml create mode 100644 puke/suoha/game_pk_suoha/src/main/resources/taurus-permanent.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml index ee49163..2a3c827 100644 --- a/.idea/encodings.xml +++ b/.idea/encodings.xml @@ -2,27 +2,15 @@ - - - - - - - - - - - - diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 712ab9d..22e83c6 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -6,6 +6,11 @@