Commit Graph

63 Commits (af20b1f45f657db043365c71d175f867ec06434a)

Author SHA1 Message Date
xuexinpeng 7e21e0df43 山河社稷 2021-05-15 15:05:11 +08:00
mengchengzhen c9f3eaaaa6 新礼包首冲bug指定时间5月6日18点 2021-05-06 21:21:05 +08:00
mengchengzhen 8cd82e7325 首冲bug防止问题方法 2021-05-08 21:03:29 +08:00
mengchengzhen 3af3a725c3 新礼包 2021-04-28 00:27:43 +08:00
mengchengzhen 7d91d069aa 新礼包测试 2021-04-22 13:55:20 +08:00
mengchengzhen c48ad44e27 新礼包 2021-04-20 15:03:50 +08:00
duhui ba269c61b8 大闹天宫,灵兽问题处理 2021-03-03 17:16:03 +08:00
lvxinran 2de51c477f 忽略协议文件 2021-01-01 01:34:58 +08:00
zhangshanxue de27c8aea3 跨服提交 2021-02-20 20:13:15 +08:00
lvxinran bcf5191e7f 协议位置修改 2020-12-30 03:11:14 +08:00
zhangshanxue e3b2fedbcd 跨服服务器 2021-02-08 01:25:47 +08:00
zhangshanxue b7b1154a68 跨服服务器 2021-01-30 00:15:10 +08:00
lvxinran e086fd1e97 十绝阵删除信息修改 2020-12-25 10:19:50 +08:00
lvxinran 5cd2499af6 跨服十绝阵第二版 2020-12-17 20:07:30 +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 4bce4b8e96 跨服服务器 2020-12-07 14:44:12 +08:00
zhangshanxue bfb89434cd 跨服服务器 2020-12-03 21:02:17 +08:00
zhangshanxue 6b4d5296db Merge branch 'master_test_hw_server_arena' of http://60.1.1.230/backend/jieling_server into master_test_hw_server_arena 2020-11-27 15:27:06 +08:00
zhangshanxue b27f4e489c 初步提交 2020-11-27 15:26:55 +08:00
lvxinran 416beb8d33 分组提交 2020-12-01 10:55:37 +08:00
zhangshanxue 4d9a185be5 跨服服务器通信初版完成 2020-11-19 20:33:41 +08:00
zhangshanxue 360a8c51e0 跨服服务器 2020-11-19 17:24:22 +08:00
zhangshanxue 210f4a1529 社稷大典代码提交 2020-10-25 17:00:00 +08:00
lvxinran 7c88b404c9 金额校验 2020-09-27 11:58:44 +08:00
zhangshanxue 055516fc95 八日登录验证bug 2020-09-21 13:24:51 +08:00
jiahuiwen d1eccf88b9 代码优化 2020-09-01 17:20:57 +08:00
jiahuiwen f6d885559b Merge branch 'master_test_hw' of http://60.1.1.230/backend/jieling_server into master_test_hw 2020-09-01 10:45:21 +08:00
lvxinran 834f6e303e 八日登录修改,公会副本边界,不发排行奖励修改 2020-09-09 08:13:51 +08:00
jiahuiwen 8e31ca0acf 优化代码 2020-09-01 10:45:16 +08:00
zhangshanxue 7958bb7fa3 猎妖之路节点修改 2020-08-26 17:43:17 +08:00
zhangshanxue 7f55f8cbc4 浮点精度 2020-08-26 15:43:42 +08:00
zhangshanxue 7c5c28d6a1 Merge branch 'master_test_hw' into master_test_combin 2020-08-15 15:40:46 +08:00
zhangshanxue 433ef98265 充值类型更换 2020-08-14 23:08:45 +08:00
zhangshanxue 60abb970a9 Merge branch 'master' into master_test_combin
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-08-13 19:28:39 +08:00
zhangshanxue cbde195205 合服 2020-08-13 19:26:18 +08:00
lvxinran 502aa7ca45 时间工具方法 2020-08-17 05:29:48 +08:00
lvxinran 531770178a 森罗环境游戏代码提交 2020-06-12 17:03:59 +08:00
lvxinran 18b2d6c57a 迷宫寻宝随机方式修改 2020-06-10 02:42:54 +08:00
lvxinran 47ad4f8c1c 回春散逻辑提交 2020-06-05 10:16:09 +08:00
zhangshanxue 5d1ff52c3d 活动提交 2020-04-30 19:57:17 +08:00
zhangshanxue ab36222035 数据库对象添加深度复制 2020-04-23 19:52:54 +08:00
zhangshanxue c4471cb7f9 线程卡死玩家无法进入游戏 2020-05-16 16:08:26 +08:00
lvxinran bf8a3a59d7 戒灵秘宝时间剩余 2020-03-25 05:01:03 +08:00
lvxinran 50110c8723 关卡排行榜修改 2020-03-13 11:11:29 +08:00
zhangshanxue 4e5542393c Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2020-02-09 19:53:28 +08:00
zhangshanxue 4769cadda1 Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-09 19:48:55 +08:00
wangyuan 0999804d3c 工会boss奖励 2020-01-15 10:02:10 +08:00
lvxinran 4148f0d9ee 特权修改时发送挂机奖励 2020-01-14 13:41:22 +08:00