Commit Graph

1645 Commits (master_zzxx)
 

Author SHA1 Message Date
gaojie 4196924033 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-01-22 09:50:39 +08:00
gaojie 8afb90acc0 掉落 2019-01-22 09:50:34 +08:00
jiahuiwen f27c6d7bab Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/MapInfoProto.proto
2019-01-21 17:52:38 +08:00
jiahuiwen 75aeee4a0f 地图 2019-01-21 17:51:57 +08:00
wangyuan d844d5704b delete mapinfo 2019-01-21 17:51:08 +08:00
mashiyu e8a5edb92a 提交 2019-01-18 17:37:08 +08:00
mashiyu 2f6b8aa833 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-01-18 17:36:29 +08:00
mashiyu e8660dce98 提交 2019-01-18 17:36:20 +08:00
jiahuiwen 44a3f79eec fix 2019-01-18 17:05:34 +08:00
jiahuiwen 31e30263a5 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/MapInfoProto.proto
2019-01-18 16:56:34 +08:00
jiahuiwen 16cbcbc637 地图修改 2019-01-18 16:55:52 +08:00
wangyuan e74c3b71b9 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-01-18 16:00:37 +08:00
wangyuan ebe74028fb 抽卡 2019-01-18 16:00:26 +08:00
mashiyu e2bed73a08 提交 2019-01-18 15:40:47 +08:00
mashiyu fba6374c55 提交协议10602和10603有毒 2019-01-18 12:42:05 +08:00
mashiyu bca9336cb9 提交 2019-01-18 12:05:10 +08:00
mashiyu 369f373f48 测试完毕 2019-01-17 20:46:03 +08:00
mashiyu cb092e1929 test 2019-01-17 19:46:21 +08:00
mashiyu fb3d73327f 提交 2019-01-17 19:43:42 +08:00
mashiyu eeb0de22b3 test 2019-01-17 19:43:08 +08:00
mashiyu b7386110fb 提交 2019-01-17 19:25:27 +08:00
mashiyu 03aff99c15 提交 2019-01-17 19:24:08 +08:00
mashiyu 24f12c58f3 提交 2019-01-17 19:09:23 +08:00
mashiyu b216e2f59d 123 2019-01-17 17:19:54 +08:00
mashiyu 9e1bc99242 尝试成功 2019-01-17 17:13:25 +08:00
wangyuan 765bd07f52 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-01-17 17:12:09 +08:00
wangyuan 7656d83468 back 2019-01-17 17:11:52 +08:00
mashiyu 118319e621 尝试 2019-01-17 17:09:33 +08:00
wangyuan 69d2be4949 change repeated 2019-01-17 17:08:31 +08:00
mashiyu 7db005ef22 提交 2019-01-17 14:48:05 +08:00
mashiyu 23c9c06631 加字段 2019-01-17 14:37:08 +08:00
mashiyu e6b514843c 改脚本 2019-01-16 16:45:23 +08:00
wangyuan 637eed684c 修改item 2019-01-16 16:20:04 +08:00
mashiyu 8bbfff456a 改脚本 2019-01-16 14:49:35 +08:00
mashiyu 916669eab6 提交 2019-01-16 11:47:32 +08:00
mashiyu 921d9f4506 提交 2019-01-16 10:48:20 +08:00
gaojie 634e9bc7d1 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-01-15 15:20:34 +08:00
gaojie b887635b61 GM协议 2019-01-15 15:20:30 +08:00
mashiyu 013070477e 提交 2019-01-15 14:15:23 +08:00
mashiyu ad7bbb5d0c 协议 2019-01-11 19:28:40 +08:00
mashiyu 25823ddac0 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-01-08 09:37:59 +08:00
mashiyu 0f2b5f2fe2 结构 2019-01-08 09:37:36 +08:00
jiahuiwen 5e3b6fee8b 地图 2019-01-07 20:03:29 +08:00
mashiyu 4bb849ab12 协议初版 2019-01-04 15:08:41 +08:00
mashiyu cd251b1f23 Initial commit 2018-12-27 17:56:49 +08:00