Commit Graph

1530 Commits (94975353419e687e412b16730a7f6f1070af455c)

Author SHA1 Message Date
lvxinran 24bcf89270 公会战修改 2019-08-10 10:52:58 +08:00
lvxinran e1824e12d5 个人战力 2019-08-10 10:52:16 +08:00
wangyuan 5d79d6ac4d extra add 2019-08-10 10:35:07 +08:00
zhangshanxue c20d6e97c5 活动开启bug 2019-08-10 21:17:43 +08:00
wangyuan 01c7ac7c8d 商店增益 2019-08-09 17:48:54 +08:00
wangyuan 957664c498 Merge branch 'master' of 60.1.1.230:backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/family/GuildLogic.java
2019-08-09 17:17:20 +08:00
wangyuan 15ffc5a164 fix mission & guild walk 2019-08-09 17:14:45 +08:00
lvxinran 65bcc67faf 公会战布防修改 2019-08-09 15:06:00 +08:00
lvxinran 50cb1525c2 公会发送indication 2019-08-09 15:04:12 +08:00
lvxinran e3d9585568 功绩14、18修改 2019-08-09 14:34:30 +08:00
lvxinran 6d79100c20 功绩18修改 2019-08-09 11:43:10 +08:00
wangyuan 516c45c2da fix map mission 2019-08-09 11:14:33 +08:00
lvxinran 727cee1960 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-09 10:57:50 +08:00
lvxinran 7831d1bd16 公会信息 2019-08-09 10:57:30 +08:00
wangyuan c7fb73040b fix process 2019-08-09 10:56:00 +08:00
lvxinran 2c89f0782c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-09 10:44:49 +08:00
lvxinran e0388232dd RedisUtil冲突修改 2019-08-09 10:44:45 +08:00
lvxinran aaa15e6f29 公会修改 2019-08-09 10:42:37 +08:00
lvxinran da884a9773 功绩14修改 2019-08-09 10:42:09 +08:00
wangyuan 91c54cc985 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-09 10:24:35 +08:00
wangyuan b172a2971e guild 2019-08-09 10:24:17 +08:00
zhangshanxue 8ffaafc666 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-09 10:21:25 +08:00
zhangshanxue d325506268 activity 2019-08-09 10:21:15 +08:00
wangyuan aa519b6112 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-09 10:08:07 +08:00
wangyuan e7bcf6f9c0 mission 2019-08-09 10:06:43 +08:00
zhangshanxue 8293f6228f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-08 20:50:24 +08:00
zhangshanxue b7ef0d56fb activity 2019-08-08 20:50:15 +08:00
zhangshanxue b858e5f40a activity 2019-08-13 06:22:01 +08:00
zhangshanxue d43c1dbb6d activity 2019-08-13 05:13:22 +08:00
zhangshanxue da226e1311 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-15 16:51:35 +08:00
zhangshanxue 00d007663e acitvity 2019-08-09 16:50:55 +08:00
wangyuan b5e8f34b6f 外敌 2019-08-08 16:45:17 +08:00
lvxinran cb51c86ab6 功绩无法完成标识 2019-08-08 16:26:35 +08:00
lvxinran 83adab494f 功绩20修改 2019-08-08 16:22:30 +08:00
lvxinran 49ad73610d 功绩修改 2019-08-08 15:50:56 +08:00
wangyuan b0e090433a fix mission 2019-08-08 13:58:04 +08:00
wangyuan 4cd52c43f9 fix 2019-08-08 13:56:57 +08:00
wangyuan e096e71441 fix mission 2019-08-08 13:55:39 +08:00
wangyuan a58732ac9b Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-08 13:52:13 +08:00
zhangshanxue 785fef38e8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-08 13:49:41 +08:00
zhangshanxue 183d243708 达人排行 2019-10-08 13:49:37 +08:00
wangyuan 1c420aba0c 扣卷 2019-08-08 13:51:50 +08:00
wangyuan b2a4a89d4c 新手任务 2019-08-08 13:36:53 +08:00
wangyuan 2761bc3b76 fix activity 2019-08-08 11:35:15 +08:00
wangyuan a1250a948b Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-08 11:26:22 +08:00
wangyuan ce45828fe4 activity 2019-08-08 11:26:01 +08:00
wangyuan ea1c8e921f default activity 2019-08-10 09:51:38 +08:00
wangyuan e857c31305 add white 2019-08-09 22:01:09 +08:00
lvxinran 007a926278 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-08 11:20:39 +08:00
lvxinran bef4bdc9b4 21功绩修改 2019-08-08 11:20:35 +08:00
zhangshanxue 1861d13d4e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-08 10:24:15 +08:00
zhangshanxue fcc7db592b 签到更新 2019-08-08 10:24:09 +08:00
wangyuan 80400ef521 fix taketimes 2019-08-07 21:37:37 +08:00
wangyuan 1d90144fdc fix map position 2019-08-07 20:55:47 +08:00
wangyuan ee127cfa06 recharge 2019-08-07 20:30:55 +08:00
wangyuan fa2f9a71ce maplogic 2019-08-07 19:38:35 +08:00
zhangshanxue d23e966a9f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-07 18:35:14 +08:00
zhangshanxue cff3b4acb8 活动事件 2019-08-07 18:35:10 +08:00
lvxinran 6e52113c19 表类提交 2019-08-07 18:18:24 +08:00
lvxinran 9fa5bf9b39 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-07 18:17:31 +08:00
lvxinran bf01f7443e 修改 2019-08-07 18:17:27 +08:00
wangyuan c9e4122464 check 2019-08-07 18:04:14 +08:00
zhangshanxue d3636636ca Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-07 17:54:24 +08:00
zhangshanxue 7d0388eaed 达人排行榜榜单调整 连续充值周期更新 2019-08-07 17:54:09 +08:00
wangyuan 4105d7359c 活动邮件 2019-08-07 17:32:51 +08:00
wangyuan a1db43c4e3 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-07 16:30:39 +08:00
wangyuan b87d7a370e fix 合成英雄 2019-08-07 16:30:09 +08:00
lvxinran 4471d842e1 无尽开启地图 2019-08-07 15:35:34 +08:00
wangyuan 89ffd40206 fix seven time 2019-08-07 14:23:25 +08:00
wangyuan afda3018b4 fix misison 2019-08-07 14:21:09 +08:00
wangyuan 411ce97154 fix map 2019-08-07 13:55:37 +08:00
lvxinran 88d2cea85d 第一编队修改 2019-08-07 12:12:27 +08:00
zhangshanxue 3ea863dc2f Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-10 09:55:28 +08:00
zhangshanxue fe7dabbcff 达人排行发奖 2019-08-10 09:55:24 +08:00
lvxinran 17f30d751a 战斗同步 2019-08-06 20:55:47 +08:00
wangyuan 5855a00391 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 20:27:51 +08:00
wangyuan af0a3f1228 领取奖励 & 修改地图坐标点 2019-08-06 20:27:08 +08:00
lvxinran 9f9166a64b 17功绩 2019-08-06 18:28:09 +08:00
lvxinran 69ca68785c 功绩21 2019-08-06 18:03:16 +08:00
lvxinran bac1c1b85d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 18:01:51 +08:00
lvxinran 9f91ab0331 功绩类型修改 2019-08-06 18:01:47 +08:00
zhangshanxue f3747d0bad Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 17:40:28 +08:00
wangyuan 833b0ae6ae 宗门时间 2019-08-06 17:36:45 +08:00
zhangshanxue d5352f79a7 连续充值 2019-08-06 17:31:59 +08:00
zhangshanxue 797a484250 达人排行榜奖励 2019-08-06 15:28:15 +08:00
wangyuan 24a5ada002 fix task hero type 2019-08-06 15:00:06 +08:00
wangyuan 294cdd8334 修复误删 2019-08-06 14:51:27 +08:00
lvxinran db1471aa13 无尽副本修改 2019-08-06 14:10:17 +08:00
wangyuan 6869a65f46 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 13:56:31 +08:00
wangyuan 2105ba3e50 mission 2019-08-06 13:56:17 +08:00
lvxinran 9c6e93016d 出图清除无尽数据 2019-08-06 11:51:39 +08:00
lvxinran d349910c40 无尽副本最后数据修改 2019-08-06 11:40:04 +08:00
zhangshanxue 61f49b7114 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	.gitignore
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityTypeEnum.java
2019-08-06 11:25:51 +08:00
lvxinran 564ee54d2c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 11:25:26 +08:00
lvxinran 25eaa56501 出图修改 2019-08-06 11:25:22 +08:00
zhangshanxue d0e36989e4 达人 每日首冲 连续充值 签到 累计充值 2019-08-06 11:20:46 +08:00
zhangshanxue ad95f83eee price err 2019-08-07 10:28:41 +08:00
wangyuan ac287305bb Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 10:44:20 +08:00
wangyuan 5988241e6c 周卡 2019-08-06 10:43:36 +08:00
lvxinran f9febb2dcd 获取第一编队修改 2019-08-06 10:36:21 +08:00