lvxinran
|
c52180e981
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-31 17:50:17 +08:00 |
lvxinran
|
66e13d239e
|
战斗逻辑
|
2019-12-31 17:47:29 +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 |
lvxinran
|
2f9fb3c349
|
战斗逻辑
|
2019-12-31 16:35:42 +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 |
lvxinran
|
c6788d47e8
|
特权表修改
|
2019-12-27 10:26:20 +08:00 |
lvxinran
|
5380c3cc23
|
Merge branch 'master' of http://60.1.1.230/backend/jieling_server
|
2019-12-27 10:24:26 +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 |
lvxinran
|
bcf27e16f9
|
商店表
|
2019-12-27 10:22:15 +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 |
wangyuan
|
ec9b9a67e4
|
battlemain 异妖
|
2019-12-26 17:39:02 +08:00 |
wangyuan
|
c4dceec25a
|
Merge branch 'master' of 60.1.1.230:backend/jieling_server
|
2019-12-26 17:21:10 +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
|
a1f98bdc00
|
add
|
2019-12-25 17:49:52 +08:00 |
wangyuan
|
5e3980c94d
|
异妖颜色
|
2019-12-25 17:49:12 +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 |