xuexinpeng
|
d517f05b82
|
Merge branch 'master_test_gn_zf' into master_test_gn
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/player/PlayerLogic.java
|
2021-08-16 14:40:38 +08:00 |
duhui
|
b30ca90cec
|
关闭跨服十绝阵
|
2021-08-16 14:12:15 +08:00 |
duhui
|
be862b5e17
|
mongo配置修改
|
2021-08-16 11:28:35 +08:00 |
xuexinpeng
|
23d17dc479
|
首发邮件更改
|
2021-08-16 15:34:47 +08:00 |
lvxinran
|
c1a1219ff2
|
判断顺序修改
|
2021-08-14 18:01:34 +08:00 |
lvxinran
|
f7cfb10a8e
|
删除英雄代码提交
|
2021-08-14 17:13:08 +08:00 |
lvxinran
|
da50d8f7cf
|
删除无用
|
2021-08-14 16:57:26 +08:00 |
lvxinran
|
f40115836e
|
暂时不删除
|
2021-08-14 16:54:04 +08:00 |
lvxinran
|
f24f6954f8
|
修复英雄数据
|
2021-08-14 16:01:12 +08:00 |
lvxinran
|
99f6f425b8
|
空判断packid
|
2021-08-14 14:20:12 +08:00 |
xuexinpeng
|
381edf838d
|
游心gm 20019服错发邮件
|
2021-08-16 18:58:49 +08:00 |
duhui
|
6c56cba35f
|
十绝阵跨服
|
2021-08-13 10:37:31 +08:00 |
xuexinpeng
|
e26b239f1c
|
太初密卷
|
2021-08-13 10:01:20 +08:00 |
lvxinran
|
cc191fe8c1
|
添加return
|
2021-08-12 18:45:48 +08:00 |
lvxinran
|
b9661c9a77
|
处理报错
|
2021-08-12 18:35:17 +08:00 |
duhui
|
abba6adf16
|
开启跨服十绝阵
|
2021-08-12 17:12:02 +08:00 |
xuexinpeng
|
849b906f61
|
首发预约邮件
|
2021-08-16 16:31:38 +08:00 |
xuexinpeng
|
2aa6058f2e
|
首发预约邮件
|
2021-08-16 16:04:36 +08:00 |
lvxinran
|
9af6ed2721
|
车迟斗法记录修改
|
2021-08-12 15:11:11 +08:00 |
lvxinran
|
d7638c3829
|
防止报错
|
2021-08-12 13:36:05 +08:00 |
xuexinpeng
|
c5b9927feb
|
寻宝迷踪
|
2021-08-09 18:22:54 +08:00 |
lvxinran
|
3018ad8789
|
修改掉落
|
2021-08-09 11:30:39 +08:00 |
xuexinpeng
|
e7f5d7dcfd
|
功能礼包 封禁
|
2021-08-06 17:48:25 +08:00 |
lvxinran
|
141da04281
|
注释无用代码
|
2021-08-05 20:51:31 +08:00 |
duhui
|
7d000190d4
|
跨服战斗中显示皮肤
|
2021-08-05 16:25:15 +08:00 |
lvxinran
|
87911d51f6
|
数数上报修改
|
2021-08-05 16:02:57 +08:00 |
xuexinpeng
|
277938ccd3
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-08-05 11:49:20 +08:00 |
xuexinpeng
|
8f92434f12
|
【日任务】新做的日任务,会记点将台抽卡次数(有新将活动只记新将抽卡次数)
|
2021-08-05 11:46:39 +08:00 |
xuexinpeng
|
84d0cb053a
|
新做的日任务,会记点将台抽卡次数(有新将活动只记新将抽卡次数)
|
2021-08-05 11:32:38 +08:00 |
duhui
|
70a16ceaec
|
跨服排行榜自己排名显示问题处理
|
2021-08-05 10:46:20 +08:00 |
lvxinran
|
c7a897e3b9
|
packid修改
|
2021-08-04 21:41:47 +08:00 |
lvxinran
|
9bd09974d9
|
mongo慢查询修改
|
2021-08-04 21:09:06 +08:00 |
duhui
|
8ab6627d3d
|
Merge branch 'master_prb_gn' into master_test_gn_zf
|
2021-08-04 19:51:33 +08:00 |
lvxinran
|
0de9a4ee30
|
打开图鉴功能
|
2021-08-04 17:50:20 +08:00 |
duhui
|
8f49866e06
|
跨服bug热更
|
2021-08-04 16:56:21 +08:00 |
duhui
|
527186345c
|
跨服显示问题
|
2021-08-04 16:51:31 +08:00 |
duhui
|
b14a43d74e
|
跨服排行,展示宝物和英雄皮肤
|
2021-08-04 16:05:50 +08:00 |
duhui
|
d876273349
|
跨服切磋问题处理,无效引用删除
|
2021-08-04 15:45:25 +08:00 |
lvxinran
|
2e7714f94d
|
mongo慢查询修改
|
2021-08-04 15:16:16 +08:00 |
lvxinran
|
56f9773f7b
|
暂时关闭图鉴激活功能
|
2021-08-04 10:51:42 +08:00 |
lvxinran
|
c32513ab42
|
Merge branch 'master_test_gn' into master_test_gn_zf
|
2021-08-03 17:36:11 +08:00 |
lvxinran
|
29fa1eb079
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-08-03 17:28:15 +08:00 |
lvxinran
|
3867ce735c
|
同步本地战斗
|
2021-08-03 17:27:36 +08:00 |
lvxinran
|
0d7dde1926
|
机器人天赋修改
|
2021-08-03 17:25:29 +08:00 |
duhui
|
98cf249c70
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-08-03 16:47:40 +08:00 |
duhui
|
8e7133efa3
|
罗浮争锋排行榜服务器名显示问题
|
2021-08-03 16:44:22 +08:00 |
duhui
|
c542ac0f86
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-08-03 10:26:34 +08:00 |
lvxinran
|
f4c37edd1c
|
Merge branch 'master_test_gn' into master_prb_gn
|
2021-08-07 19:58:38 +08:00 |
lvxinran
|
d0601f797c
|
Merge branch 'master_test_gn' of http://60.1.1.230/backend/jieling_server into master_test_gn
|
2021-08-07 19:24:57 +08:00 |
lvxinran
|
e875b3688d
|
后续添加
|
2021-08-07 19:24:47 +08:00 |