Commit Graph

3101 Commits (189674d9ca34eca144e5d3109bde5f46abda70bc)

Author SHA1 Message Date
lvxinran 08b1bd06cf vip修改 2020-05-25 11:29:08 +08:00
zhangshanxue 03a0cb9d51 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-22 23:45:59 +08:00
zhangshanxue 6302d70fed Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-22 19:08:45 +08:00
zhangshanxue 09cf77fae8 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化)时间推送 2020-05-22 19:08:36 +08:00
zhangshanxue dc7bb1a89a Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-22 05:53:33 +08:00
zhangshanxue 094d64f8ad Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-22 05:13:25 +08:00
zhangshanxue a6767eb7bf Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-21 14:07:46 +08:00
lvxinran 4aea1763c8 试炼副本提交 2020-05-20 15:31:08 +08:00
zhangshanxue c332a9b8c3 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-20 10:31:39 +08:00
zhangshanxue e20be3b89b Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-20 10:31:31 +08:00
wangyuan 463ea511fa fix 【开服狂欢】福利礼包报错 初始化user,未放入内存中,初始化活动获取user报错 2020-05-19 17:42:52 +08:00
wangyuan 5b3937b093 成长礼金 & 猎妖之路战斗特殊被动传输数据 & 车迟玩法排行榜问题 2020-05-19 17:18:08 +08:00
lvxinran 4d284c5b50 Merge branch 'master' into develop 2020-05-18 20:43:17 +08:00
lvxinran 41b67cfefb 兽潮来袭删除消耗道具 2020-05-18 20:39:48 +08:00
lvxinran 19e59de463 副本修改 2020-05-18 20:28:54 +08:00
wangyuan e4bca61851 车迟排行榜 个人和工会反了 2020-05-18 18:37:03 +08:00
wangyuan 5632169a45 车迟上次玩的时间 2020-05-18 14:34:40 +08:00
zhangshanxue f4170fc273 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-18 13:44:53 +08:00
zhangshanxue bc0d2c5f6e 战斗位置 2020-05-18 13:44:38 +08:00
wangyuan 7e360f4d71 【任务】参与日常副本次数,完不成 2020-05-18 11:25:26 +08:00
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 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
lvxinran 1f9756dd59 合并 2020-05-14 13:43:46 +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 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 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
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
wangyuan 09731d81bc Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
2020-05-09 10:05:39 +08:00
wangyuan 780c56d06e car rank 2020-05-09 10:03:26 +08:00
lvxinran 6079cc96ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/db/redis/RedisKey.java
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/fight/GameFightType.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/rank/RankEnum.java
#	serverlogic/src/main/java/com/ljsd/jieling/thread/task/MinuteTask.java
2020-05-09 09:59:29 +08:00
lvxinran d9696552ff 十绝阵提交 2020-05-09 09:53:45 +08:00
wangyuan 17751438fd fix car 2020-05-08 14:16:46 +08:00
wangyuan 48d3616061 魂印打开 2020-05-08 10:23:32 +08:00
zhangshanxue 21eeee56c8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-07 19:48:21 +08:00
zhangshanxue 4cbb76e4f7 祭祀 2020-05-07 19:47:58 +08:00
wangyuan bf845f4fbf 车轮匹配 2020-05-07 18:06:28 +08:00
zhangshanxue 964729e36e Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/dao/GuildMyInfo.java
2020-05-07 16:49:06 +08:00
zhangshanxue 9660e22f9c 祭祀 2020-05-07 16:46:21 +08:00
wangyuan 25392fd49f Merge branch 'master' of 60.1.1.230:backend/jieling_server 2020-05-07 16:32:04 +08:00
wangyuan a0d031e7d8 车轮 2020-05-07 16:31:28 +08:00
lvxinran c7e7ef4f3d 技能重置 2020-05-06 15:54:22 +08:00
lvxinran a871b0444a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-05-06 11:53:53 +08:00
wangyuan 3d0a278fd5 暂时删除地图校验 2020-05-10 11:21:08 +08:00
lvxinran 0d59731c5c 公会技能 代码提交 2020-05-06 11:53:48 +08:00
lvxinran 3e3219fe05 宝物修改 2020-05-06 09:58:15 +08:00
zhangshanxue 3dfe572bfd BUG【ID1007351】【升级豪礼】显示剩余1,不能领取 2020-05-05 17:47:18 +08:00
wangyuan 3d90b3a15d 修复七日任务宝箱没有推状态问题 2020-05-05 10:38:30 +08:00
zhangshanxue 3918bdf0ce 注释魂印加成 2020-04-30 20:12:00 +08:00
zhangshanxue ac98784ffb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-30 19:57:28 +08:00
zhangshanxue 5d1ff52c3d 活动提交 2020-04-30 19:57:17 +08:00
wangyuan 2e05d68e13 屏蔽魂印 2020-04-30 18:31:54 +08:00
wangyuan 3b6008fb4a hero position 2020-05-01 15:06:57 +08:00
zhangshanxue 5c1946e7f7 异常打印 2020-04-29 18:17:13 +08:00
zhangshanxue 3540d350b9 日志 2020-04-29 14:19:59 +08:00
zhangshanxue 23334124a2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-29 14:15:07 +08:00
zhangshanxue 8663faf38a 日志 2020-04-29 14:14:59 +08:00
wangyuan ee2d0ddb69 七日任务由六天变成七天 2020-04-29 11:02:35 +08:00
lvxinran 8847964740 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2020-04-29 06:31:25 +08:00
lvxinran ad92a9df33 特权修改接口添加 2020-04-29 06:31:20 +08:00
lvxinran 3603493efa 宝器相关 2020-04-28 21:22:50 +08:00