wangyuan
|
87c2c32a44
|
fix mission
|
2019-08-15 21:04:40 +08:00 |
lvxinran
|
ed50688201
|
公会战
|
2019-08-16 11:13:52 +08:00 |
wangyuan
|
07d68f5c69
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-15 18:30:01 +08:00 |
lvxinran
|
b7cd108b76
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-20 08:16:58 +08:00 |
lvxinran
|
ec0000e220
|
第一次十连抽
|
2019-08-20 08:16:53 +08:00 |
wangyuan
|
714599814e
|
add task
|
2019-08-15 18:29:46 +08:00 |
wangyuan
|
95e7381a2e
|
print tlog
|
2019-08-15 16:49:19 +08:00 |
wangyuan
|
94302befde
|
fix activity
|
2019-08-14 15:14:29 +08:00 |
lvxinran
|
02e214f754
|
名字修改
|
2019-08-14 11:56:54 +08:00 |
lvxinran
|
cd4ad1da3a
|
日志修改
|
2019-08-14 11:44:23 +08:00 |
lvxinran
|
2e72e3e3f6
|
名字长度
|
2019-08-14 11:31:17 +08:00 |
lvxinran
|
38715c4bfd
|
功绩修改
|
2019-08-14 13:12:54 +08:00 |
wangyuan
|
f44da1b677
|
basehandler 构造方法
|
2019-08-18 18:15:07 +08:00 |
wangyuan
|
6046207b77
|
fix mail & store num & indication user level
|
2019-08-18 17:21:25 +08:00 |
zhangshanxue
|
6631ea50f3
|
协议解析
|
2019-08-13 17:11:38 +08:00 |
wangyuan
|
4255e37558
|
reason
|
2019-08-13 14:35:27 +08:00 |
lvxinran
|
80f7c4331e
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-13 14:25:27 +08:00 |
lvxinran
|
39efb51a56
|
功绩难度修改
|
2019-08-13 14:25:23 +08:00 |
zhangshanxue
|
0fac895eb7
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-13 13:18:49 +08:00 |
wangyuan
|
20a228b9b9
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-19 00:01:07 +08:00 |
zhangshanxue
|
1638c42ea1
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-09-13 10:36:03 +08:00 |
zhangshanxue
|
fd7b37fc4a
|
acitvity
|
2019-09-13 10:35:54 +08:00 |
wangyuan
|
c20652705b
|
fix ission
|
2019-08-19 00:00:56 +08:00 |
zhangshanxue
|
ab42fa69bf
|
活动提示
|
2019-08-13 13:18:42 +08:00 |
lvxinran
|
829e51356d
|
RedisUtil
|
2019-08-13 10:12:13 +08:00 |
lvxinran
|
9a1c002c4b
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-13 10:09:37 +08:00 |
lvxinran
|
5e5832178d
|
公会战
|
2019-08-13 10:09:32 +08:00 |
lvxinran
|
d301d88bdf
|
修改名字
|
2019-08-13 10:08:49 +08:00 |
wangyuan
|
f16f1dbc99
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-13 10:08:16 +08:00 |
zhangshanxue
|
3844229238
|
acitvity
|
2019-08-13 10:07:57 +08:00 |
zhangshanxue
|
8c5e6a4cba
|
acitvity
|
2019-09-13 09:35:30 +08:00 |
zhangshanxue
|
1d01fcf712
|
acitvity
|
2019-09-12 21:54:42 +08:00 |
zhangshanxue
|
f76ce9cb43
|
acitvity
|
2019-09-12 21:39:52 +08:00 |
zhangshanxue
|
c0293bd314
|
acitvity
|
2019-09-12 21:36:54 +08:00 |
wangyuan
|
480936bdc5
|
删除无效日志
|
2019-08-13 10:07:57 +08:00 |
zhangshanxue
|
087d03e8dc
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 21:07:17 +08:00 |
lvxinran
|
7b62901318
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 20:52:58 +08:00 |
lvxinran
|
81a443322a
|
公会战
|
2019-08-12 20:52:54 +08:00 |
zhangshanxue
|
4b3435799d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 20:27:43 +08:00 |
zhangshanxue
|
b2d3f59164
|
活动结束补发奖励
|
2019-08-12 20:27:36 +08:00 |
wangyuan
|
4cdb969929
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-12 17:49:35 +08:00 |
wangyuan
|
db8c4d43d9
|
同步用户状态
|
2019-08-12 17:49:20 +08:00 |
lvxinran
|
f46031890a
|
上个修改
|
2019-08-12 17:32:06 +08:00 |
lvxinran
|
d8fa42b0f4
|
公会战查看对战信息
|
2019-08-12 17:31:49 +08:00 |
lvxinran
|
9497535341
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 17:23:42 +08:00 |
lvxinran
|
e27985bab6
|
功绩17修改
|
2019-08-12 17:23:38 +08:00 |
lvxinran
|
29c22526b5
|
增加RedisKey
|
2019-08-12 16:06:06 +08:00 |
lvxinran
|
6924500cd1
|
公会战逻辑修改
|
2019-08-12 16:05:43 +08:00 |
zhangshanxue
|
a33043d8de
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 16:00:58 +08:00 |
zhangshanxue
|
c0509d25f2
|
acitvity
|
2019-08-12 16:00:36 +08:00 |
wangyuan
|
a7ee427a08
|
fix limmit
|
2019-08-12 15:50:47 +08:00 |
lvxinran
|
1fe64c05cb
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 14:30:36 +08:00 |
lvxinran
|
9364fbda6d
|
公会战开始战斗提交
|
2019-08-12 14:30:32 +08:00 |
wangyuan
|
cbb6178449
|
delete log
|
2019-08-12 13:57:51 +08:00 |
wangyuan
|
a076812220
|
fix special
|
2019-08-12 12:16:20 +08:00 |
zhangshanxue
|
f6e25e2bae
|
acitvity
|
2019-08-12 12:03:15 +08:00 |
wangyuan
|
cff26b2110
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-12 11:15:51 +08:00 |
wangyuan
|
968cf84ebd
|
delete unuse log
|
2019-08-12 11:15:41 +08:00 |
lvxinran
|
8395912f43
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-12 11:15:25 +08:00 |
lvxinran
|
acc29668bc
|
编队ID修改
|
2019-08-12 11:15:21 +08:00 |
wangyuan
|
042f9310fe
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-12 10:29:02 +08:00 |
wangyuan
|
a4144852d3
|
mission 合并
|
2019-08-12 10:28:49 +08:00 |
lvxinran
|
f8645932db
|
计算英雄属性加入teamId
|
2019-08-12 10:28:00 +08:00 |
lvxinran
|
50606d6e24
|
0点刷新
|
2019-08-12 10:18:07 +08:00 |
wangyuan
|
e7a8d82ec3
|
fix pool
|
2019-08-16 18:38:47 +08:00 |
wangyuan
|
25df23fd53
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-16 17:46:49 +08:00 |
zhangshanxue
|
22b1156d7f
|
acitvity
|
2019-08-18 05:01:41 +08:00 |
wangyuan
|
a32e878367
|
51 task
|
2019-08-16 17:46:18 +08:00 |
wangyuan
|
725910f363
|
修改进度
|
2019-08-16 17:33:06 +08:00 |
wangyuan
|
64d7de1587
|
fix time
|
2019-08-10 17:19:30 +08:00 |
wangyuan
|
2011f1426b
|
fix take time
|
2019-08-10 17:09:25 +08:00 |
wangyuan
|
7192faf883
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-10 17:08:46 +08:00 |
lvxinran
|
eb6cdbc27b
|
名字限制
|
2019-08-10 16:36:21 +08:00 |
lvxinran
|
dcf5a3bcfa
|
名字限制
|
2019-08-10 16:09:04 +08:00 |
wangyuan
|
975cd3f045
|
refresh
|
2019-08-10 15:51:43 +08:00 |
lvxinran
|
ca477db687
|
名字限制修改
|
2019-08-10 15:34:22 +08:00 |
wangyuan
|
3719f64ec8
|
rank
|
2019-08-10 15:22:14 +08:00 |
wangyuan
|
0af7eb4a4c
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-10 14:48:20 +08:00 |
wangyuan
|
707724627c
|
guild walk
|
2019-08-10 14:47:56 +08:00 |
lvxinran
|
cfe7d058f8
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-10 14:46:57 +08:00 |
lvxinran
|
6ede1219a9
|
公会战布防接口
|
2019-08-10 14:46:53 +08:00 |
zhangshanxue
|
7a275f2ae0
|
签到刷新
|
2019-08-10 14:34:18 +08:00 |
zhangshanxue
|
56017c2dee
|
签到刷新
|
2019-10-01 05:01:31 +08:00 |
wangyuan
|
dd0cab498d
|
log
|
2019-08-10 12:08:03 +08:00 |
wangyuan
|
e456ed0bd8
|
log
|
2019-08-10 11:57:18 +08:00 |
wangyuan
|
efcb80483c
|
store
|
2019-08-10 11:45:40 +08:00 |
wangyuan
|
c0f7cefaaa
|
store
|
2019-08-10 11:33:20 +08:00 |
wangyuan
|
4fd9a928b8
|
reward
|
2019-08-10 11:23:27 +08:00 |
wangyuan
|
3a2a281b81
|
progress
|
2019-08-10 11:17:03 +08:00 |
lvxinran
|
43458f5fc6
|
公会战
|
2019-08-10 10:58:30 +08:00 |
lvxinran
|
69c4b45ac3
|
公会战信息类
|
2019-08-10 10:58:12 +08:00 |
lvxinran
|
eb040c2818
|
删除无用语句
|
2019-08-10 10:54:22 +08:00 |
lvxinran
|
4ab8b5f64c
|
删除防守方法提交
|
2019-08-10 10:53:29 +08:00 |
lvxinran
|
3d76b09eaf
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-10 10:53:02 +08:00 |
lvxinran
|
24bcf89270
|
公会战修改
|
2019-08-10 10:52:58 +08:00 |
lvxinran
|
e1824e12d5
|
个人战力
|
2019-08-10 10:52:16 +08:00 |
wangyuan
|
5d79d6ac4d
|
extra add
|
2019-08-10 10:35:07 +08:00 |
zhangshanxue
|
c20d6e97c5
|
活动开启bug
|
2019-08-10 21:17:43 +08:00 |
wangyuan
|
01c7ac7c8d
|
商店增益
|
2019-08-09 17:48:54 +08:00 |
wangyuan
|
957664c498
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
# serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
|
2019-08-09 17:17:20 +08:00 |