diff --git a/robots/majiang/robot_mj_cs/config/game-config.xml b/robots/majiang/robot_mj_cs/config/game-config.xml
index bddc052..b62d1cc 100644
--- a/robots/majiang/robot_mj_cs/config/game-config.xml
+++ b/robots/majiang/robot_mj_cs/config/game-config.xml
@@ -1,10 +1,10 @@
- 8.138.242.190
- 8.138.242.190
+ 127.0.0.1
+ 127.0.0.1
8701
- 7701
+ 8701
10
true
\ No newline at end of file
diff --git a/robots/majiang/robot_mj_cs/config/taurus-core.xml b/robots/majiang/robot_mj_cs/config/taurus-core.xml
index 12b5989..61b85b8 100644
--- a/robots/majiang/robot_mj_cs/config/taurus-core.xml
+++ b/robots/majiang/robot_mj_cs/config/taurus-core.xml
@@ -8,17 +8,17 @@
- 80
+ 200
- 20
+ 50
- 5
+ 20
- -1
+ 2000
- true
+ false
- true
+ false
true
@@ -36,19 +36,8 @@
true
-
+
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/robots/majiang/robot_mj_cs/config/taurus-permanent.xml b/robots/majiang/robot_mj_cs/config/taurus-permanent.xml
index 4302e58..1bea85c 100644
--- a/robots/majiang/robot_mj_cs/config/taurus-permanent.xml
+++ b/robots/majiang/robot_mj_cs/config/taurus-permanent.xml
@@ -10,16 +10,16 @@
524288
- 1024
+ 16384
32768
- 160
+ 512
- 1
+ 4
2
- 1
+ 2
true
@@ -57,19 +57,19 @@
Sys
- 2
- 8
+ 16
+ 32
60000
- 20000
+ 5000
Ext
- 2
- 8
+ 16
+ 32
60000
- 20000
+ 5000
\ No newline at end of file
diff --git a/robots/majiang/robot_mj_cs/src/main/java/robot/mj/EXGameController.java b/robots/majiang/robot_mj_cs/src/main/java/robot/mj/EXGameController.java
index 3db100d..9cec950 100644
--- a/robots/majiang/robot_mj_cs/src/main/java/robot/mj/EXGameController.java
+++ b/robots/majiang/robot_mj_cs/src/main/java/robot/mj/EXGameController.java
@@ -356,20 +356,7 @@ public class EXGameController extends GameController {
robotRoomMapping.put(robotUser.getConnecId(), robotUser);
robotConnectionManager.reconnectToGameServer(response, robotUser, client);
});
-
- //添加超时检查机制
- CompletableFuture.runAsync(() -> {
- try {
- Thread.sleep(10000);
- //10秒后还没有建立映射关系 加入可能失败
- if (robotRoomMapping.get(robotUser.getConnecId()) == null) {
- System.err.println("机器人{"+robotId+"}加入房间{"+roomId+"}超时，清理临时状态");
- robotConnectionManager.disconnectFromGameServer(connecId);
- }
- } catch (InterruptedException e) {
- Thread.currentThread().interrupt();
- }
- });
+
System.err.println("已进入房间成功: " + robotUser.getConnecId());
Thread.sleep(1000);
if (client.isConnected()) {
@@ -381,6 +368,19 @@ public class EXGameController extends GameController {
robotUser.setStatus(ROBOTEventType.ROBOT_INTOROOM_READY);
robotConnectionManager.setSessionAndToken("{user}:" + robotId, robotSession, robotUser.getConnecId());
}
+ //添加超时检查机制
+ CompletableFuture.runAsync(() -> {
+ try {
+ Thread.sleep(15000);
+ //10秒后还没有建立映射关系 加入可能失败
+ if (robotRoomMapping.get(robotUser.getConnecId()) == null) {
+ System.err.println("机器人{"+robotId+"}加入房间{"+roomId+"}超时，清理临时状态");
+ robotConnectionManager.disconnectFromGameServer(connecId);
+ }
+ } catch (InterruptedException e) {
+ Thread.currentThread().interrupt();
+ }
+ });
robotUser.setIntoRoomTime(robotConnectionManager.getTime());
System.err.println("已进入房间准备成功: " + robotUser.getConnecId());
} catch (Exception e) {