diff --git a/robots/majiang/robot_mj_cs/src/main/java/robot/mj/Config.java b/robots/majiang/robot_mj_cs/src/main/java/robot/mj/Config.java index e808312..3c7e115 100644 --- a/robots/majiang/robot_mj_cs/src/main/java/robot/mj/Config.java +++ b/robots/majiang/robot_mj_cs/src/main/java/robot/mj/Config.java @@ -45,6 +45,6 @@ public class Config { public static final String DEFAULT_PID = "10"; /** 默认群组ID */ - public static final String DEFAULT_GROUP_ID = "762479"; + public static final String DEFAULT_GROUP_ID = "426149"; } \ No newline at end of file diff --git a/robots/majiang/robot_mj_cs/src/main/java/robot/mj/RobotConnectionManager.java b/robots/majiang/robot_mj_cs/src/main/java/robot/mj/RobotConnectionManager.java index 8178c3a..282c816 100644 --- a/robots/majiang/robot_mj_cs/src/main/java/robot/mj/RobotConnectionManager.java +++ b/robots/majiang/robot_mj_cs/src/main/java/robot/mj/RobotConnectionManager.java @@ -746,7 +746,7 @@ public class RobotConnectionManager { public void connectGame(RobotUser robotUser){ if(robotUser.isLogin){ if(robotUser.getClient()==null){ - TaurusClient client = new TaurusClient(robotUser.getGameHost()+":"+robotUser.getGamePort(), "game", TaurusClient.ConnectionProtocol.Tcp); + TaurusClient client = new TaurusClient(robotUser.getGameHost()+":"+robotUser.getGamePort(), "cm"+robotUser.getRobotId(), TaurusClient.ConnectionProtocol.Tcp); client.setSession(robotUser.getLoginsession()); client.connect(); setupEventListeners(client, robotUser.getCurrentRoomId()+"_"+robotUser.getRobotId()); @@ -765,7 +765,7 @@ public class RobotConnectionManager { robotUser.setIsconnect(true); }else{ System.out.println("reconnect"+robotUser.getClient().getGameID()); - TaurusClient client = new TaurusClient(robotUser.getGameHost()+":"+robotUser.getGamePort(), "game", TaurusClient.ConnectionProtocol.Tcp); + TaurusClient client = new TaurusClient(robotUser.getGameHost()+":"+robotUser.getGamePort(), "cm"+robotUser.getRobotId(), TaurusClient.ConnectionProtocol.Tcp); client.setSession(robotUser.getLoginsession()); client.connect(); robotUser.setIsconnect(client.isConnected()); diff --git a/robots/majiang/robot_mj_cs/src/main/java/robot/mj/handler/HuNanChangSha.java b/robots/majiang/robot_mj_cs/src/main/java/robot/mj/handler/HuNanChangSha.java index 474f869..667c6d3 100644 --- a/robots/majiang/robot_mj_cs/src/main/java/robot/mj/handler/HuNanChangSha.java +++ b/robots/majiang/robot_mj_cs/src/main/java/robot/mj/handler/HuNanChangSha.java @@ -13,6 +13,7 @@ import taurus.client.TaurusClient; import taurus.util.*; import java.util.*; +import java.util.concurrent.CompletableFuture; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; @@ -872,11 +873,20 @@ public class HuNanChangSha { System.out.println("打过后的手牌 +++ " + changShaCardInhand); params.putString("session", session + "," + token); - int ot = new Random().nextInt(5); - Thread.sleep(ot*1000); - client.send("611", params, response -> { + CompletableFuture.runAsync(() -> { + try { + int ot = new Random().nextInt(4); + Thread.sleep(ot*1000); + client.send("611", params, response -> { + }); + } catch (Exception e) { + System.out.println("Thread error"); + //Thread.currentThread().interrupt(); + } }); + + }catch (Exception e){ } diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/Config.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/Config.class index 8734b39..e851942 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/Config.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/Config.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXActionEvent.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXActionEvent.class deleted file mode 100644 index bb093fb..0000000 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXActionEvent.class and /dev/null differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXGameController.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXGameController.class index f63c7af..21b1773 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXGameController.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXGameController.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXMainServer.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXMainServer.class index a5ba910..a34d881 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXMainServer.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXMainServer.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXPlayer.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXPlayer.class index 769fb81..517393d 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXPlayer.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXPlayer.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXRoom.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXRoom.class index a4c8ae0..bc4e8e0 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXRoom.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/EXRoom.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/RobotConnectionManager$3.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/RobotConnectionManager$3.class index 147a93c..8a8108e 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/RobotConnectionManager$3.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/RobotConnectionManager$3.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/RobotConnectionManager.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/RobotConnectionManager.class index fb03f55..53023ac 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/RobotConnectionManager.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/RobotConnectionManager.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/RoomCreator$RoomInfo.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/RoomCreator$RoomInfo.class index d8bbb63..765a37f 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/RoomCreator$RoomInfo.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/RoomCreator$RoomInfo.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/RoomCreator.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/RoomCreator.class index 061fcb7..f023741 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/RoomCreator.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/RoomCreator.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/business/AccountBusiness.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/business/AccountBusiness.class index 6b467ac..40de50d 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/business/AccountBusiness.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/business/AccountBusiness.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$1.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$1.class index 8f89b6e..2399cd5 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$1.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$1.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$2.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$2.class index d2b2fa3..f04b77b 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$2.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$2.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$3.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$3.class index bd5c70b..c06f9d4 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$3.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$3.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$4.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$4.class index d91b06c..8a91186 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$4.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$4.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$5.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$5.class index 610d5c7..db26856 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$5.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$5.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$6.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$6.class index b9cfd12..c205439 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$6.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$6.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$7.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$7.class index 0d61b7f..b1392c2 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$7.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha$7.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha.class index a51f25f..6408dc3 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha.class and b/robots/majiang/robot_mj_cs/target/classes/robot/mj/handler/HuNanChangSha.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/robot/mj/network/TaurusTcpListener.class b/robots/majiang/robot_mj_cs/target/classes/robot/mj/network/TaurusTcpListener.class deleted file mode 100644 index 00f50a5..0000000 Binary files a/robots/majiang/robot_mj_cs/target/classes/robot/mj/network/TaurusTcpListener.class and /dev/null differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/ChangShaSuanFaTest.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/ChangShaSuanFaTest.class index 3893ba9..934c529 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/ChangShaSuanFaTest.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/ChangShaSuanFaTest.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/ChangshaWinSplitCard.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/ChangshaWinSplitCard.class index b55db2f..85a3e8e 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/ChangshaWinSplitCard.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/ChangshaWinSplitCard.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/HandAnalysis.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/HandAnalysis.class index ddec36d..99847c3 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/HandAnalysis.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/HandAnalysis.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/Paixing.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/Paixing.class index 5a1eb6a..c5d152c 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/Paixing.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/Paixing.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/PlayerState.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/PlayerState.class index a6282bb..9aae467 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/PlayerState.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/PlayerState.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi$TingChiOption.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi$TingChiOption.class deleted file mode 100644 index 3c51032..0000000 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi$TingChiOption.class and /dev/null differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi$TingResult.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi$TingResult.class deleted file mode 100644 index eb1948c..0000000 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi$TingResult.class and /dev/null differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi.class index d226247..abb0fa7 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuChi.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuGang.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuGang.class deleted file mode 100644 index e8f58b7..0000000 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuGang.class and /dev/null differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuPeng$HandAnalysis.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuPeng$HandAnalysis.class deleted file mode 100644 index 677b302..0000000 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuPeng$HandAnalysis.class and /dev/null differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuPeng.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuPeng.class deleted file mode 100644 index 8c641a3..0000000 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TinHuPeng.class and /dev/null differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$HuResult.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$HuResult.class index e6f4260..9ad7a44 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$HuResult.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$HuResult.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$TingCardInfo.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$TingCardInfo.class index 666e13e..2eb8a66 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$TingCardInfo.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$TingCardInfo.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$TingResult.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$TingResult.class index 6e17255..8122c07 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$TingResult.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker$TingResult.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker.class index c72c379..b868a6e 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/TingPaiChecker.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/WinCard.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/WinCard.class index 0f5c699..a768499 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/WinCard.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/WinCard.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/ai$DiscardResult.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/ai$DiscardResult.class index f97448b..b499e72 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/ai$DiscardResult.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/ai$DiscardResult.class differ diff --git a/robots/majiang/robot_mj_cs/target/classes/taurus/util/ai.class b/robots/majiang/robot_mj_cs/target/classes/taurus/util/ai.class index 3ef876a..62e89dc 100644 Binary files a/robots/majiang/robot_mj_cs/target/classes/taurus/util/ai.class and b/robots/majiang/robot_mj_cs/target/classes/taurus/util/ai.class differ diff --git a/robots/majiang/robot_mj_cs/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/robots/majiang/robot_mj_cs/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index f86d4c8..e94bb76 100644 --- a/robots/majiang/robot_mj_cs/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/robots/majiang/robot_mj_cs/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -1,10 +1,8 @@ taurus\util\TinHuChi.class -taurus\util\TinHuGang.class robot\mj\Config.class taurus\util\PlayerState.class robot\mj\handler\HuNanChangSha$7.class robot\mj\RobotConnectionManager$3.class -taurus\util\TinHuPeng.class robot\mj\business\AccountBusiness.class robot\mj\RobotConnectionManager.class robot\mj\RoomCreator$RoomInfo.class @@ -15,8 +13,6 @@ robot\mj\EXPlayer.class robot\mj\handler\HuNanChangSha$3.class robot\mj\EXGameController.class robot\mj\handler\HuNanChangSha.class -taurus\util\TinHuChi$TingResult.class -taurus\util\TinHuPeng$HandAnalysis.class taurus\util\ROBOTEventType.class robot\mj\EXRoom.class taurus\util\Paixing.class @@ -30,8 +26,6 @@ robot\mj\RoomCreator.class taurus\util\ai$DiscardResult.class robot\mj\info\RobotUser.class robot\mj\RobotConnectionManager$2.class -taurus\util\TinHuChi$TingChiOption.class -robot\mj\network\TaurusTcpListener.class taurus\util\WinCardType.class robot\mj\handler\HuNanChangSha$5.class robot\mj\RobotConnectionManager$1.class @@ -40,4 +34,3 @@ taurus\util\HandAnalysis.class taurus\util\ChangShaSuanFaTest.class robot\mj\handler\HuNanChangSha$2.class taurus\util\TingPaiChecker$TingCardInfo.class -robot\mj\EXActionEvent.class diff --git a/robots/majiang/robot_mj_cs/target/robot.jar b/robots/majiang/robot_mj_cs/target/robot.jar index 77de450..c2234dd 100644 Binary files a/robots/majiang/robot_mj_cs/target/robot.jar and b/robots/majiang/robot_mj_cs/target/robot.jar differ diff --git a/robots/majiang/robot_mj_hz/src/main/java/robot/mj/EXGameController.java b/robots/majiang/robot_mj_hz/src/main/java/robot/mj/EXGameController.java index 9ca511b..dec1aa1 100644 --- a/robots/majiang/robot_mj_hz/src/main/java/robot/mj/EXGameController.java +++ b/robots/majiang/robot_mj_hz/src/main/java/robot/mj/EXGameController.java @@ -316,7 +316,7 @@ public class EXGameController extends GameController { System.err.println("重启后已进入房间准备成功: " + "room:" + robotUser.getCurrentRoomId() + "robot:" + robotUser.getRobotId()); } catch (Exception e) { - throw new RuntimeException(e); + // throw new RuntimeException(e); } finally { jedis0.close(); jedis2.close(); @@ -394,7 +394,7 @@ public class EXGameController extends GameController { robotUser.setIntoRoomTime(robotConnectionManager.getTime()); System.err.println("已进入房间准备成功: " + robotUser.getConnecId()); } catch (Exception e) { - throw new RuntimeException(e); + // throw new RuntimeException(e); } finally { jedis0.close(); jedis2.close(); diff --git a/robots/majiang/robot_mj_hz/src/main/java/robot/mj/handler/HuNanHongZhong.java b/robots/majiang/robot_mj_hz/src/main/java/robot/mj/handler/HuNanHongZhong.java index 03b9ddb..fed9bd3 100644 --- a/robots/majiang/robot_mj_hz/src/main/java/robot/mj/handler/HuNanHongZhong.java +++ b/robots/majiang/robot_mj_hz/src/main/java/robot/mj/handler/HuNanHongZhong.java @@ -15,6 +15,7 @@ import taurus.util.HongZhongSuanFaTest; import taurus.util.Util; import java.util.*; +import java.util.concurrent.CompletableFuture; public class HuNanHongZhong { @@ -404,13 +405,22 @@ public class HuNanHongZhong { System.out.println("目前机器人剩余手牌：" + hongZhongCardInhand.toString()); params.putString("session", session + "," + token); - //缩短出牌延时 - int ot = new Random().nextInt(3); - Thread.sleep(ot * 1000); + CompletableFuture.runAsync(() -> { + try { + //缩短出牌延时 + int ot = new Random().nextInt(2); + Thread.sleep(ot * 1000+1000); - client.send("611", params, response -> { - System.out.println("出牌成功: " + response.returnCode); + client.send("611", params, response -> { + System.out.println("出牌成功: " + response.returnCode); + }); + } catch (Exception e) { + System.out.println("Thread error"); + //Thread.currentThread().interrupt(); + } }); + + }catch (Exception e) { // e.printStackTrace(); } diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/Config.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/Config.class index 8734b39..3d46ce7 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/Config.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/Config.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXGameController.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXGameController.class index 3a27b97..a85279a 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXGameController.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXGameController.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXMainServer.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXMainServer.class index 6784783..63ed309 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXMainServer.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXMainServer.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXPlayer.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXPlayer.class index 769fb81..6ec9bff 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXPlayer.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXPlayer.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXRoom.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXRoom.class index a4c8ae0..dfb24e7 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXRoom.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/EXRoom.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/RobotConnectionManager.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/RobotConnectionManager.class index 0b01258..8758251 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/RobotConnectionManager.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/RobotConnectionManager.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/business/AccountBusiness.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/business/AccountBusiness.class index 6b467ac..5a53c06 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/business/AccountBusiness.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/business/AccountBusiness.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong$1.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong$1.class index f9e762c..91ae70c 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong$1.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong$1.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong$2.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong$2.class index 3e49258..cd11f4e 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong$2.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong$2.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong.class b/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong.class index 38f1697..f80f1f6 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong.class and b/robots/majiang/robot_mj_hz/target/classes/robot/mj/handler/HuNanHongZhong.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/taurus/util/CardUtil.class b/robots/majiang/robot_mj_hz/target/classes/taurus/util/CardUtil.class index 5568476..39f1e61 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/taurus/util/CardUtil.class and b/robots/majiang/robot_mj_hz/target/classes/taurus/util/CardUtil.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest$1.class b/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest$1.class index 53e3a2b..c342073 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest$1.class and b/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest$1.class differ diff --git a/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest$WinResult.class b/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest$WinResult.class deleted file mode 100644 index f229e32..0000000 Binary files a/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest$WinResult.class and /dev/null differ diff --git a/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest.class b/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest.class index d715cac..d1f202b 100644 Binary files a/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest.class and b/robots/majiang/robot_mj_hz/target/classes/taurus/util/HongZhongSuanFaTest.class differ diff --git a/robots/majiang/robot_mj_hz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst b/robots/majiang/robot_mj_hz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst index 58f6985..492d5a2 100644 --- a/robots/majiang/robot_mj_hz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst +++ b/robots/majiang/robot_mj_hz/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst @@ -20,7 +20,6 @@ robot\mj\RoomCreator.class robot\mj\handler\HuNanHongZhong$2.class taurus\util\HongZhongSuanFaTest$SpecialPattern.class robot\mj\info\RobotUser.class -taurus\util\HongZhongSuanFaTest$WinResult.class robot\mj\RobotConnectionManager$2.class robot\mj\RobotConnectionManager$1.class robot\mj\handler\HuNanHongZhong.class diff --git a/robots/majiang/robot_mj_hz/target/robot.jar b/robots/majiang/robot_mj_hz/target/robot.jar index 0eec738..5d51538 100644 Binary files a/robots/majiang/robot_mj_hz/target/robot.jar and b/robots/majiang/robot_mj_hz/target/robot.jar differ