Commit Graph

2000 Commits (404ea0708963902c380b1211633966b9ec475397)
 

Author SHA1 Message Date
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