Commit Graph

942 Commits (fe99762cac48d156aa1897f8f84dcdab5dafd637)
 

Author SHA1 Message Date
zhangshanxue ae153f19c4 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-21 14:50:41 +08:00
zhangshanxue 302b617582 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-21 10:40:55 +08:00
wangyuan 72403bbe30 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-05-19 13:37:27 +08:00
wangyuan f701ac3a7e 战斗添加额外参数(猎妖之路被动) 2020-05-19 13:37:15 +08:00
zhangshanxue af76611c2f Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-19 12:02:04 +08:00
zhangshanxue 6222e2792f Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-18 21:01:07 +08:00
zhangshanxue 0890629260 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-18 21:01:01 +08:00
wangyuan 5e313cd919 车迟上次玩耍时间 2020-05-18 14:32:18 +08:00
wangyuan d7eb01e38b delete unuse proto 2020-05-16 17:58:03 +08:00
zhangshanxue 286a502fb2 Task【ID1006213】【新战斗版本】大闹天宫(猎妖之路功能优化) 2020-05-16 17:50:59 +08:00
wangyuan c3043da79e random card box 2020-05-16 16:42:35 +08:00
zhangshanxue fe2cec83c1 Task【新战斗版本】公会援助 2020-05-18 06:34:25 +08:00
zhangshanxue b571e09252 Task【新战斗版本】公会援助 协议提交 2020-05-16 10:19:13 +08:00
zhangshanxue c543df2495 Task【新战斗版本】公会援助 协议提交 2020-05-14 16:45:00 +08:00
zhangshanxue 6d0fc2dcfe Task【新战斗版本】公会援助 协议提交 2020-05-14 14:43:10 +08:00
zhangshanxue ed1ba6bb23 Task【新战斗版本】公会援助 协议提交 2020-05-13 15:28:48 +08:00
zhangshanxue 028bbc281c Task【新战斗版本】公会援助 协议提交 2020-05-13 11:20:37 +08:00
zhangshanxue fb2dd38d5b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-13 09:50:11 +08:00
lvxinran 30e91f14a7 加入公会id 2020-05-20 21:16:46 +08:00
lvxinran 16856acb0d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-18 22:38:36 +08:00
lvxinran d79fba06a6 翻拍信息添加用户名 2020-05-18 22:38:32 +08:00
zhangshanxue 265a5642cc Task【新战斗版本】公会援助 协议提交 2020-05-13 09:50:04 +08:00
zhangshanxue 6d9e76bf0f Task【新战斗版本】公会援助 协议提交 2020-05-12 10:20:03 +08:00
lvxinran f8bd8b13b4 十绝阵协议 2020-05-09 15:47:44 +08:00
lvxinran 88ab06e134 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-09 09:51:54 +08:00
lvxinran 80468999c7 最高伤害 2020-05-09 09:51:50 +08:00
lvxinran 720d68cc6d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-08 15:43:07 +08:00
lvxinran c55a657e3f 公会id改为公会名 2020-05-08 15:42:37 +08:00
wangyuan 22116b4247 add uid 2020-05-08 15:30:31 +08:00
wangyuan 919584a8d2 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-05-08 15:18:05 +08:00
zhangshanxue a3f52b860a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-09 05:28:31 +08:00
zhangshanxue 752b0970b5 Task【ID1006175】【新战斗版本】宝物合成 2020-05-09 05:28:26 +08:00
wangyuan 5e70446bd2 car record 2020-05-08 15:16:03 +08:00
wangyuan 3e66064380 fix car team info 2020-05-08 14:03:30 +08:00
wangyuan f81c78a1d4 fightdata 2020-05-08 10:53:31 +08:00
wangyuan e7d245c9d8 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2020-05-07 18:02:27 +08:00
wangyuan 96fd9f5f43 车迟排序 2020-05-07 18:02:15 +08:00
zhangshanxue 5bb1ca6b9e 祭祀 2020-05-07 17:14:16 +08:00
zhangshanxue 88d9f17f20 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-07 16:42:38 +08:00
zhangshanxue 494ba6acbb 祭祀 2020-05-07 16:42:33 +08:00
wangyuan e247a91d6d 车轮时间 2020-05-07 16:13:22 +08:00
wangyuan 7ea1b9478c fix 2020-05-07 15:36:55 +08:00
wangyuan 284cfa6fab fix 2020-05-07 15:14:07 +08:00
wangyuan 4666c9f48f Merge branch 'master' of 60.1.1.230:backend/jieling_protocol
# Conflicts:
#	protos/Family.proto
2020-05-07 14:59:07 +08:00
wangyuan e72a9aa305 车迟玩法 2020-05-07 14:38:07 +08:00
zhangshanxue 62c9606cce Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-07 14:09:32 +08:00
zhangshanxue 6fc05450d3 祭祀 2020-05-07 14:09:10 +08:00
lvxinran 6be35e8116 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2020-05-07 14:01:27 +08:00
lvxinran ba7ebe0435 十绝阵协议号 2020-05-07 14:01:23 +08:00
zhangshanxue aad86e1794 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/Family.proto
2020-05-06 16:26:25 +08:00