Commit Graph

3359 Commits (e94cd2d5c433fdcf313b3ec6205adedb30ebd4a3)
 

Author SHA1 Message Date
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
wangyuan bd54aea85e fight 2020-02-20 16:06:48 +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
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