zhangshanxue
|
8e8cc31b08
|
Task 【ID1006033】【新战斗版本】后端装备合成系统
|
2020-04-03 11:45:33 +08:00 |
wangyuan
|
071a6c8aa2
|
刪除魂印
|
2020-04-02 17:18:34 +08:00 |
lvxinran
|
790273b96f
|
删除无用方法
|
2020-04-02 15:23:28 +08:00 |
lvxinran
|
44f8aa82f2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-04-02 15:14:34 +08:00 |
lvxinran
|
d1cf55e9ac
|
法宝重做
|
2020-04-02 15:14:30 +08:00 |
zhangshanxue
|
1794716b5e
|
window 虚拟机attack卡死 原因未知
|
2020-04-02 11:55:42 +08:00 |
zhangshanxue
|
91e20d3e4e
|
【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端
|
2020-06-30 15:51:13 +08:00 |
zhangshanxue
|
252da3274f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-05-04 05:07:10 +08:00 |
zhangshanxue
|
f1da1afbce
|
【ID1005921】【月卡优化】累计充值30/98分别赠送月卡/豪华月卡-后端
|
2020-05-04 05:07:01 +08:00 |
wangyuan
|
f0cb24a2e3
|
修复切换赛程没有竞猜信息
|
2020-03-30 18:38:41 +08:00 |
wangyuan
|
470a104809
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-03-30 17:48:05 +08:00 |
wangyuan
|
f409c43ab6
|
巅峰赛时间修改
|
2020-03-30 17:47:54 +08:00 |
wangyuan
|
b7fe433994
|
戒灵秘宝改成直购
|
2020-03-30 17:28:25 +08:00 |
lvxinran
|
eb2259ac92
|
献祭、回溯修改
|
2020-03-27 15:42:18 +08:00 |
lvxinran
|
6b9ac180e8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-27 14:04:47 +08:00 |
lvxinran
|
1588a437b1
|
回溯、分解英雄
|
2020-03-27 14:04:42 +08:00 |
zhangshanxue
|
20a2a3c495
|
成就系统
|
2020-03-26 13:56:07 +08:00 |
zhangshanxue
|
ef3bc85d6e
|
充值后再次签到
|
2020-03-25 11:21:49 +08:00 |
zhangshanxue
|
9dde66d590
|
充值后再次签到
|
2020-03-25 10:14:56 +08:00 |
zhangshanxue
|
8f981bc846
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-25 10:12:47 +08:00 |
wangyuan
|
52117ad434
|
fix recharge vip
|
2020-03-24 16:21:52 +08:00 |
zhangshanxue
|
f8251f06cf
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-24 10:59:20 +08:00 |
zhangshanxue
|
91593f8fa0
|
奖励优化
|
2020-03-24 10:58:52 +08:00 |
wangyuan
|
f23d6924fd
|
删除无效代码
|
2020-03-24 10:57:06 +08:00 |
wangyuan
|
b119ff1ce9
|
fix get goods info way
|
2020-03-23 18:42:48 +08:00 |
wangyuan
|
23489baf4a
|
背包内和互动关联的道具,活动到期后道具的优化
|
2020-03-20 18:13:58 +08:00 |
wangyuan
|
d23c8baeed
|
fix 道具直购初始化时间
|
2020-03-20 18:09:05 +08:00 |
lvxinran
|
bf8a3a59d7
|
戒灵秘宝时间剩余
|
2020-03-25 05:01:03 +08:00 |
wangyuan
|
c208cc6bb7
|
fix 直购礼包结束时间计算
|
2020-03-20 14:53:52 +08:00 |
wangyuan
|
b02f07e874
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-03-20 11:01:19 +08:00 |
wangyuan
|
651c7697c8
|
道具直购
|
2020-03-20 11:00:59 +08:00 |
lvxinran
|
0034193cb4
|
Merge branch 'project0.95'
|
2020-03-19 11:11:17 +08:00 |
lvxinran
|
287720f7d4
|
Merge branch 'project0.95' of http://60.1.1.230/backend/jieling_server into project0.95
|
2020-03-18 17:41:29 +08:00 |
lvxinran
|
d41c1da745
|
系统消息修改,好友全部同意提示
|
2020-03-18 17:41:24 +08:00 |
wangyuan
|
e7d2e52ea4
|
邮件提示
|
2020-03-18 14:40:00 +08:00 |
wangyuan
|
fe37d4fb31
|
任务更新
|
2020-03-17 17:13:52 +08:00 |
zhangshanxue
|
6d4134f2b1
|
猎妖数据过大
|
2020-03-17 17:12:46 +08:00 |
zhangshanxue
|
9f8c1006e2
|
竞技场防御战力未更新
|
2020-03-17 17:10:52 +08:00 |
zhangshanxue
|
abd7ba7804
|
线程重复
|
2020-03-16 11:41:58 +08:00 |
zhangshanxue
|
550ce57411
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-03-16 11:01:02 +08:00 |
zhangshanxue
|
3900141126
|
线程创建多个
|
2020-03-16 11:00:48 +08:00 |
lvxinran
|
be83f871c0
|
关卡排行热更
|
2020-03-13 15:21:49 +08:00 |
lvxinran
|
288c4d627e
|
战力方法修改
|
2020-03-13 14:47:39 +08:00 |
wangyuan
|
2fa05aade5
|
fix mainrank
|
2020-03-13 14:42:35 +08:00 |
lvxinran
|
566fc26e6d
|
好友友情点修改
|
2020-03-13 14:26:45 +08:00 |
lvxinran
|
50110c8723
|
关卡排行榜修改
|
2020-03-13 11:11:29 +08:00 |
wangyuan
|
1a6b3fdd86
|
启动服务器加索引
|
2020-03-13 10:15:31 +08:00 |
lvxinran
|
082671a2d9
|
5点0点刷新修改
|
2020-03-13 05:10:37 +08:00 |
wangyuan
|
789730d3c7
|
view mem
|
2020-03-12 18:09:20 +08:00 |
lvxinran
|
f268f19439
|
减少日志
|
2020-03-12 15:43:39 +08:00 |
lvxinran
|
4425bfd75b
|
排行榜修改
|
2020-03-12 14:14:36 +08:00 |
wangyuan
|
b2ced29b8c
|
fix rank
|
2020-03-15 21:19:05 +08:00 |
wangyuan
|
c7a280108d
|
fix indication
|
2020-03-10 16:56:21 +08:00 |
wangyuan
|
13b83b1050
|
fix indication
|
2020-03-10 16:54:17 +08:00 |
lvxinran
|
ae294080a6
|
东海寻仙bug修改
|
2020-03-12 10:40:25 +08:00 |
wangyuan
|
0601a3d746
|
'商品type改成id'
|
2020-03-09 17:07:53 +08:00 |
zhangshanxue
|
743e54ceb5
|
cdk全渠道需求
|
2020-03-09 12:39:30 +08:00 |
zhangshanxue
|
498dbbb80f
|
cdk全渠道需求
|
2020-03-09 11:31:28 +08:00 |
zhangshanxue
|
674d88210e
|
cdk全渠道需求
|
2020-03-09 11:02:06 +08:00 |
lvxinran
|
435ed56a0f
|
特权刷新先后顺序
|
2020-03-03 05:04:32 +08:00 |
lvxinran
|
c5d8e67d2e
|
敏感词
|
2020-02-28 16:43:24 +08:00 |
lvxinran
|
9c82a394dd
|
戒灵秘宝升级修改
|
2020-02-29 00:03:07 +08:00 |
lvxinran
|
81eedff9df
|
戒灵秘宝升级修改
|
2020-02-28 12:29:53 +08:00 |
lvxinran
|
0846bdfe2d
|
戒灵秘宝逻辑修改
|
2020-02-28 12:04:02 +08:00 |
lvxinran
|
82c102391b
|
东海寻仙活动
|
2020-02-29 00:01:33 +08:00 |
zhangshanxue
|
f132f859c4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-26 16:54:22 +08:00 |
zhangshanxue
|
c53b6056ed
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 奖励改成奖励组
|
2020-02-26 16:54:12 +08:00 |
lvxinran
|
fb104288e5
|
限时抽卡 寻仙榜修改
|
2020-02-26 14:38:07 +08:00 |
wangyuan
|
66ea5b103f
|
修复设置异妖组件最大等级校验
|
2020-02-25 14:55:14 +08:00 |
wangyuan
|
a3716c257f
|
巅峰赛编队有竞技场进攻变成竞技场防守
|
2020-02-25 11:47:10 +08:00 |
zhangshanxue
|
b0ad311440
|
线上分支回退 改回来
|
2020-02-25 09:57:36 +08:00 |
zhangshanxue
|
1ce01c52e3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 21:45:51 +08:00 |
zhangshanxue
|
57fa2c6652
|
线上分支回退 稍后再改回来
|
2020-02-24 21:45:42 +08:00 |
wangyuan
|
4c327414b9
|
零点刷新
|
2020-02-24 18:26:28 +08:00 |
zhangshanxue
|
9ee9d9f2e8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 18:06:02 +08:00 |
zhangshanxue
|
49140cc3d7
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容
|
2020-02-24 18:05:51 +08:00 |
lvxinran
|
d005fbed44
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 17:14:08 +08:00 |
lvxinran
|
85a1947791
|
刷新充值礼包改为0点
|
2020-02-24 17:14:03 +08:00 |
wangyuan
|
257de4422f
|
修改工会战编队id可动态改
|
2020-02-24 16:21:10 +08:00 |
zhangshanxue
|
f41cf48f3b
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 去掉每日战力快照 取最大战力
|
2020-02-24 15:57:11 +08:00 |
zhangshanxue
|
f3fca07cf2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-24 15:00:43 +08:00 |
zhangshanxue
|
267f621cc0
|
BUG 【ID1006263】 【五星成长礼】在碎片合成时,获得五星猎妖师,偶尔没有前往的弹窗
|
2020-02-24 15:00:35 +08:00 |
wangyuan
|
4e98fff425
|
fix
|
2020-02-21 18:30:36 +08:00 |
zhangshanxue
|
a7ed154936
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-21 17:55:45 +08:00 |
zhangshanxue
|
441480aed0
|
Task【ID1005747】【猎妖之路优化】 猎妖之路优化内容 死亡猎妖师未下阵
|
2020-02-21 17:55:36 +08:00 |
wangyuan
|
d9b592cc81
|
修复功能按类型开
|
2020-02-21 17:54:41 +08:00 |
zhangshanxue
|
0304f78695
|
Task【ID1005747】【猎妖之路优化】猎妖之路优化内容
|
2020-02-21 11:09:57 +08:00 |
zhangshanxue
|
ae01d515ec
|
前端gm指令 后期屏蔽
|
2020-02-20 17:46:26 +08:00 |
zhangshanxue
|
d902f1d34e
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-20 16:40:08 +08:00 |
zhangshanxue
|
861c6a2ec5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-20 09:34:19 +08:00 |
wangyuan
|
d1bd1ebade
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
|
2020-03-26 00:03:27 +08:00 |
wangyuan
|
d3a84ad2a8
|
商店刷新 & 工会行走
|
2020-03-26 00:02:26 +08:00 |
zhangshanxue
|
4afff38ff3
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-20 09:34:08 +08:00 |
zhangshanxue
|
44c00e9fcb
|
Task【ID1005460】【玩法需求】猎妖之路 节点更新不对
|
2020-02-19 14:53:20 +08:00 |
zhangshanxue
|
cbfee44510
|
Task【ID1005460】【玩法需求】猎妖之路 节点更新不对
|
2020-02-19 10:58:09 +08:00 |
zhangshanxue
|
95b9eb58d5
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-18 13:52:23 +08:00 |
zhangshanxue
|
f3e27888ee
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-17 18:19:29 +08:00 |
zhangshanxue
|
624282c742
|
Task【ID1005460】【玩法需求】猎妖之路
|
2020-02-17 15:51:37 +08:00 |
zhangshanxue
|
b838d8b25b
|
五星成长礼注释
|
2020-02-17 13:55:01 +08:00 |
zhangshanxue
|
67b85decc5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-13 16:13:31 +08:00 |
zhangshanxue
|
da2943dd9a
|
Task 【ID1005460】 【玩法需求】猎妖之路
|
2020-02-13 16:13:21 +08:00 |
zhangshanxue
|
38e9e4d5f9
|
Task 【ID1005460】 【玩法需求】猎妖之路
|
2020-02-13 10:24:11 +08:00 |
lvxinran
|
337e0ebeec
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-02-10 09:52:02 +08:00 |
lvxinran
|
8c06c9fed2
|
战力修改
|
2020-02-10 09:51:55 +08:00 |
zhangshanxue
|
4e5542393c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
|
2020-02-09 19:53:28 +08:00 |
zhangshanxue
|
4769cadda1
|
Task 【ID1005460】 【玩法需求】猎妖之路
|
2020-02-09 19:48:55 +08:00 |
lvxinran
|
9331c2ce1f
|
红包过期提示
|
2020-01-16 18:24:26 +08:00 |
lvxinran
|
ed97e5b734
|
戒灵秘宝任务获取
|
2020-01-18 16:14:34 +08:00 |
wangyuan
|
8438d69f40
|
扫荡奖励
|
2020-01-16 15:28:55 +08:00 |
wangyuan
|
3e67fb76ec
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-16 14:29:30 +08:00 |
lvxinran
|
18ff74bef6
|
寻仙榜加入活动id修改
|
2020-01-18 11:52:04 +08:00 |
wangyuan
|
cf83bf24fb
|
礼包邮件时间
|
2020-01-16 14:28:44 +08:00 |
lvxinran
|
2ea5eddff3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-16 11:09:15 +08:00 |
lvxinran
|
6dc9f0370e
|
特权时间修改
|
2020-01-16 11:09:02 +08:00 |
wangyuan
|
40d339793c
|
活动修改&新手结束
|
2020-01-16 11:00:57 +08:00 |
lvxinran
|
0d5dd5811f
|
红包随机方法修改
|
2020-01-16 10:15:05 +08:00 |
wangyuan
|
f4cd55beb5
|
guildbossj邮件奖励
|
2020-01-15 18:30:01 +08:00 |
wangyuan
|
d02d25acc1
|
guildbossj邮件奖励
|
2020-01-15 18:14:50 +08:00 |
lvxinran
|
7de892ae24
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-15 17:20:10 +08:00 |
lvxinran
|
7d110d4220
|
五星成长礼修改
|
2020-01-15 17:20:05 +08:00 |
wangyuan
|
02288406d9
|
上次伤害
|
2020-01-15 15:26:03 +08:00 |
lvxinran
|
3721397aa0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-15 14:25:52 +08:00 |
lvxinran
|
5f181a4df7
|
发送抢到红包消息
|
2020-01-15 14:25:29 +08:00 |
wangyuan
|
fa7534ce86
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-15 10:02:27 +08:00 |
wangyuan
|
0999804d3c
|
工会boss奖励
|
2020-01-15 10:02:10 +08:00 |
wangyuan
|
4750308d69
|
活动修改发奖
|
2020-01-16 00:08:07 +08:00 |
lvxinran
|
58f1606268
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-14 18:01:28 +08:00 |
lvxinran
|
38e9b4ef3b
|
发送红包奖励改为邮件
|
2020-01-14 18:01:15 +08:00 |
wangyuan
|
6e7a116b72
|
特权、礼包过期邮件通知
|
2020-01-14 14:09:53 +08:00 |
lvxinran
|
4148f0d9ee
|
特权修改时发送挂机奖励
|
2020-01-14 13:41:22 +08:00 |
lvxinran
|
bedd39c0a2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-17 17:48:41 +08:00 |
lvxinran
|
2b40c77e68
|
挂机邮件
|
2020-01-17 17:48:36 +08:00 |
lvxinran
|
6e5642857a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-15 14:41:10 +08:00 |
lvxinran
|
1e36eb0195
|
特权过期
|
2020-01-15 14:41:00 +08:00 |
wangyuan
|
9dd949808d
|
预告
|
2020-01-13 17:43:42 +08:00 |
wangyuan
|
9b45351ae2
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-16 01:35:36 +08:00 |
wangyuan
|
831653bde4
|
修改到期时间
|
2020-01-16 01:35:21 +08:00 |
wangyuan
|
eda6fd40f4
|
基金
|
2020-01-13 11:10:51 +08:00 |
wangyuan
|
4ef3ca72c9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-13 10:48:11 +08:00 |
wangyuan
|
22262c4bb7
|
刷新商品
|
2020-01-13 10:45:48 +08:00 |
lvxinran
|
04b5b3e39e
|
工会红包 职位添加
|
2020-01-10 16:09:39 +08:00 |
lvxinran
|
9d70702214
|
东海寻仙邮件
|
2020-01-16 00:02:21 +08:00 |
lvxinran
|
7656c76f94
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-11 13:39:04 +08:00 |
lvxinran
|
1329c2b56b
|
抢红包校验
|
2020-01-11 13:38:58 +08:00 |
wangyuan
|
1ab634aeb6
|
商品购买
|
2020-01-09 18:06:45 +08:00 |
lvxinran
|
27a48fac95
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-09 17:02:03 +08:00 |
lvxinran
|
50093c8c58
|
特权时间修改,点赞物品添加
|
2020-01-09 17:01:53 +08:00 |
wangyuan
|
dfb50edaa0
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-09 16:43:56 +08:00 |
wangyuan
|
2596295a30
|
商品购买和刷新
|
2020-01-09 16:43:47 +08:00 |
lvxinran
|
0d2f9e9fe9
|
红包榜,点赞提交
|
2020-01-09 15:59:13 +08:00 |
zhangshanxue
|
8d640e290b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-09 15:21:10 +08:00 |
zhangshanxue
|
eab36c5f27
|
TASK【ID1005460】【玩法需求】猎妖之路
|
2020-01-09 15:20:09 +08:00 |
lvxinran
|
6a7878b8e6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-08 18:35:42 +08:00 |
wangyuan
|
d9d46dc362
|
hurt value
|
2020-01-08 18:35:28 +08:00 |
wangyuan
|
f16f86c7ee
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-08 17:58:46 +08:00 |
wangyuan
|
cb1954d8a2
|
vip权限
|
2020-01-08 17:58:36 +08:00 |
lvxinran
|
101d1bcdf3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-08 17:19:28 +08:00 |
lvxinran
|
403364b2fd
|
公会红包提交
|
2020-01-08 17:19:23 +08:00 |
zhangshanxue
|
465c18b000
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-08 16:18:47 +08:00 |
zhangshanxue
|
da646a7f5c
|
TASK【ID1005460】【玩法需求】猎妖之路
|
2020-01-08 16:18:40 +08:00 |
lvxinran
|
7c0ac91a44
|
特权时间修改,红包时间修改
|
2020-01-08 02:36:36 +08:00 |
wangyuan
|
a0fe74fa22
|
vip校验方法名称修改
|
2020-01-07 19:24:55 +08:00 |
wangyuan
|
e67f511a4b
|
表
|
2020-01-07 13:57:23 +08:00 |
wangyuan
|
bd2ec67784
|
清除数据库
|
2020-01-07 11:17:08 +08:00 |
lvxinran
|
04f7ce2fb3
|
活动51
|
2020-01-07 09:51:45 +08:00 |
lvxinran
|
569ce11b46
|
多余更新特权 删除
|
2020-01-06 14:11:01 +08:00 |
lvxinran
|
bcde683628
|
特权修改推送修改
|
2020-01-06 13:41:36 +08:00 |
lvxinran
|
5bb8355fb6
|
东海寻仙结算
|
2020-01-03 17:46:24 +08:00 |
lvxinran
|
4bc5c1d99c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-05 00:15:30 +08:00 |
lvxinran
|
59cb27bbf3
|
特权持续时间
|
2020-01-05 00:15:25 +08:00 |
lvxinran
|
35531d21db
|
增益修改
|
2020-01-06 15:56:32 +08:00 |
zhangshanxue
|
cc4ecd78d2
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-03 16:09:59 +08:00 |
zhangshanxue
|
130beba759
|
网络连接bug
|
2020-01-03 16:09:48 +08:00 |
lvxinran
|
2c6eccad1a
|
排行榜,特权修改
|
2020-01-03 15:02:54 +08:00 |
lvxinran
|
a89c0df8bd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-02 16:57:39 +08:00 |
lvxinran
|
99496504fb
|
权限修改
|
2020-01-02 16:57:25 +08:00 |
wangyuan
|
9c4ec8e048
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2020-01-02 16:57:19 +08:00 |
wangyuan
|
91ca5da378
|
活动检验是否开启
|
2020-01-02 16:57:09 +08:00 |
lvxinran
|
9e542cd1cb
|
监听事件
|
2020-01-02 16:20:07 +08:00 |
lvxinran
|
06fcc21636
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-02 16:12:46 +08:00 |
lvxinran
|
12dd7885ce
|
东海寻仙修改,排行榜加字段
|
2020-01-02 16:12:41 +08:00 |
lvxinran
|
39b48bf320
|
限时抽卡修改
|
2019-12-31 18:37:01 +08:00 |
wangyuan
|
b5976884de
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-30 11:07:03 +08:00 |
wangyuan
|
8bbf0233fa
|
抽卡
|
2019-12-30 11:06:47 +08:00 |
wangyuan
|
c4dceec25a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-26 17:21:10 +08:00 |
lvxinran
|
92ccef4f64
|
特权修改
|
2019-12-31 16:25:11 +08:00 |
lvxinran
|
b7a8b65530
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-31 17:48:19 +08:00 |
lvxinran
|
9b179b4e7a
|
次数推送
|
2019-12-31 17:48:12 +08:00 |
lvxinran
|
9664d9400b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2020-01-02 09:50:33 +08:00 |
lvxinran
|
874a7f550c
|
150积分修改
|
2020-01-02 09:50:29 +08:00 |
lvxinran
|
9da415744f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-31 17:32:12 +08:00 |
lvxinran
|
55091f4bae
|
特权修改
|
2019-12-31 17:32:07 +08:00 |
zhangshanxue
|
50e9aee159
|
Task 【ID1005360】 【达人活动】新增寻宝达人等4项达人活动
|
2019-12-29 17:24:30 +08:00 |
zhangshanxue
|
e002dff301
|
删除注释
|
2019-12-29 11:44:17 +08:00 |
zhangshanxue
|
3daf45e1d1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-29 10:43:15 +08:00 |
zhangshanxue
|
88636f881f
|
临时测试数据回退
|
2019-12-29 10:43:06 +08:00 |
wangyuan
|
8af9ad40d0
|
fix goods send time
|
2019-12-28 18:06:43 +08:00 |
wangyuan
|
ccb93a6623
|
修改跳过战斗
|
2019-12-28 15:41:12 +08:00 |
wangyuan
|
b9a4f03c7a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityType.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2019-12-28 15:34:58 +08:00 |
wangyuan
|
cee3884bdc
|
指定英雄进行升星
|
2019-12-31 15:26:54 +08:00 |
wangyuan
|
f1cbb7b63e
|
战力排名
|
2019-12-27 15:17:20 +08:00 |
lvxinran
|
176827eec6
|
迷宫派遣事件
|
2019-12-27 15:03:37 +08:00 |
lvxinran
|
0039930f98
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-27 14:57:19 +08:00 |
lvxinran
|
fdc2215c72
|
迷宫抛事件
|
2019-12-27 14:56:52 +08:00 |
wangyuan
|
2608b1009a
|
性别
|
2019-12-27 14:51:42 +08:00 |
wangyuan
|
2e18953817
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-30 13:34:58 +08:00 |
wangyuan
|
edcb0dbff8
|
send fund mail
|
2019-12-30 13:34:50 +08:00 |
lvxinran
|
6a456e7643
|
排行公会图腾
|
2019-12-27 11:45:16 +08:00 |
wangyuan
|
c1a89d6c58
|
pokemon drop hint
|
2019-12-27 10:27:58 +08:00 |
zhangshanxue
|
4302c8df42
|
临时测试数据
|
2019-12-28 17:57:54 +08:00 |
zhangshanxue
|
1957bd54da
|
临时测试数据
|
2019-12-28 17:48:57 +08:00 |
zhangshanxue
|
6f2a47c3ef
|
每分钟事件
|
2019-12-28 16:48:55 +08:00 |
zhangshanxue
|
e248d77b3c
|
【ID1005331】【星级成长礼】
|
2019-12-28 15:41:23 +08:00 |
zhangshanxue
|
2c72864fa5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-28 15:38:55 +08:00 |
zhangshanxue
|
0bc42cbe76
|
【ID1005331】【星级成长礼】
|
2019-12-28 15:38:49 +08:00 |
wangyuan
|
dd062d09c1
|
db clear
|
2019-12-26 17:20:32 +08:00 |
wangyuan
|
dc80e9b288
|
format champion mail content
|
2019-12-26 10:19:20 +08:00 |
zhangshanxue
|
069da0c108
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-26 10:09:12 +08:00 |
zhangshanxue
|
bb75dfbcfa
|
【ID1005331】【星级成长礼】
|
2019-12-26 10:09:06 +08:00 |
lvxinran
|
d775ae739d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-27 00:01:42 +08:00 |
lvxinran
|
69ddecc329
|
限时抽卡校验修改
|
2019-12-27 00:01:37 +08:00 |
wangyuan
|
5e3980c94d
|
异妖颜色
|
2019-12-25 17:49:12 +08:00 |
wangyuan
|
bcb2d8411e
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-31 00:05:19 +08:00 |
wangyuan
|
d79d7bf28c
|
log
|
2019-12-31 00:05:16 +08:00 |
lvxinran
|
111a6bd222
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-25 14:07:53 +08:00 |
lvxinran
|
42d27f48cd
|
限时抽卡免费次数
|
2019-12-25 14:07:48 +08:00 |
wangyuan
|
3e453d600c
|
双方信息
|
2019-12-24 16:36:10 +08:00 |
lvxinran
|
dbd1ce04a6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-24 16:01:03 +08:00 |
lvxinran
|
f0863ffbb8
|
建号迷宫寻宝任务
|
2019-12-24 16:00:58 +08:00 |
wangyuan
|
0ed34330e7
|
rank-
|
2019-12-24 15:28:04 +08:00 |
wangyuan
|
eaf1ca45dc
|
rank
|
2019-12-24 15:25:05 +08:00 |
wangyuan
|
e0d67cd3f4
|
FIX WRONG
|
2019-12-24 14:26:28 +08:00 |
wangyuan
|
8b81a3b77a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-24 14:23:28 +08:00 |
wangyuan
|
6b38f4f77e
|
修改战斗计算结果
|
2019-12-24 14:23:23 +08:00 |
lvxinran
|
f777bd44d4
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-23 18:04:24 +08:00 |
lvxinran
|
5e817c87ff
|
异妖上阵修改
|
2019-12-23 18:04:13 +08:00 |
wangyuan
|
8811db9292
|
竞猜币兑换
|
2019-12-23 16:51:58 +08:00 |
wangyuan
|
4893430814
|
历史最高排名
|
2019-12-23 15:56:12 +08:00 |
wangyuan
|
6b197aa92e
|
积分显示
|
2019-12-23 15:42:36 +08:00 |
wangyuan
|
8391417bd5
|
修复积分问题
|
2019-12-23 15:06:52 +08:00 |
wangyuan
|
ab6382715f
|
fix结束时间
|
2019-12-23 11:16:02 +08:00 |
wangyuan
|
0501db4714
|
修复更改战斗不生效问题
|
2019-12-23 10:43:15 +08:00 |
lvxinran
|
e823180834
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-21 10:19:24 +08:00 |
lvxinran
|
46a12c155c
|
抽卡修改
|
2019-12-21 10:19:18 +08:00 |
wangyuan
|
1b99d00270
|
coins position
|
2019-12-20 19:31:17 +08:00 |
wangyuan
|
8b249ba977
|
fix data
|
2019-12-20 18:48:04 +08:00 |
zhangshanxue
|
ecd3695037
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-21 05:01:55 +08:00 |
zhangshanxue
|
9ab22c2b24
|
Task【累计充值改成常驻/按日刷新】
|
2019-12-21 05:01:44 +08:00 |
wangyuan
|
fcdba1a654
|
fix champion
|
2019-12-20 15:42:25 +08:00 |
wangyuan
|
c0d2d8d1d6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-20 14:12:06 +08:00 |
wangyuan
|
80fbfd6f7f
|
是否是当前竞猜信息,0
|
2019-12-20 14:12:02 +08:00 |
lvxinran
|
a2cd81dc37
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-20 11:14:36 +08:00 |
lvxinran
|
e266207332
|
寻龙诀上限修改
|
2019-12-20 11:14:30 +08:00 |
zhangshanxue
|
a6ab8bcdc0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-19 15:33:13 +08:00 |
zhangshanxue
|
17db265446
|
TASK【ID1005242】 【选人起名】
|
2019-12-19 15:33:05 +08:00 |
lvxinran
|
790a0916db
|
上限修改
|
2019-12-19 14:48:14 +08:00 |
lvxinran
|
f64e9e3be5
|
迷宫领奖修改
|
2019-12-19 11:55:00 +08:00 |
wangyuan
|
a84a8213d3
|
回收资源
|
2019-12-18 20:17:02 +08:00 |
wangyuan
|
4c47ac3d76
|
修复竞猜数据&回收巅峰赛资源(redis)
|
2019-12-18 20:00:14 +08:00 |
lvxinran
|
94b83a97dc
|
寻龙诀上限
|
2019-12-19 07:29:12 +08:00 |
lvxinran
|
bca69953e7
|
物品数量限制
|
2019-12-19 06:16:01 +08:00 |
lvxinran
|
dfea99d11c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-18 14:06:12 +08:00 |
lvxinran
|
628902282d
|
迷宫寻宝
|
2019-12-18 14:06:07 +08:00 |
wangyuan
|
06a1d9178a
|
删除我的队伍信息
|
2019-12-17 18:00:12 +08:00 |
lvxinran
|
23488394d9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-17 15:32:45 +08:00 |
lvxinran
|
3f40a3cedf
|
英雄限制,关卡排行榜修改
|
2019-12-17 15:32:41 +08:00 |
wangyuan
|
617c395096
|
fix send mutli goods info
|
2019-12-17 13:53:03 +08:00 |
wangyuan
|
8dc99083d5
|
fix round
|
2019-12-17 12:00:30 +08:00 |
lvxinran
|
295bb58b16
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-17 10:30:10 +08:00 |
lvxinran
|
39048ea87b
|
好友任务
|
2019-12-17 10:30:01 +08:00 |
zhangshanxue
|
647391a628
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-17 10:27:19 +08:00 |
zhangshanxue
|
113c7514c8
|
【ID1005229】【特权调整】月卡bugTask
|
2019-12-17 10:27:09 +08:00 |
lvxinran
|
3d6c621618
|
好友任务
|
2019-12-17 10:11:08 +08:00 |
lvxinran
|
73d07c8754
|
刷新必出
|
2019-12-17 09:54:32 +08:00 |
wangyuan
|
f0ae6a5c13
|
add arena id
|
2019-12-16 21:03:29 +08:00 |
wangyuan
|
6d950dc2b7
|
add fix schedule
|
2019-12-16 20:48:40 +08:00 |
wangyuan
|
00cf1b77da
|
add pokemon
|
2019-12-16 20:19:55 +08:00 |
wangyuan
|
1b6811a4be
|
巅峰赛32 4
|
2019-12-16 18:14:10 +08:00 |
lvxinran
|
c6e4fb21d4
|
迷宫寻宝、表格提交
|
2019-12-16 10:37:42 +08:00 |
wangyuan
|
c754c7b063
|
fix
|
2019-12-13 21:18:29 +08:00 |
wangyuan
|
456d88c346
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-13 21:13:54 +08:00 |
wangyuan
|
95b94c95f2
|
巅峰赛数据
|
2019-12-13 21:13:42 +08:00 |
lvxinran
|
19944b9009
|
无尽等级修改,迷宫寻宝派遣加速
|
2019-12-13 18:02:56 +08:00 |
zhangshanxue
|
8e38757d85
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-16 15:40:44 +08:00 |
zhangshanxue
|
678185037f
|
Task【ID1005229】【特权调整】
|
2019-12-16 15:39:44 +08:00 |
zhangshanxue
|
79363da8a6
|
TASK【ID1005286】【达人活动的排行榜优化】
|
2019-12-15 16:15:57 +08:00 |
lvxinran
|
462a035592
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-13 13:44:15 +08:00 |
lvxinran
|
2a62f39194
|
迷宫寻宝提交
|
2019-12-13 13:44:11 +08:00 |
wangyuan
|
f49bfe6f1f
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-12 18:32:58 +08:00 |
wangyuan
|
f90796f702
|
推送巅峰赛进度信息
|
2019-12-12 18:32:54 +08:00 |
zhangshanxue
|
cc0f4c51c1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-12 14:00:41 +08:00 |
wangyuan
|
2efcce2614
|
fix bet
|
2019-12-12 13:45:09 +08:00 |
zhangshanxue
|
ea5ec20b2f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-12 13:37:26 +08:00 |
zhangshanxue
|
926b00a691
|
Task【ID1005229】【特权调整】
|
2019-12-12 13:35:58 +08:00 |
wangyuan
|
4b2d619df6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-12 11:43:01 +08:00 |
wangyuan
|
3b52fbfa63
|
fix globaldata & champion in redis
|
2019-12-12 11:42:56 +08:00 |
zhangshanxue
|
efb20d445e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-12 11:04:10 +08:00 |
lvxinran
|
cb6702ac8e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-13 17:19:31 +08:00 |
lvxinran
|
aa56fb73b7
|
限时抽卡预告
|
2019-12-13 17:19:26 +08:00 |
zhangshanxue
|
de89214bb4
|
BUG【ID1005727】限时活动排行榜奖励邮件,部分玩家没有收到
|
2019-12-13 15:42:20 +08:00 |
zhangshanxue
|
530fc08267
|
Task【ID1005229】【特权调整】
|
2019-12-12 10:59:33 +08:00 |
zhangshanxue
|
ed7545aba3
|
控制台gm命令 netty关闭流程修改
|
2019-12-11 15:19:38 +08:00 |
lvxinran
|
a82d645499
|
活动预告
|
2019-12-11 15:06:49 +08:00 |
lvxinran
|
867f81836a
|
限时抽卡
|
2019-12-13 08:06:58 +08:00 |
lvxinran
|
0d19b9d141
|
限时抽卡
|
2019-12-09 17:10:23 +08:00 |
lvxinran
|
d9c2104c8c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-09 17:01:25 +08:00 |
lvxinran
|
e8512767c5
|
幸运榜
|
2019-12-09 01:23:10 +08:00 |
lvxinran
|
e268424768
|
幸运榜
|
2019-12-09 00:17:16 +08:00 |
lvxinran
|
4d4ccd4703
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-12-08 01:28:38 +08:00 |
zhangshanxue
|
7670285223
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-08 13:42:07 +08:00 |
zhangshanxue
|
9e9ef767b4
|
【ID1005236】【异妖配件属性修改】
|
2019-12-08 13:41:44 +08:00 |
lvxinran
|
d5bb15ce14
|
限时抽卡排行榜
|
2019-12-07 21:08:19 +08:00 |
zhangshanxue
|
e9833d8142
|
【ID1005236】
【异妖配件属性修改】
|
2019-12-07 17:25:11 +08:00 |
wangyuan
|
206aae7aa3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
|
2019-12-06 20:26:50 +08:00 |
wangyuan
|
b28d31d8ae
|
巅峰赛
|
2019-12-06 20:25:52 +08:00 |
wangyuan
|
f35bd27201
|
fix adventure
|
2019-12-05 14:35:17 +08:00 |
lvxinran
|
f755892340
|
公会一键删除,怪物组为空,获取编队为空,地图id为空处理
|
2019-12-07 21:35:48 +08:00 |
zhangshanxue
|
dbc049a621
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-12-08 11:42:04 +08:00 |
zhangshanxue
|
217da21fb9
|
打印内存表数据
|
2019-12-08 11:41:23 +08:00 |
zhangshanxue
|
d3f2023ec8
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-12-08 11:31:19 +08:00 |
zhangshanxue
|
d207c33e28
|
充值接口屏蔽
|
2019-12-08 11:30:53 +08:00 |
wangyuan
|
b75301ba76
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-12-05 11:35:12 +08:00 |
wangyuan
|
954b30e598
|
fix friend
|
2019-12-05 11:35:02 +08:00 |
wangyuan
|
ce74ccb327
|
fix activity
|
2019-12-05 10:44:18 +08:00 |
zhangshanxue
|
8e959d450b
|
活动修改
|
2019-12-04 16:31:16 +08:00 |
lvxinran
|
fa36f01f5a
|
五星成长礼修改
|
2019-12-06 23:46:22 +08:00 |
lvxinran
|
ea908c0c8c
|
任务修改
|
2019-12-06 06:59:58 +08:00 |
lvxinran
|
ca99629f91
|
好友申请列表
|
2019-12-06 04:10:48 +08:00 |
lvxinran
|
83338c7510
|
全部同意好友申请修改
|
2019-12-03 16:36:10 +08:00 |
lvxinran
|
c4522db36a
|
关卡排行榜
|
2019-12-03 16:35:20 +08:00 |
lvxinran
|
c8ddf8c077
|
兽潮排行榜
|
2019-12-17 05:46:08 +08:00 |
wangyuan
|
0ccb33b366
|
fix guild & mail
|
2019-12-03 14:22:21 +08:00 |
wangyuan
|
35bc1e5322
|
fix gm
|
2019-12-03 12:30:34 +08:00 |
wangyuan
|
04d4e8b5e0
|
fix equip
|
2019-12-02 18:31:20 +08:00 |
lvxinran
|
f16a71e03f
|
云梦祈福多期
|
2019-12-17 00:09:13 +08:00 |
lvxinran
|
3c0f236e4d
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-12-02 10:42:04 +08:00 |
lvxinran
|
bb299e4a22
|
敏感字
|
2019-12-02 10:41:58 +08:00 |
wangyuan
|
bacf2fc3b3
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/dao/UserManager.java
|
2019-12-02 10:36:11 +08:00 |
wangyuan
|
349d5a0145
|
fix init mission
|
2019-12-02 10:25:47 +08:00 |
lvxinran
|
340391ca4d
|
关卡排行榜
|
2019-12-02 10:18:54 +08:00 |
lvxinran
|
74fce2865d
|
排行榜修改
|
2019-12-02 10:17:44 +08:00 |
wangyuan
|
b9d9b69b5a
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-11-29 18:36:36 +08:00 |
wangyuan
|
824e845089
|
fix minggan
|
2019-11-29 18:36:13 +08:00 |
zhangshanxue
|
7f57df878a
|
redis string获取错误处理
|
2019-11-29 18:34:26 +08:00 |
wangyuan
|
b4995e599c
|
mingan
|
2019-11-29 18:24:10 +08:00 |
zhangshanxue
|
05a00c8187
|
redis string获取错误处理
|
2019-11-29 17:58:52 +08:00 |
zhangshanxue
|
77f1c94850
|
获取gid
|
2019-11-29 17:28:55 +08:00 |
zhangshanxue
|
1a9f356130
|
获取gid
|
2019-11-29 15:56:39 +08:00 |
zhangshanxue
|
513b0418d3
|
获取gid
|
2019-11-29 15:42:23 +08:00 |
zhangshanxue
|
b36d490f9d
|
获取gid
|
2019-11-29 15:40:21 +08:00 |
zhangshanxue
|
0a9c1f7e2a
|
获取gid
|
2019-11-29 15:12:40 +08:00 |
zhangshanxue
|
0d4e4ee5fd
|
获取gid
|
2019-11-29 12:54:10 +08:00 |
wangyuan
|
b1736e56bc
|
fix activity limit
|
2019-11-29 11:37:46 +08:00 |
lvxinran
|
07cfe90a46
|
logic提交
|
2019-11-29 11:20:36 +08:00 |
lvxinran
|
fea1806186
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-29 11:20:01 +08:00 |
lvxinran
|
262be7dde8
|
排行榜修改
|
2019-11-29 11:19:48 +08:00 |
wangyuan
|
87a14e3131
|
Merge branch 'online_1121'
|
2019-11-28 15:16:23 +08:00 |
wangyuan
|
d69db99784
|
rename
|
2019-11-28 15:14:52 +08:00 |
wangyuan
|
8e843c1195
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-11-28 14:57:17 +08:00 |
wangyuan
|
14678739f8
|
fix remove hero
|
2019-11-28 14:55:47 +08:00 |
wangyuan
|
7de4d9bc9e
|
set login time
|
2019-11-28 14:38:31 +08:00 |
wangyuan
|
99dc03a323
|
fix check token
|
2019-11-28 13:37:42 +08:00 |
wangyuan
|
d30972da3c
|
session
|
2019-11-28 12:14:15 +08:00 |
lvxinran
|
26016b3bf0
|
add redis key
|
2019-11-28 11:46:41 +08:00 |
wangyuan
|
1bc50cff0c
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-11-28 11:34:01 +08:00 |
wangyuan
|
bee222b3c1
|
save
|
2019-11-28 10:53:51 +08:00 |
wangyuan
|
a204fe82b1
|
fix equip
|
2019-11-28 10:48:47 +08:00 |
lvxinran
|
e89ed8c7f0
|
限时抽卡排行
|
2019-11-27 18:09:31 +08:00 |
wangyuan
|
83aac51969
|
reconnect send heart
|
2019-11-27 17:05:09 +08:00 |
lvxinran
|
2c5148e1ed
|
Merge branch 'online_1121'
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/hero/HeroLogic.java
|
2019-11-27 16:10:41 +08:00 |
lvxinran
|
3eddd7610c
|
战力排行榜
|
2019-11-27 15:43:24 +08:00 |
lvxinran
|
e19da91240
|
战力排行榜部分修改
|
2019-11-27 13:36:11 +08:00 |
lvxinran
|
0de4e4b58d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-27 10:49:11 +08:00 |
lvxinran
|
2e21d0f580
|
排行榜重构修改
|
2019-11-27 10:49:05 +08:00 |
wangyuan
|
b3834ed6ee
|
fix fight
|
2019-11-27 10:33:27 +08:00 |
wangyuan
|
f426a7599d
|
fix guild indicaiton
|
2019-11-27 10:07:40 +08:00 |
zhangshanxue
|
f09bb2b684
|
关卡限制活动
|
2019-11-27 09:52:04 +08:00 |
zhangshanxue
|
e1786b61f7
|
关卡限制活动
|
2019-11-27 09:30:02 +08:00 |
wangyuan
|
4f8bc6ba15
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-11-26 17:42:38 +08:00 |
wangyuan
|
ad4a55b2ce
|
fight opti
|
2019-11-26 17:41:38 +08:00 |
wangyuan
|
307768615b
|
fix activity
|
2019-11-26 17:22:31 +08:00 |
zhangshanxue
|
f1dc0fcb4c
|
网络模块优化
|
2019-11-26 16:45:29 +08:00 |
zhangshanxue
|
ff0279bddc
|
回退多注释的
|
2019-11-26 15:55:29 +08:00 |
lvxinran
|
7d26a0da25
|
公会宣言长度
|
2019-11-26 15:29:43 +08:00 |
zhangshanxue
|
aab51ba39c
|
五星成长礼按天刷新
|
2019-12-02 18:32:40 +08:00 |
zhangshanxue
|
8c16c9d9c5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-26 11:17:32 +08:00 |
zhangshanxue
|
ff37fa5d2c
|
网络模块优化
|
2019-11-26 11:17:06 +08:00 |
zhangshanxue
|
3cdb228594
|
五星英雄成长礼
|
2019-11-25 23:13:52 +08:00 |
zhangshanxue
|
ba1cb23fb2
|
五星英雄成长礼
|
2019-11-25 22:12:44 +08:00 |
zhangshanxue
|
26f06a54ae
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-11-25 21:53:50 +08:00 |
zhangshanxue
|
3cf23b39ff
|
recharge协议合并策略
|
2019-11-25 21:17:29 +08:00 |
zhangshanxue
|
27d7504a0e
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-11-25 20:19:12 +08:00 |
zhangshanxue
|
28cb6035d4
|
五星英雄成长礼
|
2019-11-25 20:17:30 +08:00 |
wangyuan
|
f4f4b87dc7
|
fix map mission cal
|
2019-11-25 17:29:11 +08:00 |
lvxinran
|
2c35bf1b38
|
部分表字段初始化代码修改
|
2019-11-25 17:11:21 +08:00 |
wangyuan
|
26309eb920
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-11-25 16:13:57 +08:00 |
wangyuan
|
df7b1345b6
|
change fight
|
2019-11-25 16:13:24 +08:00 |
lvxinran
|
9c68ef183a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/globals/GlobalGm.java
# serverlogic/src/main/java/com/ljsd/jieling/handler/GameGM/GMRequestHandler.java
|
2019-12-10 03:38:00 +08:00 |
lvxinran
|
55549574e4
|
一键异妖GM,一键科技树GM
|
2019-12-10 03:34:16 +08:00 |
wangyuan
|
3785d4c2f1
|
fix
|
2019-11-25 15:36:45 +08:00 |
wangyuan
|
07210538c5
|
保底
|
2019-11-25 14:14:03 +08:00 |
wangyuan
|
8807cc06ea
|
保底
|
2019-11-25 12:10:05 +08:00 |
wangyuan
|
5203b5011e
|
优先检测活动刷新
|
2019-12-25 11:14:07 +08:00 |
lvxinran
|
89122a8afd
|
function修改
|
2019-11-25 11:34:34 +08:00 |
wangyuan
|
368006246b
|
ranfom pool
|
2019-11-25 10:36:38 +08:00 |
wangyuan
|
37f5729309
|
activity mail
|
2019-11-23 18:03:31 +08:00 |
lvxinran
|
813ffebec6
|
检测功能开启修改
|
2019-11-23 17:56:42 +08:00 |
lvxinran
|
e266403589
|
功能开启关闭修改
|
2019-11-23 17:15:18 +08:00 |
zhangshanxue
|
85eae5a303
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
|
2019-11-23 14:20:13 +08:00 |
zhangshanxue
|
c4fbe5379b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/GameApplication.java
# serverlogic/src/main/java/com/ljsd/jieling/network/server/ProtocolsManager.java
# serverlogic/src/main/java/com/ljsd/jieling/network/session/ISession.java
# serverlogic/src/main/java/com/ljsd/jieling/thread/ThreadManager.java
|
2019-11-23 14:17:58 +08:00 |
lvxinran
|
3c59042b88
|
合并online分支
|
2019-11-23 14:11:20 +08:00 |
zhangshanxue
|
12692a6ff9
|
网络模块重构和服务器启动优化
|
2019-11-23 12:11:03 +08:00 |
zhangshanxue
|
c369ac8d48
|
活动修改
|
2019-11-23 11:21:42 +08:00 |
wangyuan
|
1631f01146
|
activity & chat limit message length
|
2019-11-25 10:51:08 +08:00 |
wangyuan
|
199c559446
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-11-24 19:42:35 +08:00 |
wangyuan
|
bda2d610f0
|
activity
|
2019-11-24 19:42:22 +08:00 |
zhangshanxue
|
843e4f921d
|
活动修改
|
2019-11-23 11:15:43 +08:00 |
lvxinran
|
7cd52a347a
|
巅峰赛类型修改,坐骑升级修改
|
2019-12-17 02:30:07 +08:00 |
lvxinran
|
fc7ed5bde3
|
坐骑、装饰代码提交
|
2019-11-26 00:12:32 +08:00 |
lvxinran
|
c73d9fe16e
|
充值修改
|
2019-11-22 19:10:13 +08:00 |
lvxinran
|
11c188938e
|
空物品判断
|
2019-11-22 17:32:58 +08:00 |
lvxinran
|
92736c1034
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
|
2019-12-18 00:40:57 +08:00 |
lvxinran
|
183c32a12a
|
工会修改名字
|
2019-12-18 00:40:42 +08:00 |
lvxinran
|
b00ab56b99
|
公会改名提交
|
2019-12-17 22:15:06 +08:00 |
lvxinran
|
460a9ad41a
|
试炼本修改
|
2019-12-17 21:56:30 +08:00 |
lvxinran
|
88e1a59289
|
修改退出地图
|
2019-12-17 00:43:21 +08:00 |
lvxinran
|
1ab6d2a649
|
Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/map/MapLogic.java
|
2019-12-17 00:41:09 +08:00 |
lvxinran
|
eedab65f21
|
强制退出
|
2019-12-17 00:40:38 +08:00 |
lvxinran
|
28efc91bc9
|
无尽修改
|
2019-12-17 00:00:51 +08:00 |
wangyuan
|
bbbd0d60d7
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-11-22 16:41:13 +08:00 |
wangyuan
|
db8aeac335
|
元素招募 & 新活动(新手福利)
|
2019-11-22 16:39:54 +08:00 |
wangyuan
|
56338b360f
|
reconnect endlessmap
|
2019-11-21 16:14:45 +08:00 |
wangyuan
|
f6431e2e0f
|
Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121
|
2019-11-21 13:44:19 +08:00 |
wangyuan
|
9c337089b4
|
fix mission
|
2019-11-21 13:43:48 +08:00 |
lvxinran
|
78c7305631
|
无尽删除信息修改
|
2019-11-21 10:27:17 +08:00 |
wangyuan
|
d35d459169
|
fix arena mission
|
2019-11-21 10:09:40 +08:00 |
lvxinran
|
a5e797d543
|
公会战修改血量百分比
|
2019-11-20 18:34:34 +08:00 |
lvxinran
|
95b447e494
|
外观装饰获取提交
|
2019-11-20 18:01:45 +08:00 |
lvxinran
|
04bc46d6d7
|
修改装饰提交
|
2019-11-20 17:59:41 +08:00 |
lvxinran
|
7d02b70750
|
解散工会修改
|
2019-11-20 11:59:55 +08:00 |
lvxinran
|
d786c79bf7
|
公会战战斗时长修改
|
2019-11-19 17:58:06 +08:00 |
lvxinran
|
16b7479c8c
|
无尽赛季结束修改
|
2019-12-10 03:48:23 +08:00 |
wangyuan
|
3679665bb6
|
gm hero full level
|
2019-11-19 11:15:30 +08:00 |
zhangshanxue
|
567cecad79
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-18 18:32:00 +08:00 |
zhangshanxue
|
7cda58659d
|
日志
|
2019-11-18 18:31:55 +08:00 |
wangyuan
|
40611e8205
|
fix arena & fix mainlevel
|
2019-11-18 17:26:39 +08:00 |
wangyuan
|
503217bc43
|
fix thead
|
2019-11-18 16:21:10 +08:00 |
lvxinran
|
f79437f32b
|
公会战星数修改
|
2019-11-18 18:37:19 +08:00 |
wangyuan
|
9053c6c8c5
|
fix time
|
2019-11-18 14:00:50 +08:00 |
wangyuan
|
b31764a7d5
|
reload role
|
2019-11-18 10:12:55 +08:00 |
wangyuan
|
30af8125d3
|
mutilplaty login
|
2019-11-15 16:37:44 +08:00 |
wangyuan
|
0bcc3efb92
|
fix arena mission
|
2019-11-15 15:58:26 +08:00 |
lvxinran
|
006ce7b1e6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-30 09:05:59 +08:00 |
lvxinran
|
301cbbd25d
|
黑名单处理
|
2019-11-30 09:05:54 +08:00 |
lvxinran
|
2b17fe1f43
|
一键领取友情点
|
2019-11-17 11:00:14 +08:00 |
wangyuan
|
a0d9550bc7
|
fix bug
|
2019-11-14 18:29:24 +08:00 |
wangyuan
|
24efd56068
|
fix mission
|
2019-11-14 18:24:45 +08:00 |
wangyuan
|
ed7bd22bd7
|
fix check time
|
2019-11-14 14:53:09 +08:00 |
wangyuan
|
e224d50506
|
fix reconnnect recory
|
2019-11-17 13:52:35 +08:00 |
zhangshanxue
|
be16318ce5
|
gm限制
|
2019-11-14 13:47:49 +08:00 |
wangyuan
|
52aa71a362
|
修复过五点重连不刷新
|
2019-11-14 11:29:41 +08:00 |
wangyuan
|
440569211f
|
修复过五点重连不刷新
|
2019-11-14 10:36:51 +08:00 |
wangyuan
|
1ed45e2a46
|
fix battle buffer
|
2019-11-13 16:23:28 +08:00 |
lvxinran
|
dd46d9e219
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-13 16:05:02 +08:00 |
wangyuan
|
c01405846d
|
fix battle buffer
|
2019-11-13 16:06:50 +08:00 |
lvxinran
|
c91544f1b6
|
公会提示
|
2019-11-13 16:04:56 +08:00 |
lvxinran
|
40b43048b5
|
战力公式计算
|
2019-11-13 15:22:55 +08:00 |
lvxinran
|
c9ae1a8ccd
|
公会提示,怪物战力计算
|
2019-11-13 14:31:22 +08:00 |
lvxinran
|
d93f8c2242
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-13 11:07:04 +08:00 |
lvxinran
|
fe098a2443
|
公会任务修改
|
2019-11-13 11:06:58 +08:00 |
wangyuan
|
2a2c0d921b
|
del record
|
2019-11-12 18:14:09 +08:00 |
wangyuan
|
4d13d9eac8
|
fix arena
|
2019-11-12 17:56:30 +08:00 |
wangyuan
|
38236142b3
|
fix arena
|
2019-11-12 17:41:28 +08:00 |
wangyuan
|
7f7ec207f9
|
fix online reward
|
2019-11-12 16:33:40 +08:00 |
lvxinran
|
ad721607bb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-12 11:35:07 +08:00 |
lvxinran
|
fd6f075151
|
试炼本推送删除
|
2019-11-12 11:35:02 +08:00 |
lvxinran
|
e6aa788f21
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-30 22:29:39 +08:00 |
lvxinran
|
3b722004b9
|
在线奖励
|
2019-11-30 22:29:34 +08:00 |
wangyuan
|
3be4be40e6
|
fix defscore
|
2019-11-12 11:21:39 +08:00 |
wangyuan
|
f5955def99
|
fix store gm
|
2019-11-11 20:49:29 +08:00 |
zhangshanxue
|
6dd5cd1cde
|
Merge branch 'develope_v1'
|
2019-11-11 19:06:58 +08:00 |
zhangshanxue
|
2b3001dc3b
|
兽潮战斗数据给前端
|
2019-11-11 17:42:27 +08:00 |
wangyuan
|
335576e6b5
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-11-11 17:20:02 +08:00 |
lvxinran
|
986132b500
|
精英副本计数
|
2019-11-20 14:38:00 +08:00 |
lvxinran
|
269994ca54
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-20 14:26:55 +08:00 |
lvxinran
|
25a0c84064
|
异步线程修改,任务线程新增
|
2019-11-20 14:26:50 +08:00 |
lvxinran
|
516002defb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-20 11:26:47 +08:00 |
lvxinran
|
a1f8b46f9e
|
竞技场任务修改
|
2019-11-20 11:26:37 +08:00 |
zhangshanxue
|
cfb59d2db7
|
兽潮战斗数据给前端
|
2019-11-11 17:19:38 +08:00 |
wangyuan
|
7a45906350
|
fix online reward
|
2019-11-11 17:19:18 +08:00 |
wangyuan
|
ee60381725
|
fix store refresh
|
2019-11-11 13:48:18 +08:00 |
wangyuan
|
65bcf21de6
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-11-11 11:27:37 +08:00 |
wangyuan
|
dc4b4402a5
|
固定刷新
|
2019-11-11 11:27:18 +08:00 |
wangyuan
|
dd187758b2
|
fix
|
2019-11-11 10:51:45 +08:00 |
wangyuan
|
8462e03b43
|
sore flush
|
2019-11-11 10:48:33 +08:00 |
lvxinran
|
29d1439c50
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-08 14:01:20 +08:00 |
wangyuan
|
0fb2d0d0bd
|
hint
|
2019-11-08 14:01:00 +08:00 |
lvxinran
|
a41bb196cb
|
友情点
|
2019-11-08 14:00:55 +08:00 |
wangyuan
|
8abdf0aa15
|
add server time
|
2019-11-08 14:00:23 +08:00 |
lvxinran
|
30de1e8ff5
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-08 10:28:13 +08:00 |
lvxinran
|
5f5e9c8541
|
无尽修改
|
2019-11-08 10:28:08 +08:00 |
wangyuan
|
f96261e7e0
|
FIX
|
2019-11-07 21:37:19 +08:00 |
wangyuan
|
2dd97a9988
|
fix mission
|
2019-11-07 20:50:54 +08:00 |
wangyuan
|
41a99da5ca
|
fix mision
|
2019-11-07 20:39:03 +08:00 |
wangyuan
|
bb9b330c50
|
fix monster force
|
2019-11-07 19:53:02 +08:00 |
lvxinran
|
800975a0a5
|
无尽默认值修改
|
2019-11-07 18:43:18 +08:00 |
wangyuan
|
c8a03c009d
|
fix arena season
|
2019-11-07 17:21:35 +08:00 |
wangyuan
|
d57017535f
|
exception
|
2019-11-07 15:41:45 +08:00 |
wangyuan
|
371d47063a
|
fix hero diaplay level
|
2019-11-07 15:40:03 +08:00 |
lvxinran
|
de35a2dde7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-07 21:54:50 +08:00 |
lvxinran
|
beac5b3b61
|
RedisKey修改
|
2019-11-07 21:54:46 +08:00 |
wangyuan
|
7d8ceae861
|
fix robot level
|
2019-11-07 14:17:41 +08:00 |
wangyuan
|
934a5af05a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-11-07 12:04:55 +08:00 |
lvxinran
|
963ce826a9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-12 16:57:26 +08:00 |
lvxinran
|
bbaf8c382d
|
rediskey修改
|
2019-11-12 16:57:21 +08:00 |
wangyuan
|
255c9277ce
|
fix store
|
2019-11-09 05:01:41 +08:00 |
wangyuan
|
76f1408171
|
fix item
|
2019-11-08 05:14:27 +08:00 |
wangyuan
|
2c21b1e9c4
|
robot hero info
|
2019-11-07 12:04:29 +08:00 |
lvxinran
|
29595f48e0
|
事件点战力
|
2019-11-06 18:14:21 +08:00 |
wangyuan
|
f3587b62cf
|
优化
|
2019-11-06 16:57:11 +08:00 |
wangyuan
|
ed93054208
|
result
|
2019-11-06 16:53:59 +08:00 |
wangyuan
|
5a25ecf00e
|
fix fight result
|
2019-11-06 16:48:09 +08:00 |
lvxinran
|
fc7db60512
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-06 16:25:22 +08:00 |
lvxinran
|
0d461892e4
|
删除无用字段
|
2019-11-06 16:25:18 +08:00 |
lvxinran
|
cdf7a2ba30
|
验证此次公会战加入的
|
2019-11-09 19:04:54 +08:00 |
wangyuan
|
f24b6f3ccb
|
set open server time & fix random reward
|
2019-11-06 16:21:40 +08:00 |
wangyuan
|
3e338096d5
|
arena fight result
|
2019-11-06 16:17:01 +08:00 |
lvxinran
|
b41d7217ca
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-06 13:54:48 +08:00 |
lvxinran
|
2d332d205b
|
法宝掉落修改
|
2019-11-06 13:54:34 +08:00 |
zhangshanxue
|
f81124b5f9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-06 13:52:31 +08:00 |
zhangshanxue
|
fbe7d1b23d
|
黑名单 服务器检查
|
2019-11-06 13:52:23 +08:00 |
lvxinran
|
7e0d37f785
|
物品掉落
|
2019-11-06 11:31:28 +08:00 |
lvxinran
|
cc6da29f57
|
装备 法宝 修改
|
2019-11-05 18:27:06 +08:00 |
lvxinran
|
75d5c4aff2
|
装备修改
|
2019-11-05 17:57:28 +08:00 |
lvxinran
|
9923f31a7d
|
无尽修改
|
2019-11-05 16:58:10 +08:00 |
wangyuan
|
2a55d0779d
|
view arena rank
|
2019-11-05 15:34:09 +08:00 |
lvxinran
|
9c60e7b986
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-05 15:15:30 +08:00 |
lvxinran
|
caa48c2cd0
|
公会大区修改,生成消耗原因方法提交
|
2019-11-05 15:15:26 +08:00 |
zhangshanxue
|
790e37a7a0
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-05 14:58:21 +08:00 |
zhangshanxue
|
9a5dd40e29
|
起服前检查
|
2019-11-05 14:58:17 +08:00 |
wangyuan
|
90d9fee405
|
change time hour to minute
|
2019-11-05 14:33:25 +08:00 |
lvxinran
|
d070f16564
|
观星任务修改
|
2019-11-04 19:53:46 +08:00 |
lvxinran
|
8944b8596c
|
领取友情点
|
2019-11-04 19:15:21 +08:00 |
zhangshanxue
|
4da9bc7b7d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-04 18:25:51 +08:00 |
zhangshanxue
|
205481e8ab
|
自动开服配置
|
2019-11-04 18:25:48 +08:00 |
lvxinran
|
67d0f78d5b
|
地图修改
|
2019-11-04 18:11:16 +08:00 |
wangyuan
|
21e2a5202d
|
guide change
|
2019-11-04 17:41:28 +08:00 |
wangyuan
|
3fcd003d5c
|
fix buy store mission
|
2019-11-04 16:40:29 +08:00 |
lvxinran
|
c07f2f2b2b
|
更新地图修改
|
2019-11-04 15:03:25 +08:00 |
lvxinran
|
6255cabae5
|
精英本退出地图
|
2019-11-04 14:48:45 +08:00 |
wangyuan
|
dda12ccfec
|
fix gm
|
2019-11-04 14:40:31 +08:00 |
wangyuan
|
596a8bf291
|
fix
|
2019-11-04 12:15:48 +08:00 |
wangyuan
|
c77c23c2ca
|
backup arena season rank info
|
2019-11-04 12:14:40 +08:00 |
lvxinran
|
80f71c5ca7
|
邮件删除
|
2019-11-04 10:57:57 +08:00 |
lvxinran
|
e2a6865f20
|
邮件领取
|
2019-11-04 10:40:56 +08:00 |
wangyuan
|
09a53abfb5
|
fix reward
|
2019-11-02 11:52:23 +08:00 |
lvxinran
|
6b28068a8e
|
公会战大区
|
2019-11-01 15:24:46 +08:00 |
lvxinran
|
21059efe4a
|
地图提交
|
2019-11-01 15:22:26 +08:00 |
wangyuan
|
afa01af21b
|
daily fresh
|
2019-11-01 11:03:06 +08:00 |
zhangshanxue
|
4c4c942c87
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/handler/BaseHandler.java
|
2019-11-01 10:17:53 +08:00 |
wangyuan
|
dca7c2fc53
|
fix
|
2019-11-03 10:07:05 +08:00 |
zhangshanxue
|
5820505d71
|
异常和错误提示修改
|
2019-11-01 10:13:50 +08:00 |
lvxinran
|
84efb610d8
|
加入公会任务
|
2019-10-31 20:47:14 +08:00 |
wangyuan
|
ff3cd9a3dc
|
fix reconnect
|
2019-11-02 19:04:21 +08:00 |
wangyuan
|
5dc42912c1
|
fix
|
2019-11-02 18:02:23 +08:00 |
wangyuan
|
a49190f281
|
fix init
|
2019-11-02 17:19:29 +08:00 |
wangyuan
|
a08d6048ba
|
fix relogin
|
2019-11-02 17:13:07 +08:00 |
wangyuan
|
e11257f348
|
delete unuse log
|
2019-11-02 16:54:30 +08:00 |
wangyuan
|
4c12a4c959
|
fix
|
2019-11-02 16:52:44 +08:00 |
lvxinran
|
44f726aaa7
|
地图优化
|
2019-10-31 16:30:25 +08:00 |
zhangshanxue
|
c304989a48
|
好友报错
|
2019-10-31 16:20:48 +08:00 |
lvxinran
|
b6747e3746
|
删除无用
|
2019-10-31 14:48:05 +08:00 |
lvxinran
|
8b8a89cd73
|
怪物战力
|
2019-10-31 14:18:54 +08:00 |
lvxinran
|
2fc51f01c8
|
初始化set
|
2019-10-31 11:57:33 +08:00 |
lvxinran
|
6254f55ced
|
删除无用注释
|
2019-10-31 11:51:43 +08:00 |
lvxinran
|
8f58c62930
|
第一次进副本类型
|
2019-10-31 11:42:47 +08:00 |
lvxinran
|
b35bfe0d1e
|
好友申请全部同意
|
2019-10-31 10:45:26 +08:00 |
lvxinran
|
db6dd9e9b6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-30 20:46:51 +08:00 |
wangyuan
|
ef408a0d4c
|
fix fight type
|
2019-11-01 19:35:43 +08:00 |
lvxinran
|
4133c142c5
|
好友申请
|
2019-10-30 20:46:46 +08:00 |
wangyuan
|
c73dc313df
|
update
|
2019-10-30 19:08:29 +08:00 |
wangyuan
|
ecfed62e5d
|
fix fight
|
2019-10-30 19:05:21 +08:00 |
wangyuan
|
0dbbcd8456
|
fix robot pokemon skill data
|
2019-10-30 17:49:05 +08:00 |
lvxinran
|
6047c1e151
|
地图type
|
2019-10-30 15:58:27 +08:00 |
lvxinran
|
be06376686
|
试炼本修改
|
2019-11-02 17:13:13 +08:00 |
lvxinran
|
43ee84f538
|
出地图方法优化
|
2019-11-01 16:46:00 +08:00 |
lvxinran
|
256099e1a1
|
Merge branch 'master' into develop
|
2019-10-31 21:09:04 +08:00 |
lvxinran
|
217faa3b6f
|
地图优化
|
2019-10-31 18:56:31 +08:00 |
zhangshanxue
|
e5d58a9f32
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-30 15:25:25 +08:00 |
zhangshanxue
|
203c5c8f2c
|
活动排行榜
|
2019-10-30 15:25:21 +08:00 |
wangyuan
|
436ca6ba7c
|
fix exp
|
2019-10-30 14:57:49 +08:00 |
lvxinran
|
dcc2aa541f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-02 17:27:54 +08:00 |
lvxinran
|
e6e27f722c
|
加入公会任务
|
2019-11-02 17:27:06 +08:00 |
zhangshanxue
|
6d14df0625
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-30 14:18:51 +08:00 |
wangyuan
|
d6e2822724
|
fix fight time
|
2019-10-30 14:18:05 +08:00 |
zhangshanxue
|
f93bfc4ea3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-30 10:46:58 +08:00 |
zhangshanxue
|
ca6a2a2658
|
排行榜结算标题
|
2019-10-30 10:46:24 +08:00 |
wangyuan
|
af304a8d85
|
fix usermission & guild
|
2019-10-29 17:17:40 +08:00 |
wangyuan
|
fab234e810
|
battle & fix export excel
|
2019-10-29 13:51:59 +08:00 |
lvxinran
|
b1ebb94ab9
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-31 14:47:57 +08:00 |
lvxinran
|
5bb8e95aa1
|
公会申请数据修改
|
2019-10-31 14:47:52 +08:00 |
lvxinran
|
3f6113ca9f
|
工会申请保留时间
|
2019-10-31 14:36:52 +08:00 |
lvxinran
|
156456a98e
|
领取邮件判断
|
2019-10-30 13:59:56 +08:00 |
lvxinran
|
d1b82a3879
|
戒灵秘宝奖励修改
|
2019-10-29 21:07:35 +08:00 |
zhangshanxue
|
121f54fff3
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-29 11:33:32 +08:00 |
zhangshanxue
|
6189cec63c
|
异常和错误提示修改
|
2019-10-29 11:33:26 +08:00 |
wangyuan
|
2fea6f9a36
|
fix itemutil
|
2019-10-28 15:23:00 +08:00 |
wangyuan
|
fa9e192375
|
fix item view
|
2019-10-28 14:36:19 +08:00 |
zhangshanxue
|
09bc84ebcc
|
重置活动 补发全部奖励
|
2019-10-28 13:51:22 +08:00 |
zhangshanxue
|
5338c735b1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-28 11:47:11 +08:00 |
zhangshanxue
|
452d1a84b9
|
重置活动 补发全部奖励
|
2019-11-28 11:46:45 +08:00 |
wangyuan
|
70dcd12c42
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-28 11:36:08 +08:00 |
wangyuan
|
520950456d
|
fix rank
|
2019-10-28 11:35:35 +08:00 |
wangyuan
|
6dca605039
|
挂机奖励预览
|
2019-10-30 11:04:59 +08:00 |
lvxinran
|
6abcb5ce6b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-28 11:23:17 +08:00 |
lvxinran
|
f8174bddc1
|
法宝加成判断,公会职位推送修改
|
2019-10-28 11:23:13 +08:00 |
wangyuan
|
93643930c6
|
fixc resend
|
2019-10-27 17:35:16 +08:00 |
wangyuan
|
b0ef60d864
|
filter 0
|
2019-10-27 16:37:24 +08:00 |
wangyuan
|
3df321bc11
|
hero
|
2019-10-27 16:18:08 +08:00 |
zhangshanxue
|
ccc0b8512a
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-25 15:34:53 +08:00 |
wangyuan
|
a07565b16b
|
rank
|
2019-10-27 15:34:21 +08:00 |
wangyuan
|
8b0480c652
|
fix fight rank
|
2019-10-27 12:03:07 +08:00 |
zhangshanxue
|
be7a119263
|
异常和错误提示修改
|
2019-10-25 15:34:46 +08:00 |
zhangshanxue
|
b946685cdf
|
跑马灯
|
2019-10-25 15:27:24 +08:00 |
zhangshanxue
|
62e5c9314c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-25 11:57:08 +08:00 |
wangyuan
|
d1f50fddf7
|
fix fight hero passskill
|
2019-10-27 11:33:27 +08:00 |
zhangshanxue
|
14e86450a4
|
跑马灯
|
2019-10-25 11:57:03 +08:00 |
zhangshanxue
|
070774cc6b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-24 10:34:07 +08:00 |
zhangshanxue
|
d2be1a3355
|
异常和错误提示修改
|
2019-10-24 10:34:02 +08:00 |
lvxinran
|
d254b2793b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-23 17:38:51 +08:00 |
lvxinran
|
e50658debc
|
背包上限修改
|
2019-10-23 17:38:46 +08:00 |
zhangshanxue
|
bbfbfc5c9b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-23 17:36:07 +08:00 |
zhangshanxue
|
30a775ff89
|
异常和错误提示修改
|
2019-10-23 17:36:03 +08:00 |
wangyuan
|
47e0d4fb65
|
fix adventure rewrd
|
2019-10-23 15:11:53 +08:00 |
lvxinran
|
5ed723c9da
|
无尽副本修改
|
2019-10-23 14:48:40 +08:00 |
lvxinran
|
3fad81a218
|
公会战安慰奖励
|
2019-10-24 00:11:43 +08:00 |
lvxinran
|
fa6f4e546d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-23 22:12:19 +08:00 |
lvxinran
|
49453817c2
|
背包已满处理
|
2019-10-23 22:12:14 +08:00 |
lvxinran
|
21b79fcf03
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-22 21:45:11 +08:00 |
lvxinran
|
8a761ab982
|
公会战条件
|
2019-10-22 21:45:06 +08:00 |
wangyuan
|
c536c8c6a5
|
fix adventure reward
|
2019-10-22 14:06:50 +08:00 |
zhangshanxue
|
6f4f669923
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-22 11:59:36 +08:00 |
zhangshanxue
|
bfdddc8158
|
异常和错误提示修改
|
2019-10-22 11:59:23 +08:00 |
wangyuan
|
30c61f868f
|
just one hero in team when init user
|
2019-10-22 10:38:32 +08:00 |
wangyuan
|
915639672d
|
fix week send time
|
2019-10-22 10:34:53 +08:00 |
wangyuan
|
d588467de9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-21 20:21:27 +08:00 |
wangyuan
|
0d73139b22
|
boss
|
2019-10-21 19:17:39 +08:00 |
lvxinran
|
634bdf6317
|
公会战阶段信息无公会判断
|
2019-10-21 17:53:28 +08:00 |
lvxinran
|
dbaac6a1c7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-21 15:25:16 +08:00 |
lvxinran
|
554c62964b
|
公会邮件修改
|
2019-10-21 15:25:11 +08:00 |
wangyuan
|
6ac4dc6cea
|
fix chat
|
2019-10-21 14:39:32 +08:00 |
wangyuan
|
b9b8eaba39
|
pokemon skill
|
2019-10-21 14:20:56 +08:00 |
wangyuan
|
223a0a8216
|
fix mission
|
2019-10-21 10:10:22 +08:00 |
wangyuan
|
3bc2f7d755
|
fix daily mission
|
2019-10-18 17:49:10 +08:00 |
wangyuan
|
fa0a8f7990
|
fix
|
2019-11-18 17:43:24 +08:00 |
wangyuan
|
be434caaee
|
fix
|
2019-10-18 17:33:00 +08:00 |
wangyuan
|
425d3bd03a
|
change task
|
2019-10-18 16:58:32 +08:00 |
lvxinran
|
237b1d5683
|
公会战修改
|
2019-10-18 14:02:40 +08:00 |
lvxinran
|
550a383acf
|
公会战力修改
|
2019-10-18 10:41:55 +08:00 |
lvxinran
|
363aa9afad
|
公会战修改
|
2019-10-18 10:22:35 +08:00 |
wangyuan
|
693097895b
|
fix bug
|
2019-10-17 18:07:10 +08:00 |
wangyuan
|
321e8fab22
|
fix serverlogic
|
2019-10-17 17:56:09 +08:00 |
lvxinran
|
d4d04d44a2
|
邮件改为 错误码
|
2019-10-17 17:39:01 +08:00 |
lvxinran
|
31c48619dd
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 16:53:03 +08:00 |
lvxinran
|
c3f35cce43
|
转让会长修改
|
2019-10-17 16:52:57 +08:00 |
wangyuan
|
c87291d6ca
|
change remaintime to leveltime
|
2019-10-17 16:38:38 +08:00 |
lvxinran
|
7d255d416b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 16:24:09 +08:00 |
lvxinran
|
1bd24f20d8
|
公会战修改
|
2019-10-17 16:24:04 +08:00 |
zhangshanxue
|
3f1300a0f6
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 15:25:27 +08:00 |
zhangshanxue
|
eb4064b821
|
排行榜优化
|
2019-10-17 15:25:23 +08:00 |
lvxinran
|
abe5e76f64
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 15:01:49 +08:00 |
lvxinran
|
df36a686cf
|
公会布防人数修改
|
2019-10-17 15:01:44 +08:00 |
lvxinran
|
91acb26eed
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-11-02 05:43:21 +08:00 |
lvxinran
|
4702609ebb
|
云梦祈福活动修改
|
2019-11-02 05:43:16 +08:00 |
lvxinran
|
dcdb7bd330
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-30 15:18:33 +08:00 |
lvxinran
|
663680048b
|
戒灵秘宝修改
|
2019-10-30 15:18:28 +08:00 |
wangyuan
|
b77dd92777
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-17 13:48:01 +08:00 |
wangyuan
|
29c503412b
|
fix mainlevel
|
2019-10-17 13:47:04 +08:00 |
wangyuan
|
308ff97757
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-10-16 17:17:46 +08:00 |
wangyuan
|
fa15abe76d
|
add guild name
|
2019-10-16 17:17:28 +08:00 |
wangyuan
|
cdde4a9ef3
|
add hero info
|
2019-10-16 15:09:22 +08:00 |
lvxinran
|
eba1a6bd0e
|
无尽本修改
|
2019-10-16 14:16:23 +08:00 |
lvxinran
|
5fb0071318
|
戒灵秘宝等级推送删除
|
2019-10-16 13:53:20 +08:00 |
zhangshanxue
|
aa2d6d0648
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-16 11:25:07 +08:00 |
zhangshanxue
|
a2ac1eaf28
|
跑马灯
|
2019-10-16 11:25:03 +08:00 |
zhangshanxue
|
146444119f
|
排行榜判null
|
2019-10-16 11:23:56 +08:00 |
lvxinran
|
c0a0514fe7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-16 10:20:59 +08:00 |
lvxinran
|
b3e6d44a8b
|
邮件获取修改
|
2019-10-16 10:20:54 +08:00 |
lvxinran
|
a2b6955507
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-17 01:01:02 +08:00 |
lvxinran
|
164a3cb45f
|
头像提交
|
2019-10-17 01:00:57 +08:00 |
wangyuan
|
46e26c9959
|
view hero detail
|
2019-10-15 16:53:08 +08:00 |
wangyuan
|
589138f8a1
|
view team info
|
2019-10-15 16:15:08 +08:00 |
wangyuan
|
d5b455eb27
|
view team details
|
2019-10-15 14:31:54 +08:00 |
wangyuan
|
8f34ad884a
|
fix activity
|
2019-10-15 10:22:08 +08:00 |
wangyuan
|
539c43c50e
|
extra drop
|
2019-10-14 19:59:00 +08:00 |
lvxinran
|
c87de8e301
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-10-14 18:09:25 +08:00 |
lvxinran
|
29b7f592e8
|
公会战修改
|
2019-10-14 18:08:44 +08:00 |
lvxinran
|
c70b7b17ef
|
邮件修改
|
2019-10-15 08:08:14 +08:00 |
wangyuan
|
a3eed6219f
|
store close
|
2019-10-14 17:27:03 +08:00 |
wangyuan
|
f531fd85d6
|
fix store open
|
2019-10-14 17:17:25 +08:00 |