Commit Graph

3359 Commits (e94cd2d5c433fdcf313b3ec6205adedb30ebd4a3)
 

Author SHA1 Message Date
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
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
zhangshanxue c4e448cb1b 打表索引检查 2020-05-09 07:06:01 +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 8abd2af09c 战斗逻辑 2020-05-07 15:53:26 +08:00
lvxinran 824c8239c5 战斗逻辑 2020-05-06 19:51:54 +08:00
lvxinran 754bdf965b 战斗逻辑 2020-05-06 16:49:24 +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