Commit Graph

3334 Commits (9c373c3b2a8d7760b3bcd3517e7f3d02fead22dc)
 

Author SHA1 Message Date
wangyuan 9c373c3b2a rollback application.properties 2020-05-18 10:24:40 +08:00
wangyuan f48920d5bc 1.修复活动关闭没有推送新活动开始 2.猎妖之路加被动技能 3.删除无效领取抽卡宝箱奖励 2020-05-16 18:46:14 +08:00
zhangshanxue cfb504dfe8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-16 17:52:02 +08:00
zhangshanxue a7fd42b00a Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-16 17:51:44 +08:00
zhangshanxue 24c347f308 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-16 17:51:15 +08:00
wangyuan 7ad319cd7e random card 2020-05-16 16:56:15 +08:00
zhangshanxue 74eb0a0aea Task【新战斗版本】公会援助 2020-05-16 11:28:46 +08:00
zhangshanxue 903d5d2944 Task【新战斗版本】公会援助 2020-05-18 05:04:36 +08:00
zhangshanxue 783120f7eb 公会奖励补发 及 机器人编队位置添加 2020-05-16 15:35:32 +08:00
zhangshanxue feaa5fb4f5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-16 10:33:02 +08:00
zhangshanxue 238e940beb Task【新战斗版本】公会援助 2020-05-16 10:32:50 +08:00
lvxinran c81995c849 十绝阵掉落修改 2020-05-16 08:36:20 +08:00
lvxinran 17f1f0a639 indication修改 2020-05-15 21:11:26 +08:00
lvxinran 94681e4b9d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-15 21:04:47 +08:00
lvxinran 297bb65445 十绝阵 跑马灯添加 领奖修改 2020-05-15 21:04:42 +08:00
lvxinran b302bd3601 删除无用代码 2020-05-22 16:20:39 +08:00
lvxinran 48e362291c 排名奖励修改 2020-05-22 16:20:22 +08:00
lvxinran 886474443e 十绝阵奖励随机提交 2020-05-22 15:51:17 +08:00
lvxinran bab6d9a004 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-18 22:39:22 +08:00
lvxinran 4408cd4a17 十绝阵奖励相关 2020-05-18 22:39:17 +08:00
wangyuan 501f5e9d70 fix 车迟工会排行没有获取到我的工会排行 2020-05-13 15:29:11 +08:00
wangyuan 324b413a31 fix 【开服狂欢】寻宝次数任务,不能完成 2020-05-13 15:27:03 +08:00
wangyuan e82caddb52 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-05-12 16:06:33 +08:00
wangyuan 73e7d662aa 开活动送充值购买权 2020-05-12 16:02:37 +08:00
lvxinran 89c8a68f3a 十绝阵数量级处理、开服3天限制添加 2020-05-12 14:55:10 +08:00
lvxinran e60facdc36 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-15 00:08:14 +08:00
lvxinran 633cf81ee6 十绝阵 时间 阶段修改 2020-05-15 00:07:41 +08:00
lvxinran 26b0aff262 特权到期时间修改 2020-05-13 03:49:02 +08:00
lvxinran 44d7fbbc52 十绝阵修改 2020-05-11 21:50:11 +08:00
lvxinran 233d52d1c8 BIReanson提交 2020-05-11 20:41:19 +08:00
zhangshanxue f2e143ed45 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-11 19:31:34 +08:00
zhangshanxue 77a50f4e5e Task【ID1006177】【新战斗版本】宝物合成 2020-05-11 19:31:26 +08:00
zhangshanxue f75b7ad1cc Task【ID1006177】【新战斗版本】宝物合成 2020-05-11 11:37:55 +08:00
lvxinran 55295fe011 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-11 10:09:50 +08:00
lvxinran dd799829db 十绝阵 奖励相关 2020-05-11 10:09:38 +08:00
lvxinran 632af72234 bug暂时修改 2020-05-11 10:08:36 +08:00
zhangshanxue 2e4da3600d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-11 09:54:42 +08:00
zhangshanxue 25467b247c Task【ID1006177】【新战斗版本】宝物合成 2020-05-11 09:54:33 +08:00
wangyuan 9335201d5e fix battlemain 2020-05-09 17:24:43 +08:00
wangyuan d394985b52 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-05-09 17:08:14 +08:00
lvxinran 8e5916bfff Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-05-11 11:57:47 +08:00
lvxinran 3323110204 RedisKey提交 2020-05-11 11:56:18 +08:00
lvxinran ba0f7f91aa 战斗逻辑 2020-05-11 11:53:05 +08:00
wangyuan c0362839a7 fix car rank 2020-05-09 17:05:00 +08:00
wangyuan 8829b678d5 fix 法宝 2020-05-09 11:59:26 +08:00
wangyuan 930669b6b3 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
2020-05-09 11:41:08 +08:00
lvxinran 3526bb12fd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-12 05:01:38 +08:00
lvxinran e633bc3480 添加公会总次数 2020-05-12 05:01:34 +08:00
wangyuan 8ea7539cdf fix car 2020-05-09 11:39:57 +08:00
wangyuan d00b5f8499 fix 2020-05-09 10:06:24 +08:00