Commit Graph

2718 Commits (3c0f236e4dad1b060cb8fc69a4330f7b735d5b7e)
 

Author SHA1 Message Date
lvxinran 3c0f236e4d Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-12-02 10:42:04 +08:00
lvxinran bb299e4a22 敏感字 2019-12-02 10:41:58 +08:00
wangyuan 349d5a0145 fix init mission 2019-12-02 10:25:47 +08:00
wangyuan b9d9b69b5a Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-29 18:36:36 +08:00
wangyuan 824e845089 fix minggan 2019-11-29 18:36:13 +08:00
zhangshanxue 7f57df878a redis string获取错误处理 2019-11-29 18:34:26 +08:00
wangyuan b4995e599c mingan 2019-11-29 18:24:10 +08:00
zhangshanxue 05a00c8187 redis string获取错误处理 2019-11-29 17:58:52 +08:00
zhangshanxue 77f1c94850 获取gid 2019-11-29 17:28:55 +08:00
zhangshanxue 1a9f356130 获取gid 2019-11-29 15:56:39 +08:00
zhangshanxue 513b0418d3 获取gid 2019-11-29 15:42:23 +08:00
zhangshanxue b36d490f9d 获取gid 2019-11-29 15:40:21 +08:00
zhangshanxue 0a9c1f7e2a 获取gid 2019-11-29 15:12:40 +08:00
zhangshanxue 0d4e4ee5fd 获取gid 2019-11-29 12:54:10 +08:00
wangyuan b1736e56bc fix activity limit 2019-11-29 11:37:46 +08:00
zhangshanxue 83aaad0721 战斗同步 2019-11-28 19:27:35 +08:00
wangyuan d69db99784 rename 2019-11-28 15:14:52 +08:00
wangyuan 14678739f8 fix remove hero 2019-11-28 14:55:47 +08:00
wangyuan 99dc03a323 fix check token 2019-11-28 13:37:42 +08:00
wangyuan bee222b3c1 save 2019-11-28 10:53:51 +08:00
wangyuan a204fe82b1 fix equip 2019-11-28 10:48:47 +08:00
wangyuan 83aac51969 reconnect send heart 2019-11-27 17:05:09 +08:00
wangyuan 02c9baf2a3 luafight 2019-11-27 10:40:20 +08:00
wangyuan f426a7599d fix guild indicaiton 2019-11-27 10:07:40 +08:00
zhangshanxue f09bb2b684 关卡限制活动 2019-11-27 09:52:04 +08:00
zhangshanxue e1786b61f7 关卡限制活动 2019-11-27 09:30:02 +08:00
wangyuan 307768615b fix activity 2019-11-26 17:22:31 +08:00
lvxinran 7d26a0da25 公会宣言长度 2019-11-26 15:29:43 +08:00
zhangshanxue aab51ba39c 五星成长礼按天刷新 2019-12-02 18:32:40 +08:00
zhangshanxue 3cdb228594 五星英雄成长礼 2019-11-25 23:13:52 +08:00
zhangshanxue ba1cb23fb2 五星英雄成长礼 2019-11-25 22:12:44 +08:00
zhangshanxue 26f06a54ae Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-11-25 21:53:50 +08:00
zhangshanxue 3cf23b39ff recharge协议合并策略 2019-11-25 21:17:29 +08:00
zhangshanxue 27d7504a0e Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-11-25 20:19:12 +08:00
zhangshanxue 28cb6035d4 五星英雄成长礼 2019-11-25 20:17:30 +08:00
wangyuan f4f4b87dc7 fix map mission cal 2019-11-25 17:29:11 +08:00
wangyuan 3785d4c2f1 fix 2019-11-25 15:36:45 +08:00
wangyuan 07210538c5 保底 2019-11-25 14:14:03 +08:00
wangyuan 8807cc06ea 保底 2019-11-25 12:10:05 +08:00
wangyuan 5203b5011e 优先检测活动刷新 2019-12-25 11:14:07 +08:00
wangyuan 368006246b ranfom pool 2019-11-25 10:36:38 +08:00
wangyuan 37f5729309 activity mail 2019-11-23 18:03:31 +08:00
zhangshanxue c369ac8d48 活动修改 2019-11-23 11:21:42 +08:00
wangyuan 1631f01146 activity & chat limit message length 2019-11-25 10:51:08 +08:00
wangyuan 199c559446 Merge branch 'online_1121' of 60.1.1.230:backend/jieling_server into online_1121 2019-11-24 19:42:35 +08:00
wangyuan bda2d610f0 activity 2019-11-24 19:42:22 +08:00
lvxinran c73d9fe16e 充值修改 2019-11-22 19:10:13 +08:00
lvxinran 11c188938e 空物品判断 2019-11-22 17:32:58 +08:00
lvxinran 92736c1034 Merge branch 'online_1121' of http://60.1.1.230/backend/jieling_server into online_1121 2019-12-18 00:40:57 +08:00
lvxinran 183c32a12a 工会修改名字 2019-12-18 00:40:42 +08:00