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 |
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 |
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 |
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 |
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 |
zhangshanxue
|
c304989a48
|
好友报错
|
2019-10-31 16:20:48 +08:00 |
lvxinran
|
8b8a89cd73
|
怪物战力
|
2019-10-31 14:18:54 +08:00 |
lvxinran
|
2fc51f01c8
|
初始化set
|
2019-10-31 11:57:33 +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 |
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 |