Commit Graph

2966 Commits (9593490df63355384e719e3196766f812e748a9d)
 

Author SHA1 Message Date
lvxinran 9593490df6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-07 16:43:29 +08:00
lvxinran 37231b6d3f 战斗逻辑 2020-01-07 16:43:24 +08:00
wangyuan e67f511a4b 2020-01-07 13:57:23 +08:00
wangyuan bd2ec67784 清除数据库 2020-01-07 11:17:08 +08:00
lvxinran 04f7ce2fb3 活动51 2020-01-07 09:51:45 +08:00
lvxinran 569ce11b46 多余更新特权 删除 2020-01-06 14:11:01 +08:00
lvxinran bcde683628 特权修改推送修改 2020-01-06 13:41:36 +08:00
lvxinran 5bb8355fb6 东海寻仙结算 2020-01-03 17:46:24 +08:00
lvxinran 4bc5c1d99c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-05 00:15:30 +08:00
lvxinran 59cb27bbf3 特权持续时间 2020-01-05 00:15:25 +08:00
lvxinran 35531d21db 增益修改 2020-01-06 15:56:32 +08:00
zhangshanxue cc4ecd78d2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-03 16:09:59 +08:00
zhangshanxue 130beba759 网络连接bug 2020-01-03 16:09:48 +08:00
lvxinran 2c6eccad1a 排行榜,特权修改 2020-01-03 15:02:54 +08:00
lvxinran 481cda0103 战斗逻辑 2020-01-03 12:22:05 +08:00
lvxinran a89c0df8bd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-02 16:57:39 +08:00
lvxinran 99496504fb 权限修改 2020-01-02 16:57:25 +08:00
wangyuan 9c4ec8e048 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-02 16:57:19 +08:00
wangyuan 91ca5da378 活动检验是否开启 2020-01-02 16:57:09 +08:00
lvxinran 9e542cd1cb 监听事件 2020-01-02 16:20:07 +08:00
lvxinran 06fcc21636 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-02 16:12:46 +08:00
lvxinran 12dd7885ce 东海寻仙修改,排行榜加字段 2020-01-02 16:12:41 +08:00
lvxinran 39b48bf320 限时抽卡修改 2019-12-31 18:37:01 +08:00
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
wangyuan b5976884de Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-12-30 11:07:03 +08:00
wangyuan 8bbf0233fa 抽卡 2019-12-30 11:06:47 +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