xuexinpeng
|
d4daed3d65
|
跨服灵脉秘境
|
2021-11-18 21:08:32 +08:00 |
xuexinpeng
|
1acf753951
|
跨服灵脉秘境
|
2021-11-18 18:27:33 +08:00 |
jiahuiwen
|
dc30ecffb7
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-17 17:29:32 +08:00 |
jiahuiwen
|
7961a40690
|
宝物分解bug
|
2021-11-17 17:24:30 +08:00 |
jiahuiwen
|
daa339ee54
|
脱装备bug
|
2021-11-17 17:16:28 +08:00 |
xuexinpeng
|
e7e12c7228
|
跨服灵妙秘境
|
2021-11-17 16:35:43 +08:00 |
jiahuiwen
|
0da78da3da
|
每秒执行线程,增加延迟启动
|
2021-11-17 16:08:20 +08:00 |
yuanshuai
|
782d39ab2d
|
法宝之魂共鸣技能相关代码修改
|
2021-11-17 14:48:00 +08:00 |
yuanshuai
|
661594c422
|
添加注释
|
2021-11-17 13:55:25 +08:00 |
jiahuiwen
|
8a5712fdb2
|
Merge branch 'master_prb_gn' into master_test_gn
|
2021-11-17 13:24:03 +08:00 |
yuanshuai
|
f8aa4e339b
|
法宝聚灵功能提交
|
2021-11-17 13:18:27 +08:00 |
jiahuiwen
|
252208e6fb
|
合成宝物bug
|
2021-11-17 13:11:48 +08:00 |
jiahuiwen
|
010f1b97ff
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-11-17 10:37:02 +08:00 |
jiahuiwen
|
9d90b6b6bf
|
获取服务器id错误
|
2021-11-17 10:32:17 +08:00 |
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
|
30dae1d80e
|
宝物穿戴bug
|
2021-11-16 16:56:40 +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
|
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 |
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 |