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 |