Commit Graph

1979 Commits (5ef6a8debc9efc896a93102be6acb300f39ed6a3)
 

Author SHA1 Message Date
wangyuan 2011f1426b fix take time 2019-08-10 17:09:25 +08:00
wangyuan 7192faf883 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-10 17:08:46 +08:00
lvxinran eb6cdbc27b 名字限制 2019-08-10 16:36:21 +08:00
lvxinran dcf5a3bcfa 名字限制 2019-08-10 16:09:04 +08:00
wangyuan 975cd3f045 refresh 2019-08-10 15:51:43 +08:00
lvxinran ca477db687 名字限制修改 2019-08-10 15:34:22 +08:00
wangyuan 3719f64ec8 rank 2019-08-10 15:22:14 +08:00
wangyuan 0af7eb4a4c Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-10 14:48:20 +08:00
wangyuan 707724627c guild walk 2019-08-10 14:47:56 +08:00
lvxinran cfe7d058f8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-10 14:46:57 +08:00
lvxinran 6ede1219a9 公会战布防接口 2019-08-10 14:46:53 +08:00
zhangshanxue 7a275f2ae0 签到刷新 2019-08-10 14:34:18 +08:00
zhangshanxue 56017c2dee 签到刷新 2019-10-01 05:01:31 +08:00
wangyuan dd0cab498d log 2019-08-10 12:08:03 +08:00
wangyuan e456ed0bd8 log 2019-08-10 11:57:18 +08:00
wangyuan efcb80483c store 2019-08-10 11:45:40 +08:00
wangyuan c0f7cefaaa store 2019-08-10 11:33:20 +08:00
wangyuan 4fd9a928b8 reward 2019-08-10 11:23:27 +08:00
wangyuan 3a2a281b81 progress 2019-08-10 11:17:03 +08:00
lvxinran 43458f5fc6 公会战 2019-08-10 10:58:30 +08:00
lvxinran 69c4b45ac3 公会战信息类 2019-08-10 10:58:12 +08:00
lvxinran eb040c2818 删除无用语句 2019-08-10 10:54:22 +08:00
lvxinran 4ab8b5f64c 删除防守方法提交 2019-08-10 10:53:29 +08:00
lvxinran 3d76b09eaf Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-10 10:53:02 +08:00
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