Commit Graph

2856 Commits (252da3274f6a8d445e6ff9d59cd1381d2bc8fbf8)

Author SHA1 Message Date
zhangshanxue 498dbbb80f cdk全渠道需求 2020-03-09 11:31:28 +08:00
zhangshanxue 674d88210e cdk全渠道需求 2020-03-09 11:02:06 +08:00
lvxinran 435ed56a0f 特权刷新先后顺序 2020-03-03 05:04:32 +08:00
lvxinran c5d8e67d2e 敏感词 2020-02-28 16:43:24 +08:00
lvxinran 9c82a394dd 戒灵秘宝升级修改 2020-02-29 00:03:07 +08:00
lvxinran 81eedff9df 戒灵秘宝升级修改 2020-02-28 12:29:53 +08:00
lvxinran 0846bdfe2d 戒灵秘宝逻辑修改 2020-02-28 12:04:02 +08:00
lvxinran 82c102391b 东海寻仙活动 2020-02-29 00:01:33 +08:00
zhangshanxue f132f859c4 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-26 16:54:22 +08:00
zhangshanxue c53b6056ed Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 奖励改成奖励组 2020-02-26 16:54:12 +08:00
lvxinran fb104288e5 限时抽卡 寻仙榜修改 2020-02-26 14:38:07 +08:00
wangyuan 66ea5b103f 修复设置异妖组件最大等级校验 2020-02-25 14:55:14 +08:00
wangyuan a3716c257f 巅峰赛编队有竞技场进攻变成竞技场防守 2020-02-25 11:47:10 +08:00
zhangshanxue b0ad311440 线上分支回退 改回来 2020-02-25 09:57:36 +08:00
zhangshanxue 1ce01c52e3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 21:45:51 +08:00
zhangshanxue 57fa2c6652 线上分支回退 稍后再改回来 2020-02-24 21:45:42 +08:00
wangyuan 4c327414b9 零点刷新 2020-02-24 18:26:28 +08:00
zhangshanxue 9ee9d9f2e8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 18:06:02 +08:00
zhangshanxue 49140cc3d7 Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 2020-02-24 18:05:51 +08:00
lvxinran d005fbed44 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 17:14:08 +08:00
lvxinran 85a1947791 刷新充值礼包改为0点 2020-02-24 17:14:03 +08:00
wangyuan 257de4422f 修改工会战编队id可动态改 2020-02-24 16:21:10 +08:00
zhangshanxue f41cf48f3b Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 去掉每日战力快照 取最大战力 2020-02-24 15:57:11 +08:00
zhangshanxue f3fca07cf2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-24 15:00:43 +08:00
zhangshanxue 267f621cc0 BUG 【ID1006263】 【五星成长礼】在碎片合成时,获得五星猎妖师,偶尔没有前往的弹窗 2020-02-24 15:00:35 +08:00
wangyuan 4e98fff425 fix 2020-02-21 18:30:36 +08:00
zhangshanxue a7ed154936 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-21 17:55:45 +08:00
zhangshanxue 441480aed0 Task【ID1005747】【猎妖之路优化】 猎妖之路优化内容 死亡猎妖师未下阵 2020-02-21 17:55:36 +08:00
wangyuan d9b592cc81 修复功能按类型开 2020-02-21 17:54:41 +08:00
zhangshanxue 0304f78695 Task【ID1005747】【猎妖之路优化】猎妖之路优化内容 2020-02-21 11:09:57 +08:00
zhangshanxue ae01d515ec 前端gm指令 后期屏蔽 2020-02-20 17:46:26 +08:00
zhangshanxue d902f1d34e Task【ID1005460】【玩法需求】猎妖之路 2020-02-20 16:40:08 +08:00
zhangshanxue 861c6a2ec5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-20 09:34:19 +08:00
wangyuan d1bd1ebade Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/GlobalDataManaager.java
2020-03-26 00:03:27 +08:00
wangyuan d3a84ad2a8 商店刷新 & 工会行走 2020-03-26 00:02:26 +08:00
zhangshanxue 4afff38ff3 Task【ID1005460】【玩法需求】猎妖之路 2020-02-20 09:34:08 +08:00
zhangshanxue 44c00e9fcb Task【ID1005460】【玩法需求】猎妖之路 节点更新不对 2020-02-19 14:53:20 +08:00
zhangshanxue cbfee44510 Task【ID1005460】【玩法需求】猎妖之路 节点更新不对 2020-02-19 10:58:09 +08:00
zhangshanxue 95b9eb58d5 Task【ID1005460】【玩法需求】猎妖之路 2020-02-18 13:52:23 +08:00
zhangshanxue f3e27888ee Task【ID1005460】【玩法需求】猎妖之路 2020-02-17 18:19:29 +08:00
zhangshanxue 624282c742 Task【ID1005460】【玩法需求】猎妖之路 2020-02-17 15:51:37 +08:00
zhangshanxue b838d8b25b 五星成长礼注释 2020-02-17 13:55:01 +08:00
zhangshanxue 67b85decc5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-13 16:13:31 +08:00
zhangshanxue da2943dd9a Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-13 16:13:21 +08:00
zhangshanxue 38e9e4d5f9 Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-13 10:24:11 +08:00
lvxinran 337e0ebeec Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-02-10 09:52:02 +08:00
lvxinran 8c06c9fed2 战力修改 2020-02-10 09:51:55 +08:00
zhangshanxue 4e5542393c Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2020-02-09 19:53:28 +08:00
zhangshanxue 4769cadda1 Task 【ID1005460】 【玩法需求】猎妖之路 2020-02-09 19:48:55 +08:00
lvxinran 9331c2ce1f 红包过期提示 2020-01-16 18:24:26 +08:00
lvxinran ed97e5b734 戒灵秘宝任务获取 2020-01-18 16:14:34 +08:00
wangyuan 8438d69f40 扫荡奖励 2020-01-16 15:28:55 +08:00
wangyuan 3e67fb76ec Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-16 14:29:30 +08:00
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