Commit Graph

1795 Commits (5ef6a8debc9efc896a93102be6acb300f39ed6a3)

Author SHA1 Message Date
zhangshanxue 9456e7a1cc Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/globals/BIReason.java
2019-08-17 15:04:21 +08:00
wangyuan 134c51cdfa change adventure 2019-08-17 15:02:36 +08:00
wangyuan 4c9dc4245b fxi store 2019-08-17 14:49:17 +08:00
wangyuan 299f00200d fix store 2019-08-17 14:48:06 +08:00
wangyuan 92df10cfa7 fix bug 2019-08-17 14:44:25 +08:00
zhangshanxue d48947533b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-17 14:16:56 +08:00
zhangshanxue 7e80be3a92 兽潮来袭 37数据上报 2019-08-17 14:16:52 +08:00
zhangshanxue 5ef3705a1d acitvity 2019-08-17 13:46:40 +08:00
zhangshanxue cf4a4a61ab activity bug 2019-08-16 18:29:40 +08:00
wangyuan f154488f7f fix mission 2019-08-16 16:37:57 +08:00
zhangshanxue d83a28c2b3 acitvity 2019-08-16 16:12:51 +08:00
zhangshanxue cf996208a8 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/handler/GetPlayerInfoHandler.java
2019-08-16 10:10:21 +08:00
zhangshanxue aa102c8d29 妖兽来袭 2019-08-16 10:09:39 +08:00
zhangshanxue d6a6f25e82 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-21 08:56:11 +08:00
zhangshanxue 10470c3dc8 修复玩家活动数据 2019-08-21 08:56:02 +08:00
zhangshanxue 334083029e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-18 06:06:07 +08:00
zhangshanxue 9f5725f1ef 连续充值bug 2019-08-18 06:06:01 +08:00
wangyuan 37ea59cc50 发送全服数据 2019-08-20 19:43:45 +08:00
wangyuan 1f452b87f1 fix friend 2019-08-20 19:39:44 +08:00
wangyuan cc43c55367 工坊等级限制 2019-08-16 13:49:12 +08:00
lvxinran 0f4ef7a59e 战斗血量修改 2019-08-16 05:03:05 +08:00
wangyuan 87c2c32a44 fix mission 2019-08-15 21:04:40 +08:00
lvxinran ed50688201 公会战 2019-08-16 11:13:52 +08:00
wangyuan 07d68f5c69 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-15 18:30:01 +08:00
lvxinran b7cd108b76 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-20 08:16:58 +08:00
lvxinran ec0000e220 第一次十连抽 2019-08-20 08:16:53 +08:00
wangyuan 714599814e add task 2019-08-15 18:29:46 +08:00
wangyuan 95e7381a2e print tlog 2019-08-15 16:49:19 +08:00
wangyuan 94302befde fix activity 2019-08-14 15:14:29 +08:00
lvxinran 02e214f754 名字修改 2019-08-14 11:56:54 +08:00
lvxinran cd4ad1da3a 日志修改 2019-08-14 11:44:23 +08:00
lvxinran 2e72e3e3f6 名字长度 2019-08-14 11:31:17 +08:00
lvxinran 38715c4bfd 功绩修改 2019-08-14 13:12:54 +08:00
wangyuan f44da1b677 basehandler 构造方法 2019-08-18 18:15:07 +08:00
wangyuan 6046207b77 fix mail & store num & indication user level 2019-08-18 17:21:25 +08:00
zhangshanxue 6631ea50f3 协议解析 2019-08-13 17:11:38 +08:00
wangyuan 4255e37558 reason 2019-08-13 14:35:27 +08:00
lvxinran 80f7c4331e Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-13 14:25:27 +08:00
lvxinran 39efb51a56 功绩难度修改 2019-08-13 14:25:23 +08:00
zhangshanxue 0fac895eb7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-13 13:18:49 +08:00
wangyuan 20a228b9b9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-19 00:01:07 +08:00
zhangshanxue 1638c42ea1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-09-13 10:36:03 +08:00
zhangshanxue fd7b37fc4a acitvity 2019-09-13 10:35:54 +08:00
wangyuan c20652705b fix ission 2019-08-19 00:00:56 +08:00
zhangshanxue ab42fa69bf 活动提示 2019-08-13 13:18:42 +08:00
lvxinran 829e51356d RedisUtil 2019-08-13 10:12:13 +08:00
lvxinran 9a1c002c4b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-13 10:09:37 +08:00
lvxinran 5e5832178d 公会战 2019-08-13 10:09:32 +08:00
lvxinran d301d88bdf 修改名字 2019-08-13 10:08:49 +08:00
wangyuan f16f1dbc99 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-13 10:08:16 +08:00
zhangshanxue 3844229238 acitvity 2019-08-13 10:07:57 +08:00
zhangshanxue 8c5e6a4cba acitvity 2019-09-13 09:35:30 +08:00
zhangshanxue 1d01fcf712 acitvity 2019-09-12 21:54:42 +08:00
zhangshanxue f76ce9cb43 acitvity 2019-09-12 21:39:52 +08:00
zhangshanxue c0293bd314 acitvity 2019-09-12 21:36:54 +08:00
wangyuan 480936bdc5 删除无效日志 2019-08-13 10:07:57 +08:00
zhangshanxue 087d03e8dc Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 21:07:17 +08:00
lvxinran 7b62901318 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 20:52:58 +08:00
lvxinran 81a443322a 公会战 2019-08-12 20:52:54 +08:00
zhangshanxue 4b3435799d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 20:27:43 +08:00
zhangshanxue b2d3f59164 活动结束补发奖励 2019-08-12 20:27:36 +08:00
wangyuan 4cdb969929 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-12 17:49:35 +08:00
wangyuan db8c4d43d9 同步用户状态 2019-08-12 17:49:20 +08:00
lvxinran f46031890a 上个修改 2019-08-12 17:32:06 +08:00
lvxinran d8fa42b0f4 公会战查看对战信息 2019-08-12 17:31:49 +08:00
lvxinran 9497535341 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 17:23:42 +08:00
lvxinran e27985bab6 功绩17修改 2019-08-12 17:23:38 +08:00
lvxinran 29c22526b5 增加RedisKey 2019-08-12 16:06:06 +08:00
lvxinran 6924500cd1 公会战逻辑修改 2019-08-12 16:05:43 +08:00
zhangshanxue a33043d8de Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 16:00:58 +08:00
zhangshanxue c0509d25f2 acitvity 2019-08-12 16:00:36 +08:00
wangyuan a7ee427a08 fix limmit 2019-08-12 15:50:47 +08:00
lvxinran 1fe64c05cb Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 14:30:36 +08:00
lvxinran 9364fbda6d 公会战开始战斗提交 2019-08-12 14:30:32 +08:00
wangyuan cbb6178449 delete log 2019-08-12 13:57:51 +08:00
wangyuan a076812220 fix special 2019-08-12 12:16:20 +08:00
zhangshanxue f6e25e2bae acitvity 2019-08-12 12:03:15 +08:00
wangyuan cff26b2110 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-12 11:15:51 +08:00
wangyuan 968cf84ebd delete unuse log 2019-08-12 11:15:41 +08:00
lvxinran 8395912f43 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-12 11:15:25 +08:00
lvxinran acc29668bc 编队ID修改 2019-08-12 11:15:21 +08:00
wangyuan 042f9310fe Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-12 10:29:02 +08:00
wangyuan a4144852d3 mission 合并 2019-08-12 10:28:49 +08:00
lvxinran f8645932db 计算英雄属性加入teamId 2019-08-12 10:28:00 +08:00
lvxinran 50606d6e24 0点刷新 2019-08-12 10:18:07 +08:00
wangyuan e7a8d82ec3 fix pool 2019-08-16 18:38:47 +08:00
wangyuan 25df23fd53 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-16 17:46:49 +08:00
zhangshanxue 22b1156d7f acitvity 2019-08-18 05:01:41 +08:00
wangyuan a32e878367 51 task 2019-08-16 17:46:18 +08:00
wangyuan 725910f363 修改进度 2019-08-16 17:33:06 +08:00
wangyuan 64d7de1587 fix time 2019-08-10 17:19:30 +08:00
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
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
lvxinran 30abfc1d1c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-06 10:30:48 +08:00
lvxinran 3558ad8ec0 无尽副本出图 2019-08-06 10:30:43 +08:00
wangyuan bb3464a4fa Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-06 10:23:53 +08:00
wangyuan 5072341a07 guild 2019-08-06 10:22:57 +08:00
lvxinran c647d31458 出图修改 2019-08-05 17:24:50 +08:00
wangyuan 3486dbe98c giftgoods 2019-08-05 17:07:01 +08:00
zhangshanxue add03799c1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server
# Conflicts:
#	serverlogic/src/main/java/com/ljsd/jieling/logic/activity/ActivityLogic.java
2019-08-05 17:02:29 +08:00
zhangshanxue 919163f51b 每日首冲和累计充值天数 2019-08-05 17:00:06 +08:00
wangyuan b4e7cf3e5d vip level task 2019-08-05 15:58:48 +08:00
lvxinran 8f588acb05 无尽副本修改 2019-08-05 15:43:29 +08:00
lvxinran 981c3f163a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-05 15:41:08 +08:00
wangyuan f52c4f5462 fix activity flush five 2019-08-05 15:20:12 +08:00
lvxinran fc9e2c54fe 无尽副本修改 2019-08-05 15:09:18 +08:00
wangyuan 7f5ccf558b 活动掉落 2019-08-05 15:07:47 +08:00
wangyuan 54c4f06df1 fix new mission 2019-08-05 11:30:58 +08:00
wangyuan 9cb5277436 new task 2019-08-05 11:27:13 +08:00
wangyuan f90bbee15a 公会 2019-08-05 10:02:29 +08:00
lvxinran bfa231635c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-03 16:51:21 +08:00
lvxinran f2556361e7 定时 2019-08-03 16:51:12 +08:00
wangyuan eef97e054a fix family & task 2019-08-03 16:49:47 +08:00
wangyuan 703a7686b9 离开公会 2019-08-03 16:15:38 +08:00
lvxinran e5110e48e5 无尽副本,自动回复提交 2019-08-03 15:46:23 +08:00
wangyuan f187a5043b beginner task 2019-08-03 14:59:20 +08:00
zhangshanxue dba41c51a3 活动初始化和漏刷 2019-08-03 11:02:03 +08:00
zhangshanxue b05268b766 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-03 09:59:45 +08:00
zhangshanxue 3167653418 战力排行 2019-08-03 09:59:18 +08:00
zhangshanxue 5f5c7ba5f1 排行榜 2019-08-02 18:30:13 +08:00
lvxinran 27e3ec0380 无尽副本修改 2019-08-02 14:57:56 +08:00
zhangshanxue f4665ee4c7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-08-02 13:35:33 +08:00
zhangshanxue 3edd6e7ebc 战力排行 2019-08-02 13:34:37 +08:00
wangyuan dfc0ca056c Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-08-02 09:59:09 +08:00
wangyuan d8ce89bd38 family 2019-08-02 09:57:01 +08:00
lvxinran e045241e91 标志修改 2019-08-01 20:57:41 +08:00
lvxinran b3f597083a 设置无尽副本点 2019-08-01 20:45:20 +08:00
lvxinran ab071737d5 代码提交 2019-08-01 18:37:46 +08:00