Commit Graph

6230 Commits (1acf75395162ff30004f6bb2651e6d63ea5ce96b)
 

Author SHA1 Message Date
xuexinpeng 1acf753951 跨服灵脉秘境 2021-11-18 18:27:33 +08:00
xuexinpeng e7e12c7228 跨服灵妙秘境 2021-11-17 16:35:43 +08:00
xuexinpeng 676dce9bf8 灵脉秘境 2021-11-12 16:55:14 +08:00
xuexinpeng 34c0d4bd69 Merge branch 'master_test_gn' into master_test_gn_xxp 2021-11-12 13:26:53 +08:00
xuexinpeng 9facaffd99 跨服排行榜切磋战力先后手 2021-11-12 13:24:27 +08:00
xuexinpeng 0b75d24326 灵脉秘境 2021-11-12 11:54:05 +08:00
xuexinpeng b791353eb9 灵脉秘境 2021-11-12 09:39:03 +08:00
jiahuiwen 02a052d5e1 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-11 16:29:11 +08:00
yuanshuai 7dd2521295 修行刷新排行榜战斗力脚本添加 2021-11-26 14:14:49 +08:00
jiahuiwen 44f88a241c 修复StackOverflowError 2021-11-11 16:29:05 +08:00
jiahuiwen 29518695a9 优化离线清理玩家逻辑 2021-11-11 14:34:47 +08:00
jiahuiwen 0b67387c77 完善 2021-11-11 13:51:14 +08:00
jiahuiwen f7e184aeba Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-11 13:38:29 +08:00
jiahuiwen 808ebea12f 服务器数据互通 2021-11-11 13:38:21 +08:00
xuexinpeng 66258da6b5 森罗幻境任务计数恢复之前的计数 2021-11-11 11:16:01 +08:00
yuanshuai 8649778e5c 灵兽宝阁功能修改 2021-11-25 18:26:02 +08:00
jiahuiwen 88142c8fcd Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-10 18:54:02 +08:00
jiahuiwen f7baeed51e rpc获取user 2021-11-10 18:53:42 +08:00
yuanshuai d381581b73 更新排行榜战斗力代码 2021-11-10 15:26:43 +08:00
yuanshuai 0f7b73924d 送走支援神将以后,排行榜外面战力不对 bug修改 2021-11-10 15:15:59 +08:00
jiahuiwen 372c0f9f9f Merge branch 'master_prb_gn' into master_test_gn 2021-11-10 14:57:48 +08:00
jiahuiwen a4c59660d0 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-10 14:57:07 +08:00
jiahuiwen 8b42f44b54 修复启动报错 2021-11-10 14:56:55 +08:00
xuexinpeng bdd561d75f 森罗幻境达人特殊处理 2021-11-10 14:12:25 +08:00
duhui 3009caf6b5 队伍id修改,跨服添加主线和罗浮战力属性 2021-11-10 13:16:28 +08:00
duhui 04c1840d88 玩家数据添加缓存
(cherry picked from commit df45247e5f)
2021-11-10 09:55:43 +08:00
duhui df45247e5f 玩家数据添加缓存 2021-11-10 09:54:22 +08:00
jiahuiwen 398b6b446c Merge branch 'master_test_gn' into master_test_gn_zf 2021-11-09 22:59:51 +08:00
jiahuiwen b3b8da2ba9 先还原离线清除逻辑 2021-11-09 22:59:27 +08:00
jiahuiwen ed5f25240a Merge branch 'master_prb_gn' into master_test_gn_zf
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/arena/CrossYuxulundaoLogic.java
2021-11-09 13:48:22 +08:00
duhui 24de93f03e 注销无用类 2021-11-09 11:46:27 +08:00
duhui 90bf135e95 天眼类型 2021-11-09 11:43:45 +08:00
xuexinpeng 6b645813ed 换一批问题 积分 2021-11-09 10:18:43 +08:00
jiahuiwen ba917c12af 修改注释 2021-11-08 17:57:11 +08:00
jiahuiwen c9eff64beb Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-08 17:51:43 +08:00
jiahuiwen 9366e2acd4 删除英雄技能获取多余方法 2021-11-08 17:51:31 +08:00
DESKTOP-98AVA47\Administrator 4bcc279ea3 报错修改提交 2022-01-08 00:36:49 +08:00
duhui 8afb5b1e80 获取跨服玩家英雄信息修改 2021-11-08 17:48:33 +08:00
duhui 9e82d2541a 跨服,获取英雄信息 2021-11-08 17:23:33 +08:00
DESKTOP-98AVA47\Administrator 00c2cac6ec 罗浮争锋,获取跨服排行榜数据,问题数据跳过 2022-01-08 00:10:11 +08:00
xuexinpeng 1cb588960f Merge branch 'master_prb_gn' into master_test_gn 2021-11-08 16:59:44 +08:00
xuexinpeng c3af7c66f8 yx积分规则修改 2021-11-08 16:55:57 +08:00
xuexinpeng 81630e50dc yx匹配换一批log 2021-11-08 16:37:37 +08:00
xuexinpeng 047acea4e4 Merge branch 'master_prb_gn' into master_test_gn 2021-11-08 15:03:50 +08:00
xuexinpeng 41e12db5a7 森罗环境隐藏关卡问题 山河社稷图奖励领取问题 2021-11-08 15:02:06 +08:00
jiahuiwen 5729561082 清除7天以上玩家排行榜 2021-11-08 12:02:45 +08:00
yuanshuai 91df74da9c 森罗幻境添加神魂等级 2021-11-08 11:37:33 +08:00
xuexinpeng 9580c06b25 罗浮争锋的先后手问题 2021-11-08 11:03:03 +08:00
jiahuiwen 820a0d710c 日志 2021-11-08 10:49:50 +08:00
jiahuiwen 821e459337 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-08 10:47:06 +08:00