Commit Graph

6353 Commits (204eb5f959c9d578e1d9b824f1f26f5ffa6fd2bf)
 

Author SHA1 Message Date
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
jiahuiwen 6d004e2114 英雄技能调用统一方法 2021-11-08 10:46:46 +08:00
xuexinpeng 2e15f40597 sh变量名修改 2021-11-08 10:46:42 +08:00
DESKTOP-98AVA47\Administrator 845d32326c 跨服获取玩家rpc信息错误返回 2021-12-28 09:41:11 +08:00
jiahuiwen b3df483ef8 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-06 08:01:21 +08:00
jiahuiwen 71dd1931c8 修改日志打印 2021-11-06 08:01:14 +08:00
xuexinpeng 15e172c85c 战斗记录 2021-11-05 19:51:42 +08:00
xuexinpeng c477f8a529 存储结构改变 2021-11-05 19:32:27 +08:00
jiahuiwen b9d44ccd3e 删除无用代码 2021-11-05 19:22:22 +08:00
xuexinpeng 38c39eeea4 山河社稷图redis改为mongo存储 2021-11-05 19:19:16 +08:00
DESKTOP-98AVA47\Administrator 02e09225e9 排行榜bug修改 2021-11-15 00:21:21 +08:00
jiahuiwen dcd9f119d7 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-05 18:31:26 +08:00
jiahuiwen c1e72e259b 竞技场 超7天未登录玩家不发奖励 2021-11-05 18:31:17 +08:00
yuanshuai 7dbea21500 跨服排行英雄数据添加神魂等级数据 2021-11-05 18:27:08 +08:00
duhui 7b8e4db67b 跨服数据容错,发现一个小问题,如果跨服排行榜有服务器未开启,那么对应服务器的玩家在排行榜上战斗力会显示0 2021-11-05 17:51:22 +08:00
duhui e807b5b743 排行榜批量修改,跨服逻辑统一接口,本地获取排行玩家数据不放缓存 2021-11-05 17:20:36 +08:00
duhui 93a653423f 无用代码删除 2021-11-05 17:10:56 +08:00
yuanshuai bbe20d2156 Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-05 17:00:22 +08:00
yuanshuai 20293ed53c 山河社稷图添加神魂等级数据 2021-11-05 17:00:07 +08:00
xuexinpeng ad50ec11cb 玉虚积分修正 2021-11-05 16:39:48 +08:00
duhui 33f33f9550 优化 2021-11-05 16:18:45 +08:00
xuexinpeng 108c2d98ea 玉虚修正2 2021-11-05 16:16:59 +08:00
yuanshuai 438b0e85db 大闹天宫添加神魂等级信息 2021-11-05 16:10:02 +08:00
yuanshuai 3b96e6549c Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn 2021-11-05 15:52:42 +08:00
yuanshuai eeff859f95 竞技场神魂等级数据添加 2021-11-05 15:52:32 +08:00
xuexinpeng 89e0335f5b 森罗排行排除神秘关卡 2021-11-05 15:51:13 +08:00
yuanshuai 241b8facb5 报错修改 2021-11-05 15:35:03 +08:00
yuanshuai f756444b5a 森罗幻境添加神魂等级信息 2021-11-05 15:15:54 +08:00