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 |
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 |