Commit Graph

10 Commits (fb5da8c93bbe621acede96df970b2cf17d8a643e)

Author SHA1 Message Date
lvxinran fb5da8c93b Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena
# Conflicts:
#	gamecommon/src/main/java/rpc/protocols/CommonProto.java
#	gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java
#	gamecommon/src/main/java/rpc/world/WorldProto.java
#	worldserver/build.gradle
#	worldserver/src/main/java/com/world/handler/GetWorldArenaChallengeRequestHandler.java
#	worldserver/src/main/java/com/world/handler/GetWorldArenaRecordInfoRequestHandler.java
#	worldserver/src/main/java/com/world/redis/RedisKey.java
2020-12-12 15:06:17 +08:00
lvxinran ac40a91389 跨服十绝阵代码提交 2020-12-12 15:03:54 +08:00
zhangshanxue 95870b74d5 跨服服务器 2020-12-11 13:57:47 +08:00
zhangshanxue 49b043606f 跨服服务器 2020-12-07 15:31:30 +08:00
zhangshanxue 4bce4b8e96 跨服服务器 2020-12-07 14:44:12 +08:00
zhangshanxue bfb89434cd 跨服服务器 2020-12-03 21:02:17 +08:00
zhangshanxue b27f4e489c 初步提交 2020-11-27 15:26:55 +08:00
zhangshanxue b9fd7bfdf7 跨服服务器通信初版完成 2020-11-20 10:23:16 +08:00
zhangshanxue 4d9a185be5 跨服服务器通信初版完成 2020-11-19 20:33:41 +08:00
zhangshanxue 360a8c51e0 跨服服务器 2020-11-19 17:24:22 +08:00