Commit Graph

361 Commits (b7a839d4641ed7b3037d2cb0b325366936bc52ff)
 

Author SHA1 Message Date
wangyuan ed8a860468 活动开启状态 2019-06-06 14:22:52 +08:00
wangyuan fe9e6d3826 提交首冲 2019-06-06 12:14:28 +08:00
wangyuan 58076f61d1 购买礼包 2019-06-06 10:15:01 +08:00
gaojie dd9651f8f7 fix 2019-06-05 15:39:39 +08:00
gaojie 1405ed0a78 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/MessageTypeProto.proto
2019-06-05 14:36:22 +08:00
wangyuan 69f41d63cf fix 2019-06-06 19:03:37 +08:00
gaojie b4c8f0be9f 聊天 2019-06-05 14:35:30 +08:00
wangyuan f3d340f839 每日任务 2019-06-05 10:47:38 +08:00
wangyuan c61e623dcc 累计充值活动 2019-06-04 09:52:53 +08:00
jiahuiwen 341c590c05 回退 2019-05-31 17:26:56 +08:00
jiahuiwen 364c321118 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-05-31 17:25:28 +08:00
wangyuan d2b9af5cc7 fix comment 2019-06-02 17:09:57 +08:00
wangyuan 35aa61409f delete unuse 2019-06-03 17:38:52 +08:00
jiahuiwen 537b847442 快速战斗推 主线任务 2019-05-31 17:25:17 +08:00
wangyuan 6bb775a7c8 fix 2019-05-28 15:22:59 +08:00
wangyuan f694a4529f 锻造个数 2019-05-28 14:42:24 +08:00
wangyuan 0679029853 fix 2019-05-28 09:58:02 +08:00
wangyuan 6569401a46 fix 2019-05-27 20:21:42 +08:00
wangyuan b59f3e25e7 战力变更 2019-05-27 20:18:55 +08:00
wangyuan 09f75235fb Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-27 14:02:01 +08:00
wangyuan f0034260c9 vip任务相关协议 2019-05-27 14:01:40 +08:00
wangyuan bd840fc87f fix name 2019-05-24 16:26:43 +08:00
wangyuan 3fc5344b23 vip特权 2019-05-24 07:34:22 +08:00
wangyuan 11abb3d96a 区域等级 2019-05-21 17:37:25 +08:00
wangyuan b4ba4a8e5e 挂机奖励 2019-05-20 14:50:16 +08:00
wangyuan 8edd131132 lua 2019-05-16 20:34:29 +08:00
wangyuan 39cf14b335 增加怪物是否被击杀 2019-05-16 20:33:55 +08:00
gaojie c791eaa706 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-05-16 20:22:03 +08:00
gaojie 48b1889e27 分解卡牌 2019-05-16 20:21:57 +08:00
wangyuan 2247ca1ba5 lua 2019-05-16 20:19:13 +08:00
wangyuan ff151b470d 挂机推送 2019-05-16 20:18:34 +08:00
wangyuan d83f2a8d3c lua 2019-05-16 19:23:27 +08:00
wangyuan 46bb38fde3 delete 2019-05-16 19:22:49 +08:00
wangyuan 6da07248b7 lua 2019-05-16 17:11:11 +08:00
wangyuan 900a0bf81d Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-16 16:54:21 +08:00
wangyuan 8a76db460c 修改名称 2019-05-16 16:53:11 +08:00
wangyuan 285319bb9f lua 2019-05-16 16:45:50 +08:00
wangyuan bcbab8834d fix 2019-05-16 16:45:11 +08:00
wangyuan 534d6f0b75 挂机刷新发现boss lua 2019-05-16 16:34:04 +08:00
wangyuan 5397f27327 挂机刷新发现boss 2019-05-16 16:33:33 +08:00
wangyuan 3bcbe3aa9b Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-16 14:44:31 +08:00
wangyuan fadd30c694 delete unuse 2019-05-16 14:44:16 +08:00
wangyuan e96a73b6ab 挂机lua 2019-05-16 14:38:11 +08:00
wangyuan e6532f394e Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-16 14:37:13 +08:00
wangyuan 9872ff269f 挂机协议 2019-05-16 14:36:57 +08:00
gaojie 7563a5c03a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/PlayerInfoProto.proto
2019-05-14 17:15:01 +08:00
gaojie 7254e72af6 fix 2019-05-14 17:14:13 +08:00
wangyuan 5edf237ba0 lua 2019-05-14 16:31:45 +08:00
wangyuan d82265d293 time function 2019-05-14 16:31:30 +08:00
wangyuan 90dfae824a 秘盒今日抽取次数 2019-05-14 13:44:23 +08:00