jiahuiwen
|
daa339ee54
|
脱装备bug
|
2021-11-17 17:16:28 +08:00 |
duhui
|
cbf61cfafc
|
身外化身提交
|
2021-11-17 16:47:25 +08:00 |
yuanshuai
|
7dd2521295
|
修行刷新排行榜战斗力脚本添加
|
2021-11-26 14:14:49 +08:00 |
jiahuiwen
|
252208e6fb
|
合成宝物bug
|
2021-11-17 13:11:48 +08:00 |
jiahuiwen
|
9d90b6b6bf
|
获取服务器id错误
|
2021-11-17 10:32:17 +08:00 |
jiahuiwen
|
ecbed9777d
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-11-17 09:37:14 +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 |
duhui
|
1e166894d2
|
跨服旧数据兼容
|
2021-11-15 10:20:30 +08:00 |
DESKTOP-98AVA47\Administrator
|
e341f52da6
|
车迟斗法挑战记录bug修改
|
2021-11-14 15:21:49 +08:00 |
xuexinpeng
|
9d4bfa19a5
|
跨服灵脉秘境
|
2021-11-23 19:06:17 +08:00 |
xuexinpeng
|
d7c548f248
|
跨服灵脉秘境积分计算
|
2021-11-23 18:46:46 +08:00 |
xuexinpeng
|
0fd3f53795
|
跨服灵妙秘境
|
2021-11-22 17:59:49 +08:00 |
xuexinpeng
|
9e8a57674c
|
跨服灵脉秘境
|
2021-11-22 17:50:17 +08:00 |
xuexinpeng
|
1a60f70002
|
跨服灵脉秘境
|
2021-11-25 09:22:00 +08:00 |
jiahuiwen
|
33d8fd7746
|
优化日志
|
2021-11-22 14:40:11 +08:00 |
jiahuiwen
|
1c28ff4797
|
道具数量改long
|
2021-11-22 14:23:18 +08:00 |
jiahuiwen
|
ad0654545b
|
7天未登录玩家,竞技场,不发奖励
|
2021-11-22 10:17:26 +08:00 |
duhui
|
7cda83d0f0
|
公会技能升级修改,道具数量改long
|
2021-11-22 09:52:24 +08:00 |
yuanshuai
|
7c536a5c08
|
添加法宝碎片道具类型
|
2021-11-19 18:15:08 +08:00 |
xuexinpeng
|
8615af222f
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-18 18:00:22 +08:00 |
yuanshuai
|
889720d392
|
法宝聚灵技能修改
|
2021-11-19 16:42:33 +08:00 |
xuexinpeng
|
79b1ac3759
|
Merge branch 'master_test_gn' into master_test_gn_xxp
|
2021-11-18 17:58:34 +08:00 |
xuexinpeng
|
4785536487
|
跨服灵脉秘境挑战记录新加
|
2021-11-18 17:57:22 +08:00 |
yuanshuai
|
fbf48a1903
|
Merge branch 'master_test_gn' into master_test_gn_fabao
|
2021-11-18 17:49:27 +08:00 |
yuanshuai
|
3614aa978a
|
法宝聚灵技能修改
|
2021-11-18 17:49:18 +08:00 |
xuexinpeng
|
55c463569c
|
跨服灵脉秘境1.先后手问题2.记录删除问题3.排行榜自己排名问题
|
2021-11-18 16:33:36 +08:00 |
yuanshuai
|
dfa218d8ba
|
添加战中属性
|
2021-11-18 15:09:45 +08:00 |
xuexinpeng
|
01f4d79966
|
跨服灵脉秘境
|
2021-11-18 14:50:29 +08:00 |
xuexinpeng
|
96123a6d22
|
跨服灵脉秘境
|
2021-11-18 14:45:43 +08:00 |
xuexinpeng
|
f0edb6f5b0
|
跨服灵脉秘境
|
2021-11-19 11:28:35 +08:00 |
xuexinpeng
|
dc98b314ae
|
跨服灵脉秘境
|
2021-11-18 21:55:20 +08:00 |
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 |
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
|
010f1b97ff
|
Merge branch 'master_test_gn_zf' into master_test_gn
|
2021-11-17 10:37:02 +08:00 |
jiahuiwen
|
30dae1d80e
|
宝物穿戴bug
|
2021-11-16 16:56:40 +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 |
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
|
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
|
b3b8da2ba9
|
先还原离线清除逻辑
|
2021-11-09 22:59:27 +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 |
xuexinpeng
|
ad571664eb
|
【优化调整】森罗达人
|
2021-11-14 00:14:35 +08:00 |
jiahuiwen
|
aa938f7edb
|
优化世界等级起服计算
|
2021-11-05 14:08:28 +08:00 |
xuexinpeng
|
d3c4ea921b
|
【山河社稷图】最低战力通关和首次通关的战斗数据由redis改为数据库储存
|
2021-11-05 10:18:52 +08:00 |
xuexinpeng
|
c92e5b1b7a
|
【玉虚优化】优化分数丢失规则: +新增表格内修正分数
|
2021-11-04 18:10:21 +08:00 |
xuexinpeng
|
e8ac427ae3
|
森罗达人排行榜 机制修改
|
2021-11-04 17:50:43 +08:00 |
xuexinpeng
|
3e3fb783ee
|
周卡表结构变化
|
2021-11-11 16:45:48 +08:00 |
duhui
|
8ac3c8adb0
|
无尽副本日志
|
2021-11-04 16:17:45 +08:00 |
duhui
|
2aba5b20cc
|
无用代码注释
|
2021-11-04 16:14:20 +08:00 |
xuexinpeng
|
3f38bf784a
|
周卡表数据为空后不返回
|
2021-11-22 00:45:22 +08:00 |
jiahuiwen
|
2392506183
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-04 14:25:53 +08:00 |
xuexinpeng
|
4721fd9342
|
周卡发邮件
|
2021-11-22 00:01:55 +08:00 |
jiahuiwen
|
11470e73b3
|
mongo映射java bean 需要默认构造函数
|
2021-11-04 14:25:42 +08:00 |
yuanshuai
|
dfc37aef28
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-04 14:02:06 +08:00 |
yuanshuai
|
2ef8596a6f
|
注释修改
|
2021-11-04 14:01:48 +08:00 |
xuexinpeng
|
8ef68e0a98
|
周卡修改
|
2021-11-08 00:04:52 +08:00 |
xuexinpeng
|
58e6af7f72
|
SGlobalSystemConfig中ifopen开关不好使
|
2021-11-04 13:47:06 +08:00 |
jiahuiwen
|
aef4398c40
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-04 13:46:04 +08:00 |
jiahuiwen
|
f13360abd3
|
优化内存中玩家清除逻辑
|
2021-11-04 13:45:57 +08:00 |
yuanshuai
|
f7041150b6
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-04 10:59:22 +08:00 |
yuanshuai
|
2f675017fa
|
英雄图鉴bug修改
|
2021-11-04 10:59:12 +08:00 |
duhui
|
8f35b31222
|
跨服排行榜修改
|
2021-11-04 10:47:51 +08:00 |
duhui
|
5c70df47db
|
跨服分组修改
|
2021-11-04 10:11:42 +08:00 |
xuexinpeng
|
fb69e8de2e
|
周卡打开
|
2021-11-08 00:06:49 +08:00 |
yuanshuai
|
9e22fed4ad
|
Merge branch 'master_test_gn_godsoul' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/exception/ErrorCode.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/crossService/CrossServiceLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2021-11-03 19:03:22 +08:00 |
jiahuiwen
|
a4e418364d
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-11-03 17:48:08 +08:00 |
jiahuiwen
|
bff21f989c
|
支持商店下架商品
|
2021-11-03 17:46:27 +08:00 |