Commit Graph

76 Commits (e28e8947234b3ed0191aa356fb81656777020892)

Author SHA1 Message Date
lvxinran 50824acdd9 抽卡计次修改 2021-01-28 16:41:54 +08:00
lvxinran feb641028c 配置提交 2021-01-21 16:00:44 +08:00
duhui c000672b2f 机器人bug修改 2021-01-14 15:51:34 +08:00
duhui 7c348f0833 Merge branch 'master_test_hw' into master_test_hw_hongmeng
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/core/FunctionIdEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/hero/SaveHeroChangeRequestHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/handler/pokemon/GetAllPokemonHandler.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/item/ItemLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/ItemUtil.java
#	serverlogic/src/main/java/com/ljsd/jieling/util/MessageUtil.java
#	tablemanager/src/main/java/config/SErrorCodeEerverConfig.java
#	tablemanager/src/main/java/config/SItem.java
#	tablemanager/src/main/java/config/SJewelConfig.java
2021-01-07 14:31:08 +08:00
lvxinran 5332a072b9 删除无用配置!!!!!! 2020-12-31 11:35:27 +08:00
lvxinran b37c3146c9 gradle配置提交 2020-01-05 00:09:45 +08:00
zhangshanxue de27c8aea3 跨服提交 2021-02-20 20:13:15 +08:00
zhangshanxue 7f991f8045 Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2021-02-20 20:11:01 +08:00
zhangshanxue 040711b793 跨服服务器 2021-01-18 01:40:05 +08:00
zhangshanxue b7b1154a68 跨服服务器 2021-01-30 00:15:10 +08:00
lvxinran 29b4dc5fdd 十绝阵key修改 2021-01-08 14:19:24 +08:00
lvxinran 9634301446 代码类型修改 2020-12-30 03:14:18 +08:00
zhangshanxue fa6e6bcad5 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/ActivityProto.java
#	gamecommon/src/main/java/rpc/protocols/ArenaInfoProto.java
#	gamecommon/src/main/java/rpc/protocols/ChatProto.java
#	gamecommon/src/main/java/rpc/protocols/CommonProto.java
#	gamecommon/src/main/java/rpc/protocols/Family.java
#	gamecommon/src/main/java/rpc/protocols/HeroInfoProto.java
#	gamecommon/src/main/java/rpc/protocols/MessageTypeProto.java
#	gamecommon/src/main/java/rpc/protocols/PlayerInfoProto.java
#	gamecommon/src/main/java/rpc/world/WorldProto.java
#	worldserver/src/main/java/com/world/redis/RedisUtil.java
2020-12-15 14:01:24 +08:00
lvxinran e086fd1e97 十绝阵删除信息修改 2020-12-25 10:19:50 +08:00
lvxinran 5cd2499af6 跨服十绝阵第二版 2020-12-17 20:07:30 +08:00
zhangshanxue 6ef71dc4b5 跨服服务器 2020-12-15 14:00:20 +08:00
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