wangyuan
|
1d90144fdc
|
fix map position
|
2019-08-07 20:55:47 +08:00 |
wangyuan
|
ee127cfa06
|
recharge
|
2019-08-07 20:30:55 +08:00 |
wangyuan
|
fa2f9a71ce
|
maplogic
|
2019-08-07 19:38:35 +08:00 |
zhangshanxue
|
d23e966a9f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-07 18:35:14 +08:00 |
zhangshanxue
|
cff3b4acb8
|
活动事件
|
2019-08-07 18:35:10 +08:00 |
lvxinran
|
6e52113c19
|
表类提交
|
2019-08-07 18:18:24 +08:00 |
lvxinran
|
9fa5bf9b39
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-07 18:17:31 +08:00 |
lvxinran
|
bf01f7443e
|
修改
|
2019-08-07 18:17:27 +08:00 |
wangyuan
|
c9e4122464
|
check
|
2019-08-07 18:04:14 +08:00 |
zhangshanxue
|
d3636636ca
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-07 17:54:24 +08:00 |
zhangshanxue
|
7d0388eaed
|
达人排行榜榜单调整 连续充值周期更新
|
2019-08-07 17:54:09 +08:00 |
wangyuan
|
4105d7359c
|
活动邮件
|
2019-08-07 17:32:51 +08:00 |
wangyuan
|
a1db43c4e3
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-07 16:30:39 +08:00 |
wangyuan
|
b87d7a370e
|
fix 合成英雄
|
2019-08-07 16:30:09 +08:00 |
lvxinran
|
4471d842e1
|
无尽开启地图
|
2019-08-07 15:35:34 +08:00 |
wangyuan
|
89ffd40206
|
fix seven time
|
2019-08-07 14:23:25 +08:00 |
wangyuan
|
afda3018b4
|
fix misison
|
2019-08-07 14:21:09 +08:00 |
wangyuan
|
411ce97154
|
fix map
|
2019-08-07 13:55:37 +08:00 |
lvxinran
|
88d2cea85d
|
第一编队修改
|
2019-08-07 12:12:27 +08:00 |
zhangshanxue
|
3ea863dc2f
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-10 09:55:28 +08:00 |
zhangshanxue
|
fe7dabbcff
|
达人排行发奖
|
2019-08-10 09:55:24 +08:00 |
lvxinran
|
17f30d751a
|
战斗同步
|
2019-08-06 20:55:47 +08:00 |
wangyuan
|
5855a00391
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-06 20:27:51 +08:00 |
wangyuan
|
af0a3f1228
|
领取奖励 & 修改地图坐标点
|
2019-08-06 20:27:08 +08:00 |
lvxinran
|
9f9166a64b
|
17功绩
|
2019-08-06 18:28:09 +08:00 |
lvxinran
|
69ca68785c
|
功绩21
|
2019-08-06 18:03:16 +08:00 |
lvxinran
|
bac1c1b85d
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-06 18:01:51 +08:00 |
lvxinran
|
9f91ab0331
|
功绩类型修改
|
2019-08-06 18:01:47 +08:00 |
zhangshanxue
|
f3747d0bad
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-06 17:40:28 +08:00 |
wangyuan
|
833b0ae6ae
|
宗门时间
|
2019-08-06 17:36:45 +08:00 |
zhangshanxue
|
d5352f79a7
|
连续充值
|
2019-08-06 17:31:59 +08:00 |
zhangshanxue
|
797a484250
|
达人排行榜奖励
|
2019-08-06 15:28:15 +08:00 |
wangyuan
|
24a5ada002
|
fix task hero type
|
2019-08-06 15:00:06 +08:00 |
wangyuan
|
294cdd8334
|
修复误删
|
2019-08-06 14:51:27 +08:00 |
wangyuan
|
1bc6ece387
|
lua fight
|
2019-08-06 14:37:17 +08:00 |
lvxinran
|
db1471aa13
|
无尽副本修改
|
2019-08-06 14:10:17 +08:00 |
wangyuan
|
6869a65f46
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-06 13:56:31 +08:00 |
wangyuan
|
2105ba3e50
|
mission
|
2019-08-06 13:56:17 +08:00 |
mashiyu
|
9047f8968d
|
chmod +x sh
|
2019-08-06 11:59:14 +08:00 |
lvxinran
|
9c6e93016d
|
出图清除无尽数据
|
2019-08-06 11:51:39 +08:00 |
lvxinran
|
d349910c40
|
无尽副本最后数据修改
|
2019-08-06 11:40:04 +08:00 |
zhangshanxue
|
61f49b7114
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
# .gitignore
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
# serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
|
2019-08-06 11:25:51 +08:00 |
lvxinran
|
564ee54d2c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-06 11:25:26 +08:00 |
lvxinran
|
25eaa56501
|
出图修改
|
2019-08-06 11:25:22 +08:00 |
zhangshanxue
|
d0e36989e4
|
达人 每日首冲 连续充值 签到 累计充值
|
2019-08-06 11:20:46 +08:00 |
zhangshanxue
|
ad95f83eee
|
price err
|
2019-08-07 10:28:41 +08:00 |
wangyuan
|
ac287305bb
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-08-06 10:44:20 +08:00 |
wangyuan
|
5988241e6c
|
周卡
|
2019-08-06 10:43:36 +08:00 |
lvxinran
|
f9febb2dcd
|
获取第一编队修改
|
2019-08-06 10:36:21 +08:00 |
lvxinran
|
30abfc1d1c
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-08-06 10:30:48 +08:00 |