Commit Graph

6242 Commits (d117d99b8ac2685fb49f22cc00318103306d9014)
 

Author SHA1 Message Date
jiahuiwen d117d99b8a Merge branch 'master_prb_gn' of http://60.1.1.230/backend/jieling_server into master_prb_gn 2021-11-17 09:37:56 +08:00
jiahuiwen ecbed9777d Merge branch 'master_prb_gn' into master_test_gn_zf 2021-11-17 09:37:14 +08:00
duhui 457649facd Merge branch 'master_test_gn_zf' into master_prb_gn 2021-11-17 09:37:01 +08:00
jiahuiwen dbfd1588c4 增加null判断 2021-11-17 09:34:39 +08:00
duhui e6bafcd98b Merge branch 'master_test_gn' into master_prb_gn 2021-11-30 15:47:05 +08:00
duhui c5de1c8ce5 Receive类型礼包购买条件类型修改 2021-11-30 15:46:46 +08:00
duhui 849f0d4d52 报错 2021-11-17 08:59:12 +08:00
duhui a52e39292d 魂宝灵宝二改 2021-11-17 08:52:43 +08:00
duhui fbb977b360 魂宝灵宝强转问题 2021-11-17 08:31:25 +08:00
jiahuiwen c9f0841176 Merge branch 'master_prb_gn' into master_test_gn_zf
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ExpectRankActivity.java
2021-11-16 13:07:12 +08:00
duhui 1e166894d2 跨服旧数据兼容 2021-11-15 10:20:30 +08:00
xuexinpeng f0fa655dc8 森罗幻境 2021-11-13 22:18:09 +08:00
jiahuiwen f8dbd74b31 Merge branch 'master_test_gn' into master_prb_gn 2021-11-12 18:58:21 +08:00
xuexinpeng 39b276f03d 森罗幻境特殊处理还原 2021-11-12 18:28:22 +08:00
xuexinpeng 3b36c250ba 森罗幻境特殊处理 2021-11-12 17:32:20 +08:00
xuexinpeng 2eae6c3890 森罗幻境特殊处理 2021-11-12 17:23:07 +08:00
xuexinpeng 9facaffd99 跨服排行榜切磋战力先后手 2021-11-12 13:24:27 +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
duhui 9f7a7b0725 好友问题处理
(cherry picked from commit a1fce080ee)
2021-11-10 18:23:04 +08:00
duhui a1fce080ee 好友问题处理 2021-11-10 18:22:23 +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