master
parent
9b18a28747
commit
f6b9e7c875
|
|
@ -0,0 +1,26 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="CompilerConfiguration">
|
||||||
|
<annotationProcessing>
|
||||||
|
<profile name="Maven default annotation processors profile" enabled="true">
|
||||||
|
<sourceOutputDir name="target/generated-sources/annotations" />
|
||||||
|
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
|
||||||
|
<outputRelativeToContentRoot value="true" />
|
||||||
|
<module name="game_mj_changsha" />
|
||||||
|
<module name="robot_mj_changsha" />
|
||||||
|
<module name="pack_tools" />
|
||||||
|
<module name="taurus-core" />
|
||||||
|
<module name="robot_common" />
|
||||||
|
<module name="game_mj_hongzhong" />
|
||||||
|
<module name="web_group" />
|
||||||
|
<module name="robot_mgr" />
|
||||||
|
<module name="web_login" />
|
||||||
|
<module name="taurus-permanent" />
|
||||||
|
<module name="event_mgr" />
|
||||||
|
<module name="group_mgr" />
|
||||||
|
<module name="game_common" />
|
||||||
|
<module name="taurus-web" />
|
||||||
|
</profile>
|
||||||
|
</annotationProcessing>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
@ -0,0 +1,35 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="Encoding">
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/event_mgr/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/event_mgr/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/group_room_mgr/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/group_room_mgr/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/pack_tools/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/pack_tools/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/robot_mgr/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/robot_mgr/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/web_group/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/web_group/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/web_login20/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/game_web/web_login20/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/game_common/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/game_common/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/robot_common/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/robot_common/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/taurus-server/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/taurus-server/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/taurus-server/taurus-core/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/taurus-server/taurus-core/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/taurus-server/taurus-permanent/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/taurus-server/taurus-permanent/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/taurus-server/taurus-web/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/libs/taurus-server/taurus-web/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/majiang/changsha/game_mj_cs/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/majiang/changsha/game_mj_cs/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/majiang/hongzhong/game_mj_hz/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/majiang/hongzhong/game_mj_hz/src/main/resources" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/robots/majiang/robot_mj_cs/src/main/java" charset="UTF-8" />
|
||||||
|
<file url="file://$PROJECT_DIR$/robots/majiang/robot_mj_cs/src/main/resources" charset="UTF-8" />
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
@ -0,0 +1,20 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<project version="4">
|
||||||
|
<component name="RemoteRepositoriesConfiguration">
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="central" />
|
||||||
|
<option name="name" value="Maven Central repository" />
|
||||||
|
<option name="url" value="https://repo1.maven.org/maven2" />
|
||||||
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="jboss.community" />
|
||||||
|
<option name="name" value="JBoss Community repository" />
|
||||||
|
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||||
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="central" />
|
||||||
|
<option name="name" value="Central Repository" />
|
||||||
|
<option name="url" value="https://maven.aliyun.com/nexus/content/groups/public" />
|
||||||
|
</remote-repository>
|
||||||
|
</component>
|
||||||
|
</project>
|
||||||
|
|
@ -1,5 +1,24 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<project version="4">
|
<project version="4">
|
||||||
|
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||||
|
<component name="MavenProjectsManager">
|
||||||
|
<option name="originalFiles">
|
||||||
|
<list>
|
||||||
|
<option value="$PROJECT_DIR$/game_web/event_mgr/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/game_web/group_room_mgr/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/game_web/pack_tools/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/game_web/robot_mgr/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/game_web/web_group/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/game_web/web_login20/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/libs/game_common/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/libs/robot_common/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/libs/taurus-server/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/majiang/changsha/game_mj_cs/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/majiang/hongzhong/game_mj_hz/pom.xml" />
|
||||||
|
<option value="$PROJECT_DIR$/robots/majiang/robot_mj_cs/pom.xml" />
|
||||||
|
</list>
|
||||||
|
</option>
|
||||||
|
</component>
|
||||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||||
<output url="file://$PROJECT_DIR$/out" />
|
<output url="file://$PROJECT_DIR$/out" />
|
||||||
</component>
|
</component>
|
||||||
|
|
|
||||||
|
|
@ -16,5 +16,10 @@
|
||||||
<option name="name" value="JBoss Community repository" />
|
<option name="name" value="JBoss Community repository" />
|
||||||
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
|
||||||
</remote-repository>
|
</remote-repository>
|
||||||
|
<remote-repository>
|
||||||
|
<option name="id" value="central" />
|
||||||
|
<option name="name" value="Central Repository" />
|
||||||
|
<option name="url" value="https://maven.aliyun.com/nexus/content/groups/public" />
|
||||||
|
</remote-repository>
|
||||||
</component>
|
</component>
|
||||||
</project>
|
</project>
|
||||||
|
|
@ -0,0 +1,9 @@
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<module type="JAVA_MODULE" version="4">
|
||||||
|
<component name="NewModuleRootManager" inherit-compiler-output="true">
|
||||||
|
<exclude-output />
|
||||||
|
<content url="file://$MODULE_DIR$/pom.xml" />
|
||||||
|
<orderEntry type="inheritedJdk" />
|
||||||
|
<orderEntry type="sourceFolder" forTests="false" />
|
||||||
|
</component>
|
||||||
|
</module>
|
||||||
|
|
@ -116,7 +116,7 @@ public class MainServer extends Extension {
|
||||||
}
|
}
|
||||||
|
|
||||||
Map<Integer, Integer> gameRobotConfig = new HashMap<>();
|
Map<Integer, Integer> gameRobotConfig = new HashMap<>();
|
||||||
gameRobotConfig.put(10, 1);
|
gameRobotConfig.put(10, 10);
|
||||||
gameRobotConfig.put(22, 0);
|
gameRobotConfig.put(22, 0);
|
||||||
int robotIndex = 0;
|
int robotIndex = 0;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -83,10 +83,8 @@ public class RobotDisconnect {
|
||||||
}
|
}
|
||||||
|
|
||||||
//更新Redis2中的机器人start状态为0
|
//更新Redis2中的机器人start状态为0
|
||||||
updateRedis2StartStatus(robotId, 0);
|
updateRobotDB(robotId, 0);
|
||||||
|
|
||||||
//更新机器人状态为可用
|
|
||||||
updateDatabaseStatus(robotId);
|
|
||||||
log.info("机器人 {} 断开连接流程完成", robotId);
|
log.info("机器人 {} 断开连接流程完成", robotId);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("统一断开机器人 {} 连接时发生异常", robotId, e);
|
log.error("统一断开机器人 {} 连接时发生异常", robotId, e);
|
||||||
|
|
@ -109,27 +107,20 @@ public class RobotDisconnect {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 更新数据库状态
|
|
||||||
*/
|
|
||||||
private void updateDatabaseStatus(int robotId) {
|
|
||||||
try {
|
|
||||||
String sql = String.format("UPDATE `account` SET start = %d WHERE id = %d", 0, robotId);
|
|
||||||
DataBase.use().executeUpdate(sql);
|
|
||||||
log.debug("数据库已更新机器人 {} 状态为可用", robotId);
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("更新机器人 {} 数据库状态失败", robotId, e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 更新Redis2中机器人的start状态
|
* 更新redis及数据库状态
|
||||||
*/
|
*/
|
||||||
private void updateRedis2StartStatus(int robotId, int startValue) {
|
private void updateRobotDB(int robotId, int startValue) {
|
||||||
try (Jedis jedis2 = Redis.use("group1_db2").getJedis()) {
|
try (Jedis jedis2 = Redis.use("group1_db2").getJedis()) {
|
||||||
String gRobotKey = "{grobot}:" + robotId;
|
String gRobotKey = "{grobot}:" + robotId;
|
||||||
jedis2.hset(gRobotKey, "start", String.valueOf(startValue));
|
jedis2.hset(gRobotKey, "start", String.valueOf(startValue));
|
||||||
log.debug("Redis2已更新机器人 {} 的start状态为 {}", robotId, startValue);
|
log.debug("Redis2已更新机器人 {} 的start状态为 {}", robotId, startValue);
|
||||||
|
|
||||||
|
String sql = String.format("UPDATE `account` SET start = %d WHERE id = %d", startValue, robotId);
|
||||||
|
DataBase.use().executeUpdate(sql);
|
||||||
|
log.debug("数据库已更新机器人 {} 状态为可用", robotId);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
log.error("更新机器人 {} Redis2 start状态失败", robotId, e);
|
log.error("更新机器人 {} Redis2 start状态失败", robotId, e);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -221,64 +221,6 @@ public class RobotConnectionHandler {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 超时检查 6秒没有玩家加入 则退出房间
|
|
||||||
* @param robot 机器人信息
|
|
||||||
*/
|
|
||||||
public void readyTimeRobotExit(RobotInfo robot, Object joinRoomLock) {
|
|
||||||
CompletableFuture.runAsync(() -> {
|
|
||||||
try {
|
|
||||||
Thread.sleep(6000);
|
|
||||||
log.info("机器人 {} 准备时间超过6秒且房间人数不足，退出房间", robot.getRobotId());
|
|
||||||
TaurusClient client = robotClients.get(robot.getRobotId());
|
|
||||||
|
|
||||||
if (client != null) {
|
|
||||||
//发送离开房间协议
|
|
||||||
ITObject param = new TObject();
|
|
||||||
param.putString("robotId", String.valueOf(robot.getRobotId()));
|
|
||||||
param.putString("connecId", robotConnectionIds.get(robot.getRobotId()));
|
|
||||||
System.out.println("readyTimeRobotExit 2005 client: "+ robotConnectionIds.get(robot.getRobotId()));
|
|
||||||
client.send("2005", param, response -> {
|
|
||||||
log.debug("机器人 {} 发送离开房间请求", robot.getRobotId());
|
|
||||||
});
|
|
||||||
} else {
|
|
||||||
log.warn("机器人 {} 连接不存在或未激活，跳过离开房间操作", robot.getRobotId());
|
|
||||||
}
|
|
||||||
|
|
||||||
//机器人退出空房间 增加leftover_robot数量
|
|
||||||
if (joinRoomLock != null) {
|
|
||||||
synchronized (joinRoomLock) {
|
|
||||||
increaseLeftoverRobot(robot);
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
increaseLeftoverRobot(robot);
|
|
||||||
}
|
|
||||||
} catch (InterruptedException e) {
|
|
||||||
log.debug("超时检查线程被中断: {}", robot.getRobotId());
|
|
||||||
Thread.currentThread().interrupt();
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 增加leftover_robot数量 机器人退出空房间的情况
|
|
||||||
*/
|
|
||||||
private void increaseLeftoverRobot(RobotInfo robot) {
|
|
||||||
try (Jedis jedis11 = Redis.use("group1_db11").getJedis();Jedis jedis2 = Redis.use("group1_db2").getJedis()) {
|
|
||||||
String playKey = "g{" + robot.getGroupId() + "}:play:" + robot.getWanfaId();
|
|
||||||
jedis11.hincrBy(playKey, "leftover_robot", 1);
|
|
||||||
|
|
||||||
jedis2.hset("{grobot}:" + robot.getRobotId(), "start", "0");
|
|
||||||
|
|
||||||
robotManager.markLeftoverRobotRecovered(robot.getRobotId());
|
|
||||||
robotManager.roomProcessingFinish(robot.getRoomId());
|
|
||||||
log.debug("机器人 {} 退出空房间，增加leftover_robot，群组={}, 玩法={}", robot.getRobotId(), robot.getGroupId(), robot.getWanfaId());
|
|
||||||
} catch (Exception e) {
|
|
||||||
log.error("增加Redis leftover_robot时异常，群组={}, 玩法={}", robot.getGroupId(), robot.getWanfaId(), e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 发送初始化协议
|
* 发送初始化协议
|
||||||
*/
|
*/
|
||||||
|
|
@ -328,7 +270,7 @@ public class RobotConnectionHandler {
|
||||||
}
|
}
|
||||||
}, 10000);
|
}, 10000);
|
||||||
|
|
||||||
client.send("2002", readyParam, response -> {
|
client.send("1002", readyParam, response -> {
|
||||||
boolean success = response != null && response.returnCode == 0;
|
boolean success = response != null && response.returnCode == 0;
|
||||||
if (!future.isDone()) {
|
if (!future.isDone()) {
|
||||||
future.complete(success);
|
future.complete(success);
|
||||||
|
|
@ -340,9 +282,9 @@ public class RobotConnectionHandler {
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 异步发送准备消息给指定机器人，返回CompletableFuture
|
* 异步发送准备消息给指定机器人
|
||||||
*/
|
*/
|
||||||
public CompletableFuture<Boolean> sendReadyMessageAsyncCompletable(RobotInfo robot) {
|
public CompletableFuture<Boolean> sendReadyMessage(RobotInfo robot) {
|
||||||
CompletableFuture<Boolean> future = new CompletableFuture<>();
|
CompletableFuture<Boolean> future = new CompletableFuture<>();
|
||||||
|
|
||||||
TaurusClient client = robotClients.get(robot.getRobotId());
|
TaurusClient client = robotClients.get(robot.getRobotId());
|
||||||
|
|
@ -356,7 +298,7 @@ public class RobotConnectionHandler {
|
||||||
readyParam.putString("robotId", String.valueOf(robot.getRobotId()));
|
readyParam.putString("robotId", String.valueOf(robot.getRobotId()));
|
||||||
readyParam.putString("connecId", robotConnectionIds.get(robot.getRobotId()));
|
readyParam.putString("connecId", robotConnectionIds.get(robot.getRobotId()));
|
||||||
|
|
||||||
// 设置超时机制
|
//超时机制
|
||||||
Timer timer = new Timer();
|
Timer timer = new Timer();
|
||||||
timer.schedule(new TimerTask() {
|
timer.schedule(new TimerTask() {
|
||||||
@Override
|
@Override
|
||||||
|
|
@ -365,9 +307,9 @@ public class RobotConnectionHandler {
|
||||||
future.completeExceptionally(new RuntimeException("Ready message timeout"));
|
future.completeExceptionally(new RuntimeException("Ready message timeout"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, 10000); // 10秒超时
|
}, 10000);
|
||||||
|
|
||||||
client.send("2003", readyParam, response -> {
|
client.send("1003", readyParam, response -> {
|
||||||
boolean success = response != null && response.returnCode == 0;
|
boolean success = response != null && response.returnCode == 0;
|
||||||
if (!future.isDone()) {
|
if (!future.isDone()) {
|
||||||
future.complete(success);
|
future.complete(success);
|
||||||
|
|
|
||||||
|
|
@ -164,7 +164,7 @@ public class RoomWanfaMatcher {
|
||||||
synchronized (roomSpecificLock) {
|
synchronized (roomSpecificLock) {
|
||||||
if (!processingRooms.contains(roomId)) {
|
if (!processingRooms.contains(roomId)) {
|
||||||
processingRooms.add(roomId);
|
processingRooms.add(roomId);
|
||||||
robotJoinRoom(robot, true);
|
robotJoinRoom(robot);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
@ -175,7 +175,7 @@ public class RoomWanfaMatcher {
|
||||||
synchronized (roomSpecificLock) {
|
synchronized (roomSpecificLock) {
|
||||||
if (!processingRooms.contains(roomId)) {
|
if (!processingRooms.contains(roomId)) {
|
||||||
processingRooms.add(roomId);
|
processingRooms.add(roomId);
|
||||||
robotJoinRoom(robot, false);
|
robotJoinRoom(robot);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -191,10 +191,9 @@ public class RoomWanfaMatcher {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 机器人加入房间
|
* 机器人加入房间
|
||||||
* @param isRobot 是否是机器人创建房间
|
|
||||||
* @param robot 机器人实例
|
* @param robot 机器人实例
|
||||||
* */
|
* */
|
||||||
private void robotJoinRoom(RobotInfo robot, boolean isRobot) {
|
private void robotJoinRoom(RobotInfo robot) {
|
||||||
String roomId = robot != null ? robot.getRoomId() : null;
|
String roomId = robot != null ? robot.getRoomId() : null;
|
||||||
Object roomSpecificLock = robotManager.getRoomLock(roomId);
|
Object roomSpecificLock = robotManager.getRoomLock(roomId);
|
||||||
synchronized (roomSpecificLock) {
|
synchronized (roomSpecificLock) {
|
||||||
|
|
@ -225,7 +224,7 @@ public class RoomWanfaMatcher {
|
||||||
if (joinSuccess) {
|
if (joinSuccess) {
|
||||||
System.out.println("机器人"+robot.getRobotId()+" 加入了房间 机器人状态 :" + robot.isConnecting());
|
System.out.println("机器人"+robot.getRobotId()+" 加入了房间 机器人状态 :" + robot.isConnecting());
|
||||||
//准备阶段
|
//准备阶段
|
||||||
return robotConnectionHandler.sendReadyMessageAsyncCompletable(finalRobotInfo);
|
return robotConnectionHandler.sendReadyMessage(finalRobotInfo);
|
||||||
} else {
|
} else {
|
||||||
System.out.println("robotJoinRoomInternal机器人加入了房间 失败 :" + robot.isConnecting());
|
System.out.println("robotJoinRoomInternal机器人加入了房间 失败 :" + robot.isConnecting());
|
||||||
//加入失败 释放机器人
|
//加入失败 释放机器人
|
||||||
|
|
@ -237,10 +236,6 @@ public class RoomWanfaMatcher {
|
||||||
System.out.println("robotJoinRoomInternal机器人准备 房间 机器人状态 :" + robot.isConnecting());
|
System.out.println("robotJoinRoomInternal机器人准备 房间 机器人状态 :" + robot.isConnecting());
|
||||||
roomToRobotMap.put(roomId, finalRobotInfo.getRobotId());
|
roomToRobotMap.put(roomId, finalRobotInfo.getRobotId());
|
||||||
updateRobotStatusRedis(finalRobotInfo);
|
updateRobotStatusRedis(finalRobotInfo);
|
||||||
if (isRobot) {
|
|
||||||
//6秒没有玩家加入 则退出房间
|
|
||||||
//robotConnectionHandler.readyTimeRobotExit(finalRobotInfo, robotManager.getRoomLock(roomId));
|
|
||||||
}
|
|
||||||
} else {
|
} else {
|
||||||
System.out.println("robotJoinRoomInternal机器人准备 房间 失败 :" + robot.isConnecting());
|
System.out.println("robotJoinRoomInternal机器人准备 房间 失败 :" + robot.isConnecting());
|
||||||
//准备失败时释放机器人
|
//准备失败时释放机器人
|
||||||
|
|
@ -284,7 +279,7 @@ public class RoomWanfaMatcher {
|
||||||
*/
|
*/
|
||||||
private void onRoomCreated(RobotInfo robot) {
|
private void onRoomCreated(RobotInfo robot) {
|
||||||
try {
|
try {
|
||||||
robotJoinRoom(robot, true);
|
robotJoinRoom(robot);
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
if (robot != null) {
|
if (robot != null) {
|
||||||
robotConnectionHandler.disconnectRobot(robot.getRobotId());
|
robotConnectionHandler.disconnectRobot(robot.getRobotId());
|
||||||
|
|
|
||||||
|
|
@ -43,14 +43,14 @@
|
||||||
<!--<db>
|
<!--<db>
|
||||||
<name>db1</name>
|
<name>db1</name>
|
||||||
<driverName>com.mysql.cj.jdbc.Driver</driverName>
|
<driverName>com.mysql.cj.jdbc.Driver</driverName>
|
||||||
<jdbcUrl>jdbc:mysql://8.134.76.43:8060/wb_game</jdbcUrl>
|
<jdbcUrl>jdbc:mysql://8.138.242.190:8060/wb_game</jdbcUrl>
|
||||||
<userName>root</userName>
|
<userName>root</userName>
|
||||||
<password>6KYnXJjGhxNceF8e</password>
|
<password>6KYnXJjGhxNceF8e</password>
|
||||||
</db>-->
|
</db>-->
|
||||||
<db>
|
<db>
|
||||||
<name>db1</name>
|
<name>db1</name>
|
||||||
<driverName>com.mysql.cj.jdbc.Driver</driverName>
|
<driverName>com.mysql.cj.jdbc.Driver</driverName>
|
||||||
<jdbcUrl>jdbc:mysql://8.134.76.43:8060/wb_game</jdbcUrl>
|
<jdbcUrl>jdbc:mysql://8.138.242.190:8060/wb_game</jdbcUrl>
|
||||||
<userName>root</userName>
|
<userName>root</userName>
|
||||||
<password>6KYnXJjGhxNceF8e</password>
|
<password>6KYnXJjGhxNceF8e</password>
|
||||||
</db>
|
</db>
|
||||||
|
|
@ -93,15 +93,15 @@
|
||||||
</poolConfig>
|
</poolConfig>
|
||||||
|
|
||||||
<infos>
|
<infos>
|
||||||
<info name="group1_db0" host="8.134.76.43" password="cssq@2020" port="6379" database="0" timeout="5000"/>
|
<info name="group1_db0" host="8.138.242.190" password="cssq@2020" port="6379" database="0" timeout="5000"/>
|
||||||
<info name="group1_db1" host="8.134.76.43" password="cssq@2020" port="6379" database="1" timeout="5000"/>
|
<info name="group1_db1" host="8.138.242.190" password="cssq@2020" port="6379" database="1" timeout="5000"/>
|
||||||
<info name="group1_db2" host="8.134.76.43" password="cssq@2020" port="6379" database="2" timeout="5000"/>
|
<info name="group1_db2" host="8.138.242.190" password="cssq@2020" port="6379" database="2" timeout="5000"/>
|
||||||
<info name="group1_db5" host="8.134.76.43" password="cssq@2020" port="6379" database="5" timeout="5000"/>
|
<info name="group1_db5" host="8.138.242.190" password="cssq@2020" port="6379" database="5" timeout="5000"/>
|
||||||
<info name="group1_db8" host="8.134.76.43" password="cssq@2020" port="6379" database="8" timeout="5000"/>
|
<info name="group1_db8" host="8.138.242.190" password="cssq@2020" port="6379" database="8" timeout="5000"/>
|
||||||
<info name="group1_db9" host="8.134.76.43" password="cssq@2020" port="6379" database="9" timeout="5000"/>
|
<info name="group1_db9" host="8.138.242.190" password="cssq@2020" port="6379" database="9" timeout="5000"/>
|
||||||
<info name="group1_db10" host="8.134.76.43" password="cssq@2020" port="6379" database="10" timeout="5000"/>
|
<info name="group1_db10" host="8.138.242.190" password="cssq@2020" port="6379" database="10" timeout="5000"/>
|
||||||
<info name="group1_db11" host="8.134.76.43" password="cssq@2020" port="6379" database="11" timeout="5000"/>
|
<info name="group1_db11" host="8.138.242.190" password="cssq@2020" port="6379" database="11" timeout="5000"/>
|
||||||
<info name="tmp_group1_db9" host="8.134.76.43" password="654sads" port="6479" database="9" timeout="5000"/>
|
<info name="tmp_group1_db9" host="8.138.242.190" password="654sads" port="6479" database="9" timeout="5000"/>
|
||||||
</infos>
|
</infos>
|
||||||
</plugin>
|
</plugin>
|
||||||
</serivce-core>
|
</serivce-core>
|
||||||
|
|
@ -8,3 +8,27 @@ taurus.client.io.TSocketException
|
||||||
at taurus.client.io.SocketTcp$2.run(SocketTcp.java:70)
|
at taurus.client.io.SocketTcp$2.run(SocketTcp.java:70)
|
||||||
at java.lang.Thread.run(Thread.java:750)
|
at java.lang.Thread.run(Thread.java:750)
|
||||||
04 二月 2026 | 12:58:54,539 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : ExceptionOnReceive
|
04 二月 2026 | 12:58:54,539 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : ExceptionOnReceive
|
||||||
|
04 二月 2026 | 15:17:53,519 | INFO | main | core.plugin.PluginService | | plugin[database] load success!
|
||||||
|
04 二月 2026 | 15:17:53,705 | INFO | main | core.plugin.PluginService | | plugin[redis] load success!
|
||||||
|
04 二月 2026 | 15:17:54,557 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : Connect
|
||||||
|
04 二月 2026 | 15:21:54,810 | INFO | main | core.plugin.PluginService | | plugin[database] load success!
|
||||||
|
04 二月 2026 | 15:21:54,969 | INFO | main | core.plugin.PluginService | | plugin[redis] load success!
|
||||||
|
04 二月 2026 | 15:21:55,825 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : Connect
|
||||||
|
04 二月 2026 | 15:22:52,765 | INFO | main | core.plugin.PluginService | | plugin[database] load success!
|
||||||
|
04 二月 2026 | 15:22:52,925 | INFO | main | core.plugin.PluginService | | plugin[redis] load success!
|
||||||
|
04 二月 2026 | 15:22:53,492 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : Connect
|
||||||
|
04 二月 2026 | 16:09:30,082 | INFO | main | core.plugin.PluginService | | plugin[database] load success!
|
||||||
|
04 二月 2026 | 16:09:30,332 | INFO | main | core.plugin.PluginService | | plugin[redis] load success!
|
||||||
|
04 二月 2026 | 16:09:39,482 | INFO | main | core.plugin.PluginService | | plugin[database] load success!
|
||||||
|
04 二月 2026 | 16:09:39,659 | INFO | main | core.plugin.PluginService | | plugin[redis] load success!
|
||||||
|
04 二月 2026 | 16:09:40,020 | INFO | main | client.business.AccountBusiness | | id:101777 login
|
||||||
|
04 二月 2026 | 16:09:40,240 | INFO | main | client.business.AccountBusiness | | ==========> password111 = 123456
|
||||||
|
04 二月 2026 | 16:09:42,684 | INFO | main | client.business.AccountBusiness | | id:101999 login
|
||||||
|
04 二月 2026 | 16:09:42,691 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : Connect
|
||||||
|
04 二月 2026 | 16:09:42,696 | INFO | main | client.business.AccountBusiness | | ==========> password111 = 123456
|
||||||
|
04 二月 2026 | 16:09:44,507 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : Connect
|
||||||
|
04 二月 2026 | 16:09:44,647 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : Connect
|
||||||
|
04 二月 2026 | 16:09:44,806 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : Connect
|
||||||
|
04 二月 2026 | 16:09:44,817 | INFO | main | client.business.AccountBusiness | | id:104637 login
|
||||||
|
04 二月 2026 | 16:09:44,830 | INFO | main | client.business.AccountBusiness | | ==========> password111 = 123456
|
||||||
|
04 二月 2026 | 16:09:46,408 | INFO | NetEvent-Thread | client.io.SocketEngine | | status : Connect
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1,8 +1,8 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
|
||||||
<gameSetting>
|
<gameSetting>
|
||||||
<host>8.134.76.43</host>
|
<host>8.138.242.190</host>
|
||||||
<intranet>8.134.76.43</intranet>
|
<intranet>8.138.242.190</intranet>
|
||||||
<port>8701</port>
|
<port>8701</port>
|
||||||
<serverId>7701</serverId>
|
<serverId>7701</serverId>
|
||||||
<gameId>10</gameId>
|
<gameId>10</gameId>
|
||||||
|
|
|
||||||
|
|
@ -38,15 +38,15 @@
|
||||||
</poolConfig>
|
</poolConfig>
|
||||||
|
|
||||||
<infos>
|
<infos>
|
||||||
<info name="group1_db0" host="8.134.76.43" password="cssq@2020" port="6379" database="0" timeout="5000"/>
|
<info name="group1_db0" host="8.138.242.190" password="cssq@2020" port="6379" database="0" timeout="5000"/>
|
||||||
<info name="group1_db1" host="8.134.76.43" password="cssq@2020" port="6379" database="1" timeout="5000"/>
|
<info name="group1_db1" host="8.138.242.190" password="cssq@2020" port="6379" database="1" timeout="5000"/>
|
||||||
<info name="group1_db2" host="8.134.76.43" password="cssq@2020" port="6379" database="2" timeout="5000"/>
|
<info name="group1_db2" host="8.138.242.190" password="cssq@2020" port="6379" database="2" timeout="5000"/>
|
||||||
<info name="group1_db5" host="8.134.76.43" password="cssq@2020" port="6379" database="5" timeout="5000"/>
|
<info name="group1_db5" host="8.138.242.190" password="cssq@2020" port="6379" database="5" timeout="5000"/>
|
||||||
<info name="group1_db8" host="8.134.76.43" password="cssq@2020" port="6379" database="8" timeout="5000"/>
|
<info name="group1_db8" host="8.138.242.190" password="cssq@2020" port="6379" database="8" timeout="5000"/>
|
||||||
<info name="group1_db9" host="8.134.76.43" password="cssq@2020" port="6379" database="9" timeout="5000"/>
|
<info name="group1_db9" host="8.138.242.190" password="cssq@2020" port="6379" database="9" timeout="5000"/>
|
||||||
<info name="group1_db10" host="8.134.76.43" password="cssq@2020" port="6379" database="10" timeout="5000"/>
|
<info name="group1_db10" host="8.138.242.190" password="cssq@2020" port="6379" database="10" timeout="5000"/>
|
||||||
<info name="group1_db11" host="8.134.76.43" password="cssq@2020" port="6379" database="11" timeout="5000"/>
|
<info name="group1_db11" host="8.138.242.190" password="cssq@2020" port="6379" database="11" timeout="5000"/>
|
||||||
<info name="tmp_group1_db9" host="8.134.76.43" password="654sads" port="6479" database="9" timeout="5000"/>
|
<info name="tmp_group1_db9" host="8.138.242.190" password="654sads" port="6479" database="9" timeout="5000"/>
|
||||||
</infos>
|
</infos>
|
||||||
<!--<infos>
|
<!--<infos>
|
||||||
<info name="group1_db0" host="127.0.0.1" port="6379" database="0" timeout="5000"/>
|
<info name="group1_db0" host="127.0.0.1" port="6379" database="0" timeout="5000"/>
|
||||||
|
|
|
||||||
|
|
@ -5,15 +5,19 @@ import com.robot.GameInterceptor;
|
||||||
import com.robot.MainServer;
|
import com.robot.MainServer;
|
||||||
import com.taurus.core.entity.ITObject;
|
import com.taurus.core.entity.ITObject;
|
||||||
import com.taurus.core.entity.TObject;
|
import com.taurus.core.entity.TObject;
|
||||||
|
import com.taurus.core.plugin.redis.Redis;
|
||||||
import com.taurus.core.routes.ActionKey;
|
import com.taurus.core.routes.ActionKey;
|
||||||
import com.taurus.permanent.data.Session;
|
import com.taurus.permanent.data.Session;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
import robot.mj.info.RobotRoomInfo;
|
import redis.clients.jedis.Jedis;
|
||||||
|
import robot.mj.info.RobotUser;
|
||||||
import taurus.client.TaurusClient;
|
import taurus.client.TaurusClient;
|
||||||
import taurus.client.business.GroupRoomBusiness;
|
import taurus.client.business.GroupRoomBusiness;
|
||||||
|
import taurus.util.ROBOTEventType;
|
||||||
|
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Set;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
@ -22,10 +26,10 @@ import java.util.concurrent.ConcurrentHashMap;
|
||||||
public class EXGameController extends GameController {
|
public class EXGameController extends GameController {
|
||||||
private static final Logger log = LoggerFactory.getLogger(EXGameController.class);
|
private static final Logger log = LoggerFactory.getLogger(EXGameController.class);
|
||||||
|
|
||||||
private static RobotConnectionManager connectionManager = new RobotConnectionManager();
|
private static RobotConnectionManager robotConnectionManager = new RobotConnectionManager();
|
||||||
|
|
||||||
//机器人房间
|
//机器人房间
|
||||||
private static final Map<String, RobotRoomInfo> robotRoomMapping = new ConcurrentHashMap<>();
|
protected static final Map<String, RobotUser> robotRoomMapping = new ConcurrentHashMap<>();
|
||||||
|
|
||||||
public EXGameController() {
|
public EXGameController() {
|
||||||
super();
|
super();
|
||||||
|
|
@ -117,7 +121,6 @@ public class EXGameController extends GameController {
|
||||||
System.out.println("接收来自robot_mgr的加入房间协议 connecId: = "+connecId);
|
System.out.println("接收来自robot_mgr的加入房间协议 connecId: = "+connecId);
|
||||||
System.out.println("接收来自robot_mgr的加入房间协议 client: = "+client);
|
System.out.println("接收来自robot_mgr的加入房间协议 client: = "+client);
|
||||||
if (client == null) {
|
if (client == null) {
|
||||||
// 返回失败响应而不是直接返回
|
|
||||||
ITObject errorResponse = TObject.newInstance();
|
ITObject errorResponse = TObject.newInstance();
|
||||||
errorResponse.putString("status", "failed");
|
errorResponse.putString("status", "failed");
|
||||||
errorResponse.putString("message", "无法获取游戏服务器连接");
|
errorResponse.putString("message", "无法获取游戏服务器连接");
|
||||||
|
|
@ -133,7 +136,7 @@ public class EXGameController extends GameController {
|
||||||
if (sessionParts.length >= 2) {
|
if (sessionParts.length >= 2) {
|
||||||
robotSession = sessionParts[0];
|
robotSession = sessionParts[0];
|
||||||
String token = sessionParts[1];
|
String token = sessionParts[1];
|
||||||
connectionManager.setSessionAndToken(robotSession, token);
|
robotConnectionManager.setSessionAndToken(robotSession, token);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -148,10 +151,10 @@ public class EXGameController extends GameController {
|
||||||
params.del("groupId");
|
params.del("groupId");
|
||||||
params.del("roomId");
|
params.del("roomId");
|
||||||
params.del("connecId");
|
params.del("connecId");
|
||||||
// 发送加入房间请求到game_mj_cs
|
//发送加入房间请求到game_mj_cs
|
||||||
client.send(Config.JOIN_ROOM_CS, params, response -> {
|
client.send(Config.JOIN_ROOM_CS, params, response -> {
|
||||||
System.out.println("joinRoomController: " + response);
|
System.out.println("joinRoomController: " + response);
|
||||||
RobotRoomInfo roomInfo = new RobotRoomInfo();
|
RobotUser roomInfo = new RobotUser();
|
||||||
roomInfo.setRoomId(roomId);
|
roomInfo.setRoomId(roomId);
|
||||||
roomInfo.setConnecId(connecId);
|
roomInfo.setConnecId(connecId);
|
||||||
roomInfo.setUserId(0);
|
roomInfo.setUserId(0);
|
||||||
|
|
@ -159,7 +162,6 @@ public class EXGameController extends GameController {
|
||||||
robotRoomMapping.put(robotId, roomInfo);
|
robotRoomMapping.put(robotId, roomInfo);
|
||||||
});
|
});
|
||||||
|
|
||||||
// 发送成功响应
|
|
||||||
ITObject paramsReq = TObject.newInstance();
|
ITObject paramsReq = TObject.newInstance();
|
||||||
paramsReq.putString("status", "success");
|
paramsReq.putString("status", "success");
|
||||||
MainServer.instance.sendResponse(gid, 0, paramsReq, session);
|
MainServer.instance.sendResponse(gid, 0, paramsReq, session);
|
||||||
|
|
@ -193,12 +195,11 @@ public class EXGameController extends GameController {
|
||||||
|
|
||||||
params.del("connecId");
|
params.del("connecId");
|
||||||
Thread.sleep(1000);
|
Thread.sleep(1000);
|
||||||
// 发送准备请求到game_mj_cs
|
//发送准备请求到game_mj_cs
|
||||||
client.send(Config.GAME_READY_CS, params, response -> {
|
client.send(Config.GAME_READY_CS, params, response -> {
|
||||||
System.out.println("robotReadyRoom: " + response);
|
System.out.println("robotReadyRoom: " + response);
|
||||||
});
|
});
|
||||||
|
|
||||||
// 发送成功响应
|
|
||||||
ITObject paramsReq = TObject.newInstance();
|
ITObject paramsReq = TObject.newInstance();
|
||||||
paramsReq.putString("status", "success");
|
paramsReq.putString("status", "success");
|
||||||
MainServer.instance.sendResponse(gid, 0, paramsReq, session);
|
MainServer.instance.sendResponse(gid, 0, paramsReq, session);
|
||||||
|
|
@ -212,56 +213,58 @@ public class EXGameController extends GameController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
@ActionKey(value = "225", validate = GameInterceptor.NOT_PLAYER)
|
||||||
* 接收来自robot_mgr的退出房间协议
|
public void webGroup(Session session, ITObject params, int gid) {
|
||||||
* 断开与game_mj_cs的TCP连接
|
int robotId = params.getInt("robotid");
|
||||||
*/
|
String roomId = params.getString("roomid");
|
||||||
@ActionKey(value = Config.EXIT_ROOM, validate = GameInterceptor.NOT_PLAYER)
|
int groupId = params.getInt("groupid");
|
||||||
public void exitRoom(Session session, ITObject params, int gid) {
|
try (Jedis jedis0 = Redis.use("group1_db0").getJedis()){
|
||||||
try {
|
Set<String> robotTokens = jedis0.smembers("{user}:"+robotId+"_token");
|
||||||
String connecId = params.getString("connecId");
|
String robotSession = null;
|
||||||
Integer robotId = params.getInt("robotId"); // 获取机器人ID
|
|
||||||
log.info("处理退出房间请求，connecId: {}, robotId: {}", connecId, robotId);
|
|
||||||
|
|
||||||
// 清理机器人房间映射
|
for (String token : robotTokens) {
|
||||||
if (robotId != null && robotId > 0) {
|
if (jedis0.exists(token)) {
|
||||||
RobotRoomInfo removedInfo = robotRoomMapping.remove(robotId);
|
robotSession = token;
|
||||||
if (removedInfo != null) {
|
break;
|
||||||
log.info("清理机器人房间映射: robotId={}, 映射信息={}", robotId, removedInfo);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
TaurusClient client = getCsMjGameServerConnection(connecId);
|
System.out.println("进房间: "+robotId);
|
||||||
if (client == null) {
|
System.out.println("进房间: "+roomId);
|
||||||
log.error("无法获取到游戏服务器连接，connecId: {}", connecId);
|
System.out.println("进房间: "+"room:"+ roomId);
|
||||||
return;
|
System.out.println("进房间: "+"{user}:"+robotId);
|
||||||
}
|
|
||||||
|
|
||||||
//发送退出房间请求
|
TaurusClient client = getCsMjGameServerConnection(roomId+"_"+robotId);
|
||||||
client.send(Config.EXIT_ROOM_CS, params, response -> {
|
GroupRoomBusiness.joinRoom(groupId, "room:"+ roomId, "{user}:"+robotId, null);
|
||||||
log.info("退出房间请求发送结果: returnCode={} for connecId={}", response.returnCode, connecId);
|
|
||||||
|
//机器人房间映射关系
|
||||||
|
RobotUser robotUser = getRobotRoomInfo(String.valueOf(robotId));
|
||||||
|
|
||||||
|
Thread.sleep(5000);
|
||||||
|
params.putString("session","{user}:"+robotId+ "," + robotSession);
|
||||||
|
//发送加入房间请求到game_mj_cs
|
||||||
|
client.send(Config.JOIN_ROOM_CS, params, response -> {
|
||||||
|
System.out.println("joinRoomController: " + response);
|
||||||
|
robotConnectionManager.reconnectToGameServer(response, robotUser, client);
|
||||||
});
|
});
|
||||||
|
|
||||||
//断开与游戏服务器的连接
|
Thread.sleep(1000);
|
||||||
//connectionManager.disconnectFromGameServer(connecId);
|
if(client.isConnected()){
|
||||||
} catch (Exception e) {
|
client.send(Config.GAME_READY_CS, params, response -> {
|
||||||
log.error("处理退出房间请求时发生错误", e);
|
System.out.println("1003:"+response);
|
||||||
String connecId = params.getString("connecId");
|
});
|
||||||
Integer robotId = params.getInt("robotId");
|
robotUser.setStatus(ROBOTEventType.ROBOT_INTOROOM_READY);
|
||||||
|
|
||||||
//出错时也要清理映射
|
|
||||||
if (robotId != null && robotId > 0) {
|
|
||||||
robotRoomMapping.remove(robotId);
|
|
||||||
}
|
}
|
||||||
|
robotUser.setIntoRoomTime(robotConnectionManager.getTime());
|
||||||
//connectionManager.disconnectFromGameServer(connecId);
|
} catch (Exception e) {
|
||||||
|
throw new RuntimeException(e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 根据机器人ID获取其所在的房间信息
|
* 根据机器人ID获取其所在的房间信息
|
||||||
*/
|
*/
|
||||||
public static RobotRoomInfo getRobotRoomInfo(String robotId) {
|
public static RobotUser getRobotRoomInfo(String robotId) {
|
||||||
return robotRoomMapping.get(robotId);
|
return robotRoomMapping.get(robotId);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -277,15 +280,13 @@ public class EXGameController extends GameController {
|
||||||
* 基于robotId和connectionId的组合复用连接
|
* 基于robotId和connectionId的组合复用连接
|
||||||
*/
|
*/
|
||||||
public static TaurusClient getCsMjGameServerConnection(String connecId) {
|
public static TaurusClient getCsMjGameServerConnection(String connecId) {
|
||||||
TaurusClient taurusClient = connectionManager.getGameClient(connecId);
|
TaurusClient taurusClient = robotConnectionManager.getGameClient(connecId);
|
||||||
System.out.println("根据机器人ID和连接ID获取长沙麻将游戏服务器连接 client: = "+taurusClient);
|
System.out.println("根据机器人ID和连接ID获取长沙麻将游戏服务器连接 client: = "+taurusClient);
|
||||||
if (taurusClient != null) {
|
if (taurusClient != null) {
|
||||||
log.debug("成功获取游戏服务器连接，connecId: {}", connecId);
|
log.debug("成功获取游戏服务器连接，connecId: {}", connecId);
|
||||||
// 快速检测连接状态
|
|
||||||
connectionManager.quickCheckAndReconnect(connecId);
|
|
||||||
return taurusClient;
|
return taurusClient;
|
||||||
}
|
}
|
||||||
taurusClient = connectionManager.connectToGameServer(connecId);
|
taurusClient = robotConnectionManager.connectToGameServer(connecId);
|
||||||
return taurusClient;
|
return taurusClient;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -6,12 +6,21 @@ import com.robot.GameController;
|
||||||
import com.robot.MainServer;
|
import com.robot.MainServer;
|
||||||
import com.robot.data.Player;
|
import com.robot.data.Player;
|
||||||
import com.robot.data.Room;
|
import com.robot.data.Room;
|
||||||
|
import com.taurus.core.entity.ITObject;
|
||||||
|
import com.taurus.core.entity.TObject;
|
||||||
|
import com.taurus.core.plugin.redis.Redis;
|
||||||
|
import com.taurus.permanent.TPServer;
|
||||||
import org.slf4j.Logger;
|
import org.slf4j.Logger;
|
||||||
import org.slf4j.LoggerFactory;
|
import org.slf4j.LoggerFactory;
|
||||||
|
import redis.clients.jedis.Jedis;
|
||||||
|
import robot.mj.info.RobotUser;
|
||||||
import taurus.client.NetManager;
|
import taurus.client.NetManager;
|
||||||
|
import taurus.client.TaurusClient;
|
||||||
|
|
||||||
import java.util.concurrent.TimeUnit;
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
import static robot.mj.EXGameController.robotRoomMapping;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 长沙麻将机器人主服务器
|
* 长沙麻将机器人主服务器
|
||||||
* TCP服务端接收robot_mgr的协议 同时作为客户端连接game_mj_cs处理AI逻辑
|
* TCP服务端接收robot_mgr的协议 同时作为客户端连接game_mj_cs处理AI逻辑
|
||||||
|
|
@ -19,6 +28,10 @@ import java.util.concurrent.TimeUnit;
|
||||||
public class EXMainServer extends MainServer{
|
public class EXMainServer extends MainServer{
|
||||||
private static final Logger log = LoggerFactory.getLogger(EXMainServer.class);
|
private static final Logger log = LoggerFactory.getLogger(EXMainServer.class);
|
||||||
|
|
||||||
|
private static final RobotConnectionManager robotConnectionManager = new RobotConnectionManager();
|
||||||
|
private static final EXGameController exGameController = new EXGameController();
|
||||||
|
private volatile boolean connectionCheckRunning = true;
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
super.onStart();
|
super.onStart();
|
||||||
|
|
@ -26,11 +39,100 @@ public class EXMainServer extends MainServer{
|
||||||
// 1. 先启动独立的事件处理线程（只启动一次）
|
// 1. 先启动独立的事件处理线程（只启动一次）
|
||||||
startNetEventThread();
|
startNetEventThread();
|
||||||
|
|
||||||
|
// 2. 启动连接检查定时任务
|
||||||
|
startConnectionCheckScheduler();
|
||||||
|
|
||||||
|
//测试
|
||||||
|
Jedis jedis2 = Redis.use("group1_db2").getJedis();
|
||||||
|
String robotskey = "g{"+330800+"}:play:"+10;
|
||||||
|
Map<String, String> maprobot = jedis2.hgetAll(robotskey);
|
||||||
|
for(Map.Entry<String, String> entry : maprobot.entrySet()) {
|
||||||
|
System.out.println(entry.getKey() + ":" + entry.getValue());
|
||||||
|
//是否创建
|
||||||
|
RobotUser robotUser = new RobotUser();
|
||||||
|
robotUser.setRobotId(entry.getKey());
|
||||||
|
robotUser.setPassword("123456");
|
||||||
|
robotUser.setGameHost("8.138.242.190");
|
||||||
|
robotUser.setGamePort("6311");
|
||||||
|
robotUser.setRobotGroupid("330800");
|
||||||
|
robotUser.setRobotPid("10");
|
||||||
|
|
||||||
|
robotRoomMapping.put(entry.getKey(), robotUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
TPServer.me().getTimerPool().scheduleAtFixedRate(new Runnable() {
|
||||||
|
@Override
|
||||||
|
public void run() {
|
||||||
|
|
||||||
|
for(Map.Entry<String, RobotUser> entry : robotRoomMapping.entrySet()) {
|
||||||
|
RobotUser robotUser = entry.getValue();
|
||||||
|
//1、登录
|
||||||
|
//判断是否登录
|
||||||
|
if(!robotUser.isLogin){
|
||||||
|
robotConnectionManager.login(robotUser);
|
||||||
|
}
|
||||||
|
//2、链接
|
||||||
|
//判断是否链接
|
||||||
|
System.out.println("robotUser.isconnect"+robotUser.getIsconnect());
|
||||||
|
if(!robotUser.getIsconnect()){
|
||||||
|
robotConnectionManager.connectGame(robotUser);
|
||||||
|
}else{
|
||||||
|
robotConnectionManager.renconnect(robotUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
//4、加入房间
|
||||||
|
if(robotUser.getStatus()==0){
|
||||||
|
//没状态时候进入加入房间
|
||||||
|
ITObject params = new TObject();
|
||||||
|
params.putString("connecId", robotUser.getRoomId()+"_"+robotUser.getRobotId());
|
||||||
|
params.putString("roomId", robotUser.getRoomId());
|
||||||
|
params.putString("groupId", robotUser.getRobotGroupid());
|
||||||
|
params.putString("session", "{user}:"+robotUser.getRobotId());
|
||||||
|
exGameController.joinRoom(null, params, robotUser.getClient().getId());
|
||||||
|
}
|
||||||
|
System.out.println("robotUser.getIntoRoomTime()"+robotUser.getIntoRoomTime());
|
||||||
|
System.out.println("robGetTiem"+robotConnectionManager.getTime());
|
||||||
|
if(robotUser.getIntoRoomTime()+6<=robotConnectionManager.getTime()){
|
||||||
|
//5、退出房间
|
||||||
|
robotConnectionManager.outoRoom(robotUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, 0, 5 ,TimeUnit.SECONDS);
|
||||||
|
|
||||||
//5、干活
|
//5、干活
|
||||||
log.info("长沙麻将机器人服务器已启动");
|
log.info("长沙麻将机器人服务器已启动");
|
||||||
log.info("服务器将监听端口 {} 用于接收robot_mgr管理协议", gameSetting.port);
|
log.info("服务器将监听端口 {} 用于接收robot_mgr管理协议", gameSetting.port);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 启动连接检查定时任务
|
||||||
|
*/
|
||||||
|
private void startConnectionCheckScheduler() {
|
||||||
|
Thread connectionCheckThread = new Thread(() -> {
|
||||||
|
while (connectionCheckRunning) {
|
||||||
|
try {
|
||||||
|
for(Map.Entry<String, RobotUser> entry : robotRoomMapping.entrySet()) {
|
||||||
|
RobotUser robotUser = entry.getValue();
|
||||||
|
robotConnectionManager.checkIsConnect(robotUser);
|
||||||
|
}
|
||||||
|
|
||||||
|
Thread.sleep(2000);
|
||||||
|
} catch (InterruptedException e) {
|
||||||
|
break;
|
||||||
|
} catch (Exception e) {
|
||||||
|
log.error("连接检查线程异常", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}, "Connection-Check-Thread");
|
||||||
|
|
||||||
|
connectionCheckThread.setDaemon(true);
|
||||||
|
connectionCheckThread.start();
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 独立的事件处理线程
|
* 独立的事件处理线程
|
||||||
*/
|
*/
|
||||||
|
|
@ -72,6 +174,8 @@ public class EXMainServer extends MainServer{
|
||||||
public void onStop() {
|
public void onStop() {
|
||||||
super.onStop();
|
super.onStop();
|
||||||
|
|
||||||
|
// 停止连接检查线程
|
||||||
|
connectionCheckRunning = false;
|
||||||
log.info("长沙麻将机器人服务器已停止");
|
log.info("长沙麻将机器人服务器已停止");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,380 @@
|
||||||
|
package robot.mj.business;
|
||||||
|
|
||||||
|
import com.data.bean.AccountBean;
|
||||||
|
import com.data.bean.GameBean;
|
||||||
|
import com.data.cache.AccountCache;
|
||||||
|
import com.data.cache.BaseCache;
|
||||||
|
import com.data.cache.GameCache;
|
||||||
|
import com.data.util.ErrorCode;
|
||||||
|
import com.data.util.Utility;
|
||||||
|
import com.taurus.core.entity.ITArray;
|
||||||
|
import com.taurus.core.entity.ITObject;
|
||||||
|
import com.taurus.core.entity.TArray;
|
||||||
|
import com.taurus.core.entity.TObject;
|
||||||
|
import com.taurus.core.plugin.database.DataBase;
|
||||||
|
import com.taurus.core.plugin.redis.Redis;
|
||||||
|
import com.taurus.core.plugin.redis.RedisLock;
|
||||||
|
import com.taurus.core.util.Logger;
|
||||||
|
import com.taurus.core.util.StringUtil;
|
||||||
|
import com.taurus.core.util.Utils;
|
||||||
|
import com.taurus.web.Controller;
|
||||||
|
import com.taurus.web.WebException;
|
||||||
|
import redis.clients.jedis.Jedis;
|
||||||
|
|
||||||
|
import java.io.BufferedReader;
|
||||||
|
import java.io.InputStream;
|
||||||
|
import java.io.InputStreamReader;
|
||||||
|
import java.net.HttpURLConnection;
|
||||||
|
import java.net.URL;
|
||||||
|
import java.security.MessageDigest;
|
||||||
|
import java.security.NoSuchAlgorithmException;
|
||||||
|
import java.util.HashMap;
|
||||||
|
import java.util.Map;
|
||||||
|
import java.util.Map.Entry;
|
||||||
|
import java.util.Set;
|
||||||
|
|
||||||
|
public class AccountBusiness extends Controller {
|
||||||
|
private static Logger logger = Logger.getLogger(AccountBusiness.class);
|
||||||
|
|
||||||
|
public static String request(String httpUrl, String httpArg) {
|
||||||
|
BufferedReader reader = null;
|
||||||
|
String result = null;
|
||||||
|
StringBuffer sbf = new StringBuffer();
|
||||||
|
httpUrl = httpUrl + "?" + httpArg;
|
||||||
|
|
||||||
|
try {
|
||||||
|
URL url = new URL(httpUrl);
|
||||||
|
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
|
||||||
|
connection.setRequestMethod("GET");
|
||||||
|
connection.connect();
|
||||||
|
InputStream is = connection.getInputStream();
|
||||||
|
reader = new BufferedReader(new InputStreamReader(is, "UTF-8"));
|
||||||
|
String strRead = reader.readLine();
|
||||||
|
if (strRead != null) {
|
||||||
|
sbf.append(strRead);
|
||||||
|
while ((strRead = reader.readLine()) != null) {
|
||||||
|
sbf.append("\n");
|
||||||
|
sbf.append(strRead);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
reader.close();
|
||||||
|
result = sbf.toString();
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String md5(String plainText) {
|
||||||
|
StringBuffer buf = null;
|
||||||
|
try {
|
||||||
|
MessageDigest md = MessageDigest.getInstance("MD5");
|
||||||
|
md.update(plainText.getBytes());
|
||||||
|
byte b[] = md.digest();
|
||||||
|
int i;
|
||||||
|
buf = new StringBuffer("");
|
||||||
|
for (int offset = 0; offset < b.length; offset++) {
|
||||||
|
i = b[offset];
|
||||||
|
if (i < 0)
|
||||||
|
i += 256;
|
||||||
|
if (i < 16)
|
||||||
|
buf.append("0");
|
||||||
|
buf.append(Integer.toHexString(i));
|
||||||
|
}
|
||||||
|
} catch (NoSuchAlgorithmException e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
}
|
||||||
|
return buf.toString();
|
||||||
|
}
|
||||||
|
|
||||||
|
public static String encodeUrlString(String str, String charset) {
|
||||||
|
String strret = null;
|
||||||
|
if (str == null)
|
||||||
|
return str;
|
||||||
|
try {
|
||||||
|
strret = java.net.URLEncoder.encode(str, charset);
|
||||||
|
} catch (Exception e) {
|
||||||
|
e.printStackTrace();
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
return strret;
|
||||||
|
}
|
||||||
|
|
||||||
|
private final ITObject fillLoginData(String session, int accountid) {
|
||||||
|
ITObject resData = TObject.newInstance();
|
||||||
|
ITObject userData = TObject.newInstance();
|
||||||
|
resData.putTObject("account", userData);
|
||||||
|
resData.putUtfString("session_id", session);
|
||||||
|
resData.putTArray("games", getOnlineGames());
|
||||||
|
Jedis jedis0 = Redis.use("group1_db0").getJedis();
|
||||||
|
try {
|
||||||
|
Map<String, String> map = jedis0.hgetAll(session);
|
||||||
|
userData.putInt("id", accountid);
|
||||||
|
userData.putInt("diamo", Integer.parseInt(map.get("diamo")));
|
||||||
|
userData.putUtfString("nick", map.get("nick"));
|
||||||
|
userData.putUtfString("portrait", map.get("portrait"));
|
||||||
|
userData.putInt("sex", Integer.parseInt(map.get("sex")));
|
||||||
|
userData.putInt("type", Integer.parseInt(map.get("type")));
|
||||||
|
int mng = Integer.parseInt(map.get("mng"));
|
||||||
|
userData.putInt("mng", mng);
|
||||||
|
|
||||||
|
String phone = map.get("phone");
|
||||||
|
if (StringUtil.isNotEmpty(phone)) {
|
||||||
|
userData.putUtfString("phone", phone);
|
||||||
|
}
|
||||||
|
|
||||||
|
String address = map.get("address");
|
||||||
|
if (StringUtil.isNotEmpty(address)) {
|
||||||
|
userData.putUtfString("address", address);
|
||||||
|
}
|
||||||
|
|
||||||
|
String real_info = map.get("real_info");
|
||||||
|
if (StringUtil.isNotEmpty(real_info)) {
|
||||||
|
userData.putTObject("real_info", TObject.newFromJsonData(real_info));
|
||||||
|
}
|
||||||
|
String oldRoom = Utility.getOldRoomV2(jedis0, 0, session, accountid);
|
||||||
|
if (StringUtil.isNotEmpty(oldRoom)) {
|
||||||
|
String roomid = oldRoom.replace("room:", "");
|
||||||
|
String group = jedis0.hget(oldRoom, "group");
|
||||||
|
int groupId = 0;
|
||||||
|
if (StringUtil.isNotEmpty(group)) {
|
||||||
|
groupId = Integer.parseInt(group);
|
||||||
|
}
|
||||||
|
userData.putUtfString("roomid", roomid);
|
||||||
|
userData.putInt("groupId", groupId);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
jedis0.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
resData.putUtfString("groupWeb", Redis.use("group1_db1").hget("web_requrl", "groupWeb_jefe"));
|
||||||
|
return resData;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public final ITObject fastLogin(int userid) throws Exception {
|
||||||
|
Jedis jedis = Redis.use("group1_db0").getJedis();
|
||||||
|
ITObject resData = null;
|
||||||
|
try {
|
||||||
|
Set<String> usertoken = jedis.smembers("{user}:"+userid+"_token");
|
||||||
|
if (usertoken.size()<=0){
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
String token = "";
|
||||||
|
for (String item : usertoken) {
|
||||||
|
token = item;
|
||||||
|
}
|
||||||
|
String session ="{user}:"+userid;
|
||||||
|
|
||||||
|
|
||||||
|
AccountBean acc_bean = AccountCache.getAccount(session);
|
||||||
|
resData = fillLoginData(session, acc_bean.id);
|
||||||
|
String idPwdBan = Redis.use("group1_db0").get(acc_bean.id+"_login_ban");
|
||||||
|
if (StringUtil.isNotEmpty(idPwdBan))
|
||||||
|
{
|
||||||
|
logger.error("id:"+acc_bean.id+" ban login");
|
||||||
|
throw new WebException(ErrorCode.BAN_LOGIN);
|
||||||
|
}
|
||||||
|
resData.putString("token", token);
|
||||||
|
return resData;
|
||||||
|
}catch (Exception e){
|
||||||
|
|
||||||
|
}finally {
|
||||||
|
jedis.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
return resData;
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
public final ITObject idPasswordLogin(int id, String password) throws Exception {
|
||||||
|
|
||||||
|
logger.info("id:" + id + " login");
|
||||||
|
|
||||||
|
Jedis jedis0 = Redis.use("group1_db0").getJedis();
|
||||||
|
RedisLock lock = new RedisLock("wx_" + id, jedis0);
|
||||||
|
try {
|
||||||
|
|
||||||
|
logger.info("==========> password111 = " + password);
|
||||||
|
String superPwd = Redis.use("group1_db1").get("superpwd2021");
|
||||||
|
String sql = "";
|
||||||
|
if (!StringUtil.isEmpty(superPwd)) {
|
||||||
|
if (!password.equals(superPwd)) {
|
||||||
|
password = Utils.getMD5Hash(password);
|
||||||
|
sql = String.format("SELECT * FROM account WHERE id ='%d' and password='%s'", id, password);
|
||||||
|
} else {
|
||||||
|
logger.info("==========> password = " + password);
|
||||||
|
|
||||||
|
sql = String.format("SELECT * FROM account WHERE id ='%d' ", id);
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
password = Utils.getMD5Hash(password);
|
||||||
|
sql = String.format("SELECT * FROM account WHERE id ='%d' and password='%s'", id, password);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
String idPwdBan = Redis.use("group1_db0").get(id + "_login_ban");
|
||||||
|
if (StringUtil.isNotEmpty(idPwdBan)) {
|
||||||
|
System.out.println("进入了77777777777777777777");
|
||||||
|
logger.error("id:" + id + " ban login");
|
||||||
|
throw new WebException(ErrorCode.BAN_LOGIN);
|
||||||
|
}
|
||||||
|
System.out.println("进入了9999999999999");
|
||||||
|
|
||||||
|
ITArray resultArray = DataBase.use().executeQueryByTArray(sql);
|
||||||
|
if (resultArray.size() == 0) {
|
||||||
|
if (Redis.use("group1_db0").exists(id + "_pwd_token")) {
|
||||||
|
Redis.use("group1_db0").incrBy(id + "_pwd_token", 1);
|
||||||
|
} else {
|
||||||
|
Redis.use("group1_db0").set(id + "_pwd_token", 1 + "");
|
||||||
|
Redis.use("group1_db0").expire(id + "_pwd_token", 300);
|
||||||
|
}
|
||||||
|
|
||||||
|
String idPwdToken = Redis.use("group1_db0").get(id + "_pwd_token");
|
||||||
|
if (StringUtil.isNotEmpty(idPwdToken)) {
|
||||||
|
long count = Long.parseLong(idPwdToken);
|
||||||
|
if (count >= 10) {
|
||||||
|
Redis.use("group1_db0").set(id + "_login_ban", "1");
|
||||||
|
Redis.use("group1_db0").expire(id + "_login_ban", 1800);
|
||||||
|
logger.error("pwd error count:" + count + " not login");
|
||||||
|
System.out.println("进入了00000000000");
|
||||||
|
|
||||||
|
throw new WebException(ErrorCode._NO_SESSION);
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
System.out.println("进入了111111111111");
|
||||||
|
|
||||||
|
throw new WebException(ErrorCode._FAILED);
|
||||||
|
}
|
||||||
|
|
||||||
|
ITObject userData = resultArray.getTObject(0);
|
||||||
|
int accountid = userData.getInt("id");
|
||||||
|
UpdateUserData(userData, accountid);
|
||||||
|
|
||||||
|
AccountBean acc_bean = AccountCache.getAccount(accountid);
|
||||||
|
String session = acc_bean.redis_key;
|
||||||
|
this.setSession(session);
|
||||||
|
|
||||||
|
if (resultArray.size() > 0) {
|
||||||
|
this.setSession(session);
|
||||||
|
String old_nick = acc_bean.nick;
|
||||||
|
String old_portrait = acc_bean.portrait;
|
||||||
|
// String new_nick = reqData.getUtfString("nick");
|
||||||
|
// String new_portrait = reqData.getUtfString("portrait");
|
||||||
|
// if (!old_nick.equals(new_nick) || !old_portrait.equals(new_portrait)) {
|
||||||
|
// ITObject userData1 = TObject.newInstance();
|
||||||
|
// userData1.putUtfString("nick", userData.getUtfString("nick"));
|
||||||
|
// userData1.putUtfString("portrait", userData.getUtfString("portrait"));
|
||||||
|
// userData1.putInt("sex", userData.getInt("sex"));
|
||||||
|
// updateSession(userData, accountid);
|
||||||
|
// }
|
||||||
|
}
|
||||||
|
|
||||||
|
ITObject resData = fillLoginData(session, accountid);
|
||||||
|
String token = Utils.getMD5Hash(id + "_" + password + "_" + System.currentTimeMillis() + "e4!Fesu]]{QyUuEA"
|
||||||
|
+ Math.random() * 1000000);
|
||||||
|
Redis.use("group1_db0").sadd(session + "_token", token);
|
||||||
|
|
||||||
|
Redis.use("group1_db0").hset(token, "user", session);
|
||||||
|
Redis.use("group1_db0").hset(token, "create_time", "" + System.currentTimeMillis() / 1000);
|
||||||
|
Redis.use("group1_db0").expire(token, 172800);
|
||||||
|
|
||||||
|
// Set<String> allToken = Redis.use("group1_db0").smembers(session + "_token");
|
||||||
|
// for (String temp : allToken) {
|
||||||
|
// if (!Redis.use("group1_db0").exists(temp)) {
|
||||||
|
// Redis.use("group1_db0").srem(session + "_token", temp);
|
||||||
|
// logger.info("delte timeout token:" + temp);
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
System.out.println("进入了2222222222222");
|
||||||
|
|
||||||
|
long tokenNum = Redis.use("group1_db0").scard(session + "_token");
|
||||||
|
if (tokenNum >= 10) {
|
||||||
|
logger.warn("id:" + accountid + " repeat login, token count:" + tokenNum);
|
||||||
|
}
|
||||||
|
System.out.println("进入了33333333333333333332");
|
||||||
|
|
||||||
|
resData.putString("token", token);
|
||||||
|
return resData;
|
||||||
|
} finally {
|
||||||
|
lock.unlock();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private static String updateSession(ITObject userData, int id) {
|
||||||
|
String session = AccountCache.genKey(id);
|
||||||
|
Map<String, String> map = new HashMap<String, String>();
|
||||||
|
Utils.objectToMap(userData, map);
|
||||||
|
|
||||||
|
Jedis jedis0 = Redis.use("group1_db0").getJedis();
|
||||||
|
try {
|
||||||
|
jedis0.hmset(session, map);
|
||||||
|
BaseCache.updateCacheVer(jedis0, session);
|
||||||
|
} finally {
|
||||||
|
jedis0.close();
|
||||||
|
}
|
||||||
|
|
||||||
|
return session;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 获取在线游戏
|
||||||
|
*/
|
||||||
|
public static ITArray getOnlineGames() {
|
||||||
|
ITArray games = new TArray();
|
||||||
|
Jedis jedis1 = Redis.use("group1_db1").getJedis();
|
||||||
|
try {
|
||||||
|
Set<String> list = jedis1.zrevrangeByScore("online_games", 1000, 1);
|
||||||
|
for (String game : list) {
|
||||||
|
int gameId = Integer.parseInt(game);
|
||||||
|
GameBean gb = GameCache.getGame(gameId);
|
||||||
|
if (gb == null)
|
||||||
|
continue;
|
||||||
|
ITObject gameObj = gb.getTObject();
|
||||||
|
|
||||||
|
for (Entry<String, Integer> entry : gb.pay.entrySet()) {
|
||||||
|
gameObj.putInt(entry.getKey(), entry.getValue());
|
||||||
|
}
|
||||||
|
games.addTObject(gameObj);
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
jedis1.close();
|
||||||
|
}
|
||||||
|
return games;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @return
|
||||||
|
* @throws Exception
|
||||||
|
*/
|
||||||
|
private final int UpdateUserData(ITObject reqData, long id) throws Exception {
|
||||||
|
ITObject userData = TObject.newInstance();
|
||||||
|
userData.putInt("id", (int) id);
|
||||||
|
|
||||||
|
userData.putUtfString("acc", reqData.getUtfString("acc"));
|
||||||
|
userData.putUtfString("portrait", reqData.getUtfString("portrait"));
|
||||||
|
userData.putUtfString("nick", reqData.getUtfString("nick"));
|
||||||
|
int sex = reqData.getInt("sex");
|
||||||
|
if (sex == 0) {
|
||||||
|
sex = 1;
|
||||||
|
reqData.putInt("sex", sex);
|
||||||
|
}
|
||||||
|
userData.putInt("sex", sex);
|
||||||
|
|
||||||
|
userData.putInt("mng", 0);
|
||||||
|
userData.putInt("type", 0);
|
||||||
|
if (reqData.containsKey("diamo")) {
|
||||||
|
userData.putInt("diamo", reqData.getInt("diamo"));
|
||||||
|
}
|
||||||
|
|
||||||
|
userData.putInt("invitation", 1);
|
||||||
|
String session = updateSession(userData, (int) id);
|
||||||
|
this.setSession(session);
|
||||||
|
return (int) id;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -16,6 +16,7 @@ import taurus.util.*;
|
||||||
|
|
||||||
import java.sql.SQLException;
|
import java.sql.SQLException;
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
|
import java.util.stream.Collectors;
|
||||||
|
|
||||||
|
|
||||||
public class HuNanChangSha {
|
public class HuNanChangSha {
|
||||||
|
|
@ -24,6 +25,14 @@ public class HuNanChangSha {
|
||||||
public static boolean isTinChi = false;
|
public static boolean isTinChi = false;
|
||||||
public static boolean isTinPeng = false;
|
public static boolean isTinPeng = false;
|
||||||
|
|
||||||
|
private int robotid=0;
|
||||||
|
public void setRobotid(int robotid) {
|
||||||
|
this.robotid = robotid;
|
||||||
|
}
|
||||||
|
public int getRobotid() {
|
||||||
|
return robotid;
|
||||||
|
}
|
||||||
|
|
||||||
// private static final Logger log = Logger.getLogger(DoTest.class);
|
// private static final Logger log = Logger.getLogger(DoTest.class);
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -35,6 +44,10 @@ public class HuNanChangSha {
|
||||||
|
|
||||||
private List<Integer> changShaCardInhand = new ArrayList<>();
|
private List<Integer> changShaCardInhand = new ArrayList<>();
|
||||||
|
|
||||||
|
public List<Integer> getChangShaCardInhand() {
|
||||||
|
return changShaCardInhand;
|
||||||
|
}
|
||||||
|
|
||||||
private Map<Integer, Integer> chuGuoPainum = new HashMap<>();
|
private Map<Integer, Integer> chuGuoPainum = new HashMap<>();
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -81,9 +94,6 @@ public class HuNanChangSha {
|
||||||
return chowGroup;
|
return chowGroup;
|
||||||
}
|
}
|
||||||
|
|
||||||
public List<Integer> getChangShaCardInhand() {
|
|
||||||
return changShaCardInhand;
|
|
||||||
}
|
|
||||||
|
|
||||||
public List<Integer> getChuGuoCardInhand() {
|
public List<Integer> getChuGuoCardInhand() {
|
||||||
return changShachuguopai;
|
return changShachuguopai;
|
||||||
|
|
@ -121,7 +131,7 @@ public class HuNanChangSha {
|
||||||
* @param message 消息对象
|
* @param message 消息对象
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
public String getCard(String command, Message message, TaurusClient client, Map<String, Object> mapclient) {
|
public String getCard(String command, Message message, TaurusClient client) {
|
||||||
if (command.equalsIgnoreCase("819")) {
|
if (command.equalsIgnoreCase("819")) {
|
||||||
ITObject param = message.param;
|
ITObject param = message.param;
|
||||||
if (param == null) {
|
if (param == null) {
|
||||||
|
|
@ -135,7 +145,8 @@ public class HuNanChangSha {
|
||||||
int drawnCard = param.getInt("card");
|
int drawnCard = param.getInt("card");
|
||||||
changShaSuanFaTest.drawnCards = drawnCard;//存储摸到的牌
|
changShaSuanFaTest.drawnCards = drawnCard;//存储摸到的牌
|
||||||
changShaCardInhand.add(drawnCard);
|
changShaCardInhand.add(drawnCard);
|
||||||
|
System.out.println("param.getInt(player)" + param.getInt("player") );
|
||||||
|
System.out.println("摸到的牌 +++++++++ " + drawnCard);
|
||||||
if (jedis222.hget("{robortInfo}:" + player, "circleId") != null && jedis222.hget("{robortInfo}:" + player, "pid") != null) {
|
if (jedis222.hget("{robortInfo}:" + player, "circleId") != null && jedis222.hget("{robortInfo}:" + player, "pid") != null) {
|
||||||
String circleId = jedis222.hget("{robortInfo}:" + player, "circleId");
|
String circleId = jedis222.hget("{robortInfo}:" + player, "circleId");
|
||||||
String pid = jedis222.hget("{robortInfo}:" + player, "pid");
|
String pid = jedis222.hget("{robortInfo}:" + player, "pid");
|
||||||
|
|
@ -204,6 +215,20 @@ public class HuNanChangSha {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 同步手牌
|
||||||
|
* @param handCard
|
||||||
|
*/
|
||||||
|
public void updateHandCard(List<Integer> handCard) {
|
||||||
|
changShaCardInhand.clear();
|
||||||
|
changShaCardInhand.addAll(handCard);
|
||||||
|
}
|
||||||
|
|
||||||
|
public void updateOutCard(List<Integer> outCard) {
|
||||||
|
changShachuguopai.clear();
|
||||||
|
changShachuguopai.addAll(outCard);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
public static int[][] countTiles(List<Integer> cardInHand) {
|
public static int[][] countTiles(List<Integer> cardInHand) {
|
||||||
int[][] counts = new int[5][10]; // 类型×值
|
int[][] counts = new int[5][10]; // 类型×值
|
||||||
|
|
@ -297,7 +322,7 @@ public class HuNanChangSha {
|
||||||
// log.info("tipList" +tipList);
|
// log.info("tipList" +tipList);
|
||||||
ITObject params = TObject.newInstance();
|
ITObject params = TObject.newInstance();
|
||||||
int card = 0;
|
int card = 0;
|
||||||
|
getChangShaCardInhand();
|
||||||
//循环
|
//循环
|
||||||
List<Integer> yupanhandcard = new ArrayList<>();
|
List<Integer> yupanhandcard = new ArrayList<>();
|
||||||
yupanhandcard.addAll(changShaCardInhand);
|
yupanhandcard.addAll(changShaCardInhand);
|
||||||
|
|
@ -1789,8 +1814,10 @@ public class HuNanChangSha {
|
||||||
|
|
||||||
// 将当前出的牌添加到历史出牌列表
|
// 将当前出的牌添加到历史出牌列表
|
||||||
changShachuguopai.add(cardToOut);
|
changShachuguopai.add(cardToOut);
|
||||||
|
System.out.println("changShachuguopai ++++ :"+changShachuguopai);
|
||||||
// 从手牌中移除
|
// 从手牌中移除
|
||||||
changShaCardInhand.remove(Integer.valueOf(cardToOut));
|
changShaCardInhand.remove(Integer.valueOf(cardToOut));
|
||||||
|
System.out.println("打过后的手牌 +++ " + changShaCardInhand);
|
||||||
params.putString("session", session + "," + token);
|
params.putString("session", session + "," + token);
|
||||||
client.send("611", params, response -> {
|
client.send("611", params, response -> {
|
||||||
|
|
||||||
|
|
@ -1819,37 +1846,37 @@ public class HuNanChangSha {
|
||||||
Integer playerid = param.getInt("playerid");
|
Integer playerid = param.getInt("playerid");
|
||||||
|
|
||||||
|
|
||||||
// 从Redis中获取机器人ID列表 - 使用当前连接的机器人列表
|
String sql2 = String.format("SELECT id FROM `account` WHERE jiqiren=9998");
|
||||||
List<Integer> robotIdsList = new ArrayList<>();
|
try {
|
||||||
|
ITArray robotId2 = DataBase.use().executeQueryByTArray(sql2);
|
||||||
|
List<Integer> robotIdsList = new ArrayList<>();
|
||||||
|
|
||||||
// 从Redis中获取当前活跃的机器人连接信息
|
for (int j = 0; j < robotId2.size(); j++) {
|
||||||
try (Jedis jedis = Redis.use().getJedis()) {
|
robotIdsList.add(robotId2.getTObject(j).getInt("id"));
|
||||||
// 从Redis中获取所有在线的机器人ID
|
}
|
||||||
java.util.Set<String> allKeys = jedis.keys("{user}:*");
|
|
||||||
for (String key : allKeys) {
|
if (!robotIdsList.contains(playerid)) {
|
||||||
if (key.contains("_token")) {
|
if (type == 2 || type == 3 || type == 5 || type == 1) { // 碰，杠
|
||||||
String playerIdStr = key.replace("{user}:", "").replace("_token", "");
|
getChuGuoCardInhand().remove(Integer.valueOf(card));
|
||||||
try {
|
|
||||||
int playerId = Integer.parseInt(playerIdStr);
|
|
||||||
robotIdsList.add(playerId);
|
|
||||||
} catch (NumberFormatException ex) {
|
|
||||||
// 忽略无法解析的ID
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
if (!robotIdsList.contains(playerid)) {
|
} catch (SQLException e) {
|
||||||
if (type == 2 || type == 3 || type == 5 || type == 1) { // 碰，杠
|
e.printStackTrace();
|
||||||
getChuGuoCardInhand().remove(Integer.valueOf(card));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
public static void main(String[] args) {
|
public static void main(String[] args) {
|
||||||
HuNanChangSha huNanChangSha = new HuNanChangSha();
|
|
||||||
|
String str = "[107, 202, 204, 103, 109, 101, 108, 201, 109, 105, 207, 209, 202]";
|
||||||
|
String cleanedStr = str.substring(1, str.length() - 1);
|
||||||
|
List<Integer> list = Arrays.stream(cleanedStr.split(", "))
|
||||||
|
.map(Integer::parseInt)
|
||||||
|
.collect(Collectors.toList());
|
||||||
|
System.out.println(list);
|
||||||
|
/*HuNanChangSha huNanChangSha = new HuNanChangSha();
|
||||||
ITObject params = TObject.newInstance();
|
ITObject params = TObject.newInstance();
|
||||||
TaurusClient tc = new TaurusClient("47.109.55.7", "10", TaurusClient.ConnectionProtocol.Tcp);
|
TaurusClient tc = new TaurusClient("47.109.55.7", "10", TaurusClient.ConnectionProtocol.Tcp);
|
||||||
List<Integer> hands1 = new ArrayList<>();
|
List<Integer> hands1 = new ArrayList<>();
|
||||||
|
|
@ -1925,6 +1952,8 @@ public class HuNanChangSha {
|
||||||
//huNanChangSha.chowGroup.add(205);
|
//huNanChangSha.chowGroup.add(205);
|
||||||
String res = huNanChangSha.actionCard(params, tc);
|
String res = huNanChangSha.actionCard(params, tc);
|
||||||
System.out.println(res);
|
System.out.println(res);
|
||||||
|
|
||||||
|
*/
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,66 +0,0 @@
|
||||||
package robot.mj.info;
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 机器人房间信息类
|
|
||||||
*/
|
|
||||||
public class RobotRoomInfo {
|
|
||||||
private String roomId;
|
|
||||||
private String connecId;
|
|
||||||
private int userId;
|
|
||||||
private String groupId;
|
|
||||||
private String wanfaId;
|
|
||||||
private String robotId;
|
|
||||||
|
|
||||||
public String getRoomId() {
|
|
||||||
return roomId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRoomId(String roomId) {
|
|
||||||
this.roomId = roomId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getConnecId() {
|
|
||||||
return connecId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setConnecId(String connecId) {
|
|
||||||
this.connecId = connecId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getUserId() {
|
|
||||||
return userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setUserId(int userId) {
|
|
||||||
this.userId = userId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getGroupId() {
|
|
||||||
return groupId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setGroupId(String groupId) {
|
|
||||||
this.groupId = groupId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getWanfaId() {
|
|
||||||
return wanfaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setWanfaId(String wanfaId) {
|
|
||||||
this.wanfaId = wanfaId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public String getRobotId() {
|
|
||||||
return robotId;
|
|
||||||
}
|
|
||||||
|
|
||||||
public void setRobotId(String robotId) {
|
|
||||||
this.robotId = robotId;
|
|
||||||
}
|
|
||||||
|
|
||||||
@Override
|
|
||||||
public String toString() {
|
|
||||||
return "RobotRoomInfo{roomId='" + roomId + "', connecId='" + connecId + "'}";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
@ -0,0 +1,195 @@
|
||||||
|
package robot.mj.info;
|
||||||
|
|
||||||
|
import taurus.client.TaurusClient;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 机器人房间信息类
|
||||||
|
*/
|
||||||
|
public class RobotUser {
|
||||||
|
private String roomId;
|
||||||
|
private String connecId;
|
||||||
|
private int userId;
|
||||||
|
private String groupId;
|
||||||
|
private String wanfaId;
|
||||||
|
private String robotId;
|
||||||
|
|
||||||
|
private int seat;
|
||||||
|
public int status; //工作状态 0,1:等待，2:干活
|
||||||
|
public boolean isconnect = false; //是否连接上
|
||||||
|
public int intoRoomTime; //进入房间时间戳
|
||||||
|
public String password;
|
||||||
|
public String gameHost;
|
||||||
|
public String gamePort;
|
||||||
|
public String robotGroupid;
|
||||||
|
public String robotPid;
|
||||||
|
public boolean isLogin = false;
|
||||||
|
private String token;
|
||||||
|
private String loginsession;
|
||||||
|
public int currentRoomId;//当前房间id
|
||||||
|
public TaurusClient client = null;
|
||||||
|
|
||||||
|
public TaurusClient getClient() {
|
||||||
|
return client;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setClient(TaurusClient client) {
|
||||||
|
this.client = client;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getCurrentRoomId() {
|
||||||
|
return currentRoomId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCurrentRoomId(int currentRoomId) {
|
||||||
|
this.currentRoomId = currentRoomId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getLoginsession() {
|
||||||
|
return loginsession;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setLoginsession(String loginsession) {
|
||||||
|
this.loginsession = loginsession;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean getIsLogin() {
|
||||||
|
return isLogin;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIsLogin(boolean login) {
|
||||||
|
isLogin = login;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getToken() {
|
||||||
|
return token;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setToken(String token) {
|
||||||
|
this.token = token;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getGameHost() {
|
||||||
|
return gameHost;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setGameHost(String gameHost) {
|
||||||
|
this.gameHost = gameHost;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getGamePort() {
|
||||||
|
return gamePort;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setGamePort(String gamePort) {
|
||||||
|
this.gamePort = gamePort;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRobotGroupid() {
|
||||||
|
return robotGroupid;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRobotGroupid(String robotGroupid) {
|
||||||
|
this.robotGroupid = robotGroupid;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRobotPid() {
|
||||||
|
return robotPid;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRobotPid(String robotPid) {
|
||||||
|
this.robotPid = robotPid;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getPassword() {
|
||||||
|
return password;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setPassword(String password) {
|
||||||
|
this.password = password;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getIntoRoomTime() {
|
||||||
|
return intoRoomTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIntoRoomTime(int intoRoomTime) {
|
||||||
|
this.intoRoomTime = intoRoomTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public boolean getIsconnect() {
|
||||||
|
return isconnect;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setIsconnect(boolean isconnect) {
|
||||||
|
this.isconnect = isconnect;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getSeat() {
|
||||||
|
return seat;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSeat(int seat) {
|
||||||
|
this.seat = seat;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getStatus() {
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setStatus(int status) {
|
||||||
|
this.status = status;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRoomId() {
|
||||||
|
return roomId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRoomId(String roomId) {
|
||||||
|
this.roomId = roomId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getConnecId() {
|
||||||
|
return connecId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setConnecId(String connecId) {
|
||||||
|
this.connecId = connecId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public int getUserId() {
|
||||||
|
return userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setUserId(int userId) {
|
||||||
|
this.userId = userId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getGroupId() {
|
||||||
|
return groupId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setGroupId(String groupId) {
|
||||||
|
this.groupId = groupId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getWanfaId() {
|
||||||
|
return wanfaId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setWanfaId(String wanfaId) {
|
||||||
|
this.wanfaId = wanfaId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public String getRobotId() {
|
||||||
|
return robotId;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setRobotId(String robotId) {
|
||||||
|
this.robotId = robotId;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return "RobotRoomInfo{roomId='" + roomId + "', connecId='" + connecId + "'}";
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
package taurus.util;
|
||||||
|
|
||||||
|
public class ROBOTEventType {
|
||||||
|
/**
|
||||||
|
* 机器人状态
|
||||||
|
*/
|
||||||
|
public static final int ROBOT_INTOROOM_READY = 1;//等待状态
|
||||||
|
public static final int ROBOT_INTOROOM_WORKING = 2;//工作状态
|
||||||
|
public static final int ROBOT_UNUSE = 0;//未使用状态
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue