Commit Graph

2451 Commits (fa6f4e546d65b5e79772b2d9bf96f547ca907cde)
 

Author SHA1 Message Date
lvxinran fa6f4e546d Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-23 22:12:19 +08:00
lvxinran 49453817c2 背包已满处理 2019-10-23 22:12:14 +08:00
lvxinran 21b79fcf03 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-22 21:45:11 +08:00
lvxinran 8a761ab982 公会战条件 2019-10-22 21:45:06 +08:00
wangyuan c536c8c6a5 fix adventure reward 2019-10-22 14:06:50 +08:00
zhangshanxue 6f4f669923 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-22 11:59:36 +08:00
zhangshanxue bfdddc8158 异常和错误提示修改 2019-10-22 11:59:23 +08:00
wangyuan 30c61f868f just one hero in team when init user 2019-10-22 10:38:32 +08:00
wangyuan 915639672d fix week send time 2019-10-22 10:34:53 +08:00
wangyuan d588467de9 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-21 20:21:27 +08:00
wangyuan 0d73139b22 boss 2019-10-21 19:17:39 +08:00
lvxinran 634bdf6317 公会战阶段信息无公会判断 2019-10-21 17:53:28 +08:00
lvxinran dbaac6a1c7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-21 15:25:16 +08:00
lvxinran 554c62964b 公会邮件修改 2019-10-21 15:25:11 +08:00
lvxinran d3158986b2 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-23 13:41:02 +08:00
lvxinran 25339d3188 0.94战斗同步 2019-10-23 13:40:57 +08:00
wangyuan 6ac4dc6cea fix chat 2019-10-21 14:39:32 +08:00
wangyuan 53821ad34c luafight 2019-10-21 14:25:32 +08:00
wangyuan b9b8eaba39 pokemon skill 2019-10-21 14:20:56 +08:00
wangyuan 223a0a8216 fix mission 2019-10-21 10:10:22 +08:00
wangyuan 3bc2f7d755 fix daily mission 2019-10-18 17:49:10 +08:00
wangyuan fa0a8f7990 fix 2019-11-18 17:43:24 +08:00
wangyuan be434caaee fix 2019-10-18 17:33:00 +08:00
wangyuan 425d3bd03a change task 2019-10-18 16:58:32 +08:00
lvxinran 237b1d5683 公会战修改 2019-10-18 14:02:40 +08:00
lvxinran 550a383acf 公会战力修改 2019-10-18 10:41:55 +08:00
lvxinran 93930f1f79 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-18 10:22:40 +08:00
lvxinran 363aa9afad 公会战修改 2019-10-18 10:22:35 +08:00
wangyuan e74583c539 change hero table 2019-10-18 10:13:39 +08:00
wangyuan 693097895b fix bug 2019-10-17 18:07:10 +08:00
wangyuan 321e8fab22 fix serverlogic 2019-10-17 17:56:09 +08:00
lvxinran d4d04d44a2 邮件改为 错误码 2019-10-17 17:39:01 +08:00
lvxinran 31c48619dd Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-17 16:53:03 +08:00
lvxinran c3f35cce43 转让会长修改 2019-10-17 16:52:57 +08:00
wangyuan c87291d6ca change remaintime to leveltime 2019-10-17 16:38:38 +08:00
wangyuan 8b01d62c24 fix bug 2019-10-17 16:29:14 +08:00
lvxinran 7d255d416b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-17 16:24:09 +08:00
lvxinran 1bd24f20d8 公会战修改 2019-10-17 16:24:04 +08:00
zhangshanxue 3f1300a0f6 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-17 15:25:27 +08:00
zhangshanxue eb4064b821 排行榜优化 2019-10-17 15:25:23 +08:00
lvxinran abe5e76f64 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-17 15:01:49 +08:00
lvxinran df36a686cf 公会布防人数修改 2019-10-17 15:01:44 +08:00
lvxinran 91acb26eed Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-02 05:43:21 +08:00
lvxinran 4702609ebb 云梦祈福活动修改 2019-11-02 05:43:16 +08:00
lvxinran dcdb7bd330 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-30 15:18:33 +08:00
lvxinran 663680048b 戒灵秘宝修改 2019-10-30 15:18:28 +08:00
wangyuan b77dd92777 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-17 13:48:01 +08:00
wangyuan 29c503412b fix mainlevel 2019-10-17 13:47:04 +08:00
wangyuan 308ff97757 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-16 17:17:46 +08:00
wangyuan fa15abe76d add guild name 2019-10-16 17:17:28 +08:00