Commit Graph

759 Commits (146a7019f39b600cbeddac9bccce4b216422fad5)
 

Author SHA1 Message Date
wangyuan 146a7019f3 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-20 13:55:20 +08:00
wangyuan 6c13822f6e 是否是当前竞猜信息 2019-12-20 13:55:13 +08:00
lvxinran 002099c495 取消协议 2019-12-20 10:48:02 +08:00
lvxinran 0073746e95 物品上限 2019-12-19 18:21:22 +08:00
lvxinran 27a3cb049c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/PlayerInfoProto.proto
2019-12-19 18:12:41 +08:00
lvxinran 719a995fb5 检测物品上限 2019-12-19 18:11:51 +08:00
zhangshanxue 370e9e44a8 TASK【ID1005242】 【选人起名】 协议提交 2019-12-19 13:42:49 +08:00
zhangshanxue cf2eaed3ff TASK【ID1005242】 【选人起名】 协议提交 2019-12-19 11:16:41 +08:00
wangyuan e03457b29a 我的下注信息 2019-12-18 16:13:31 +08:00
wangyuan 628899c397 fix 2019-12-18 15:52:12 +08:00
wangyuan 9d89c4f395 position 2019-12-18 15:50:27 +08:00
wangyuan 8992abe254 删除无效协议 2019-12-17 17:59:25 +08:00
wangyuan 2d87df9ab7 fix type 2019-12-17 17:38:26 +08:00
lvxinran da3b00028f 排行榜协议 2019-12-17 10:50:47 +08:00
lvxinran 3086a01ecf 刷新次数 2019-12-16 18:37:04 +08:00
wangyuan 6be9b93a9b fix arean id 2019-12-16 21:01:30 +08:00
wangyuan 941f5511a1 add comment 2019-12-16 16:46:28 +08:00
wangyuan f2a19b406c add id 2019-12-16 16:45:21 +08:00
wangyuan 9c9e11995b teamid 2019-12-16 14:08:16 +08:00
wangyuan ee2fff6407 fix rank 2019-12-16 13:32:08 +08:00
wangyuan 396e634bab add teamid 2019-12-16 13:23:28 +08:00
wangyuan e0e31cc753 观看决赛信息 2019-12-13 20:37:41 +08:00
wangyuan f79c872bc7 battle detail 2019-12-13 19:41:52 +08:00
wangyuan 5f1eeb3893 score 2019-12-13 10:56:09 +08:00
lvxinran 6a63aa9889 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-12-13 10:31:57 +08:00
lvxinran d2269b148e 迷宫寻宝刷新任务 2019-12-13 10:31:51 +08:00
wangyuan fb926a1dec Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-12 18:32:11 +08:00
wangyuan 05350722db 推送巅峰赛进度信息 2019-12-12 18:32:07 +08:00
lvxinran 0a3a72cfd2 派遣 2019-12-12 17:05:24 +08:00
lvxinran 5771aefa47 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-12-12 15:17:05 +08:00
lvxinran 8cbd8af99c 迷宫寻宝协议 2019-12-12 15:17:01 +08:00
wangyuan 9929a07d50 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-12 13:35:22 +08:00
wangyuan 52f285d6c2 下注 2019-12-12 13:35:17 +08:00
zhangshanxue 9062256d5c Task【ID1005229】【特权调整】协议提交 2019-12-12 11:14:32 +08:00
zhangshanxue 3f5af63f28 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-12-12 11:00:54 +08:00
zhangshanxue f35e16443d Task【ID1005229】【特权调整】协议提交 2019-12-12 11:00:47 +08:00
wangyuan 1f30567fa1 修正竞猜信息 2019-12-12 10:53:32 +08:00
wangyuan 0350e7a4e5 fix 2019-12-11 17:51:53 +08:00
wangyuan 3b0558dc94 reback 2019-12-11 17:47:09 +08:00
wangyuan 8db7c18e68 TeamOneTeamInfo 2019-12-11 17:44:16 +08:00
zhangshanxue 711afb239f Task【ID1005229】【特权调整】协议提交 2019-12-11 16:59:32 +08:00
wangyuan 904d8dece5 fix 2019-12-11 16:37:44 +08:00
wangyuan c27e6fcb7d 历史最高排名 2019-12-11 16:35:35 +08:00
wangyuan 9d50cb0de2 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-12-11 16:11:46 +08:00
lvxinran 08dabf6aeb 活动协议 2019-12-14 00:01:22 +08:00
lvxinran cd65719a14 限时抽卡 2019-12-13 08:08:27 +08:00
wangyuan 4a47e78ed8 巅峰赛 2019-12-11 16:10:48 +08:00
lvxinran 77360f264f Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-12-09 17:01:11 +08:00
lvxinran 8012fbe5b2 排行榜 公会信息 2019-12-09 17:01:07 +08:00
wangyuan 2e8ab40299 巅峰赛 2019-12-06 20:28:05 +08:00