Commit Graph

3043 Commits (b838d8b25b346cd3f3cd9ea8e2715a58e301eb13)
 

Author SHA1 Message Date
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
wangyuan 763fccdf87 luafight 2020-02-03 11:36:01 +08:00
lvxinran cd199adfe1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-16 18:24:30 +08:00
lvxinran 9331c2ce1f 红包过期提示 2020-01-16 18:24:26 +08:00
lvxinran ed97e5b734 戒灵秘宝任务获取 2020-01-18 16:14:34 +08:00
wangyuan 75b591f45b Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-16 17:54:29 +08:00
wangyuan 0d64c47eb1 表时间修改 2020-01-16 17:53:38 +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 fe4f9c64e5 工会boss奖励 2020-01-15 10:23:18 +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 4339867329 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-01-16 00:08:34 +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
lvxinran 78d7016e7e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-14 16:16:14 +08:00
lvxinran 1de89f726a 战斗逻辑 2020-01-14 16:16:09 +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
lvxinran 69610995d1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-01-13 11:03:27 +08:00
lvxinran 1e2dd47cc2 战斗逻辑 2020-01-13 11:03:23 +08:00