Commit Graph

2587 Commits (5f5e9c8541fb9a7d91a6f03d1b7bfaf0e27ebc29)
 

Author SHA1 Message Date
zhangshanxue 6178eb72a5 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-28 13:51:34 +08:00
zhangshanxue 09bc84ebcc 重置活动 补发全部奖励 2019-10-28 13:51:22 +08:00
zhangshanxue 5338c735b1 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-11-28 11:47:11 +08:00
zhangshanxue 452d1a84b9 重置活动 补发全部奖励 2019-11-28 11:46:45 +08:00
lvxinran 23ee57749c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-28 12:05:53 +08:00
lvxinran a35eefefac 战斗同步 2019-10-28 12:05:04 +08:00
wangyuan 70dcd12c42 Merge branch 'master' of 60.1.1.230:backend/jieling_server 2019-10-28 11:36:08 +08:00
wangyuan 520950456d fix rank 2019-10-28 11:35:35 +08:00
wangyuan 6dca605039 挂机奖励预览 2019-10-30 11:04:59 +08:00
lvxinran 6abcb5ce6b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-28 11:23:17 +08:00
lvxinran f8174bddc1 法宝加成判断,公会职位推送修改 2019-10-28 11:23:13 +08:00
wangyuan 93643930c6 fixc resend 2019-10-27 17:35:16 +08:00
wangyuan b0ef60d864 filter 0 2019-10-27 16:37:24 +08:00
wangyuan 3df321bc11 hero 2019-10-27 16:18:08 +08:00
zhangshanxue ccc0b8512a Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-25 15:34:53 +08:00
wangyuan a07565b16b rank 2019-10-27 15:34:21 +08:00
wangyuan 6ce050cbe8 fix rank 2019-10-27 15:28:58 +08:00
wangyuan 2ec9009738 luafight 2019-10-27 14:56:13 +08:00
wangyuan 8b0480c652 fix fight rank 2019-10-27 12:03:07 +08:00
zhangshanxue be7a119263 异常和错误提示修改 2019-10-25 15:34:46 +08:00
zhangshanxue b946685cdf 跑马灯 2019-10-25 15:27:24 +08:00
zhangshanxue 62e5c9314c Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-25 11:57:08 +08:00
wangyuan d1f50fddf7 fix fight hero passskill 2019-10-27 11:33:27 +08:00
zhangshanxue 14e86450a4 跑马灯 2019-10-25 11:57:03 +08:00
lvxinran 9c9af49df7 Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-24 15:24:37 +08:00
lvxinran b2404f1326 战斗逻辑 2019-10-24 15:24:18 +08:00
zhangshanxue 070774cc6b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-24 10:34:07 +08:00
zhangshanxue d2be1a3355 异常和错误提示修改 2019-10-24 10:34:02 +08:00
lvxinran d254b2793b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-23 17:38:51 +08:00
lvxinran e50658debc 背包上限修改 2019-10-23 17:38:46 +08:00
zhangshanxue bbfbfc5c9b Merge branch 'master' of http://60.1.1.230/backend/jieling_server 2019-10-23 17:36:07 +08:00
zhangshanxue 30a775ff89 异常和错误提示修改 2019-10-23 17:36:03 +08:00
wangyuan 47e0d4fb65 fix adventure rewrd 2019-10-23 15:11:53 +08:00
lvxinran 5ed723c9da 无尽副本修改 2019-10-23 14:48:40 +08:00
lvxinran 3fad81a218 公会战安慰奖励 2019-10-24 00:11:43 +08:00
lvxinran e5a1eb23cf 战斗同步0.94 2019-10-23 23:37:04 +08:00
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