Commit Graph

919 Commits (90178830187c04e5ac9c5bade3e39a2610f55018)
 

Author SHA1 Message Date
wangyuan 7e4f5d99b9 lua 2019-01-25 14:23:33 +08:00
wangyuan 4946112f19 英雄突破id 2019-01-25 14:23:01 +08:00
wangyuan f3b69f1878 英雄 2019-01-25 12:05:45 +08:00
gaojie 19656cd516 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-01-24 17:20:49 +08:00
gaojie 3e16c355bc 读取邮件 2019-01-24 17:20:45 +08:00
wangyuan 6b60a5dfe1 冒险第一版 2019-01-24 16:31:46 +08:00
gaojie d52808f490 邮件 2019-01-23 18:40:59 +08:00
wangyuan 9bba84907c 英雄升星 2019-01-23 11:04:18 +08:00
gaojie 82b0c81cdf 物品分页请求 2019-01-23 10:26:05 +08:00
wangyuan ec683143b7 msg id 2019-01-22 16:34:25 +08:00
wangyuan d6eaf763bb lua 2019-01-22 16:30:03 +08:00
wangyuan 9b3b99b419 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-01-22 16:29:33 +08:00
wangyuan d913781948 hero level up 2019-01-22 16:29:16 +08:00
gaojie 953e7a46d6 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-01-22 16:13:10 +08:00
gaojie 2e0842da93 GM 2019-01-22 16:13:06 +08:00
wangyuan 43110c7ec6 lua 2019-01-22 14:45:24 +08:00
wangyuan b89a507705 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-01-22 14:44:52 +08:00
wangyuan b0efd8fe01 删除英雄属性 2019-01-22 14:39:33 +08:00
mashiyu 8635185ed1 类型 2019-01-22 14:07:19 +08:00
jiahuiwen 808641a44e 地图,每个格子放一个事件 2019-01-22 12:02:11 +08:00
wangyuan 9ccd7790bb lua 2019-01-22 09:58:25 +08:00
wangyuan 554bf7dd70 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-01-22 09:58:00 +08:00
wangyuan 48476bdb29 fix 2019-01-22 09:51:21 +08:00
jiahuiwen d58488770f Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-01-22 09:50:46 +08:00
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