Commit Graph

2803 Commits (74ee4537eef2001333e3ef5b5b8a2fa8f998adce)

Author SHA1 Message Date
lvxinran 18ff74bef6 寻仙榜加入活动id修改 2020-01-18 11:52:04 +08:00
wangyuan cf83bf24fb 礼包邮件时间 2020-01-16 14:28:44 +08:00
lvxinran 2ea5eddff3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-16 11:09:15 +08:00
lvxinran 6dc9f0370e 特权时间修改 2020-01-16 11:09:02 +08:00
wangyuan 40d339793c 活动修改&新手结束 2020-01-16 11:00:57 +08:00
lvxinran 0d5dd5811f 红包随机方法修改 2020-01-16 10:15:05 +08:00
wangyuan f4cd55beb5 guildbossj邮件奖励 2020-01-15 18:30:01 +08:00
wangyuan d02d25acc1 guildbossj邮件奖励 2020-01-15 18:14:50 +08:00
lvxinran 7de892ae24 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-15 17:20:10 +08:00
lvxinran 7d110d4220 五星成长礼修改 2020-01-15 17:20:05 +08:00
wangyuan 02288406d9 上次伤害 2020-01-15 15:26:03 +08:00
lvxinran 3721397aa0 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-15 14:25:52 +08:00
lvxinran 5f181a4df7 发送抢到红包消息 2020-01-15 14:25:29 +08:00
wangyuan fa7534ce86 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-15 10:02:27 +08:00
wangyuan 0999804d3c 工会boss奖励 2020-01-15 10:02:10 +08:00
wangyuan 4750308d69 活动修改发奖 2020-01-16 00:08:07 +08:00
lvxinran 58f1606268 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-14 18:01:28 +08:00
lvxinran 38e9b4ef3b 发送红包奖励改为邮件 2020-01-14 18:01:15 +08:00
wangyuan 6e7a116b72 特权、礼包过期邮件通知 2020-01-14 14:09:53 +08:00
lvxinran 4148f0d9ee 特权修改时发送挂机奖励 2020-01-14 13:41:22 +08:00
lvxinran bedd39c0a2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-17 17:48:41 +08:00
lvxinran 2b40c77e68 挂机邮件 2020-01-17 17:48:36 +08:00
lvxinran 6e5642857a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-15 14:41:10 +08:00
lvxinran 1e36eb0195 特权过期 2020-01-15 14:41:00 +08:00
wangyuan 9dd949808d 预告 2020-01-13 17:43:42 +08:00
wangyuan 9b45351ae2 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-16 01:35:36 +08:00
wangyuan 831653bde4 修改到期时间 2020-01-16 01:35:21 +08:00
wangyuan eda6fd40f4 基金 2020-01-13 11:10:51 +08:00
wangyuan 4ef3ca72c9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-13 10:48:11 +08:00
wangyuan 22262c4bb7 刷新商品 2020-01-13 10:45:48 +08:00
lvxinran 04b5b3e39e 工会红包 职位添加 2020-01-10 16:09:39 +08:00
lvxinran 9d70702214 东海寻仙邮件 2020-01-16 00:02:21 +08:00
lvxinran 7656c76f94 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-11 13:39:04 +08:00
lvxinran 1329c2b56b 抢红包校验 2020-01-11 13:38:58 +08:00
wangyuan 1ab634aeb6 商品购买 2020-01-09 18:06:45 +08:00
lvxinran 27a48fac95 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-09 17:02:03 +08:00
lvxinran 50093c8c58 特权时间修改,点赞物品添加 2020-01-09 17:01:53 +08:00
wangyuan dfb50edaa0 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-09 16:43:56 +08:00
wangyuan 2596295a30 商品购买和刷新 2020-01-09 16:43:47 +08:00
lvxinran 0d2f9e9fe9 红包榜,点赞提交 2020-01-09 15:59:13 +08:00
zhangshanxue 8d640e290b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-09 15:21:10 +08:00
zhangshanxue eab36c5f27 TASK【ID1005460】【玩法需求】猎妖之路 2020-01-09 15:20:09 +08:00
lvxinran 6a7878b8e6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-08 18:35:42 +08:00
wangyuan d9d46dc362 hurt value 2020-01-08 18:35:28 +08:00
wangyuan f16f86c7ee Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-08 17:58:46 +08:00
wangyuan cb1954d8a2 vip权限 2020-01-08 17:58:36 +08:00
lvxinran 101d1bcdf3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-08 17:19:28 +08:00
lvxinran 403364b2fd 公会红包提交 2020-01-08 17:19:23 +08:00
zhangshanxue 465c18b000 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-08 16:18:47 +08:00
zhangshanxue da646a7f5c TASK【ID1005460】【玩法需求】猎妖之路 2020-01-08 16:18:40 +08:00
lvxinran 7c0ac91a44 特权时间修改,红包时间修改 2020-01-08 02:36:36 +08:00
wangyuan a0fe74fa22 vip校验方法名称修改 2020-01-07 19:24:55 +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 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
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
wangyuan c4dceec25a Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-12-26 17:21:10 +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
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
zhangshanxue 4302c8df42 临时测试数据 2019-12-28 17:57:54 +08:00