Commit Graph

540 Commits (7ce5e055765833b95c2361b2ce2c3209d371c444)
 

Author SHA1 Message Date
jiahuiwen 8888bc4d50 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol
# Conflicts:
#	protos/MapInfoProto.proto
#	protos/MessageTypeProto.proto
2019-06-27 20:29:59 +08:00
jiahuiwen 8c7db44f02 删除多余爬塔协议 2019-06-27 20:27:33 +08:00
wangyuan 3cb7d1fed3 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-06-27 17:45:57 +08:00
wangyuan fb9fc78f99 玩家创角时间 2019-06-27 17:42:14 +08:00
lvxinran 406263ab61 试炼使用炸弹精气值 2019-06-27 17:38:03 +08:00
lvxinran f7c12c7ed7 使用炸弹协议提交 2019-06-27 17:34:48 +08:00
lvxinran ac100edfe7 试炼副本召唤boss,使用炸弹协议 2019-06-27 11:53:44 +08:00
jiahuiwen 84dd7e5a9a 试炼精气 2019-06-26 17:26:27 +08:00
jiahuiwen 9841869b38 试炼副本 修改 2019-06-26 11:20:36 +08:00
jiahuiwen c3254ab43c 进入爬塔副本地图(试炼副本) 2019-06-25 14:04:20 +08:00
wukang 90ebd7e107 add starnum 2019-06-24 17:53:07 +08:00
wukang 0bd98fa221 fu ben xinji 2019-06-24 16:10:35 +08:00
wangyuan a6613c08f8 proto 2019-06-21 17:38:37 +08:00
wangyuan 214315b309 fix 2019-06-21 17:10:02 +08:00
wangyuan 549b667d7d fix mision 2019-06-21 17:02:11 +08:00
wangyuan 1814e351fb 精英怪 2019-06-20 11:12:44 +08:00
wangyuan 581d9fb3a6 精英怪 2019-06-19 17:33:24 +08:00
wangyuan 368e5dc550 重置科技树 2019-06-19 17:17:12 +08:00
gaojie faccea8d10 fix 2019-06-19 16:33:40 +08:00
gaojie 7c81661cb7 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-06-19 15:39:44 +08:00
gaojie 17558458e5 增加消息号 2019-06-19 15:39:38 +08:00
wangyuan ba11565a6a 科技树 2019-06-19 14:49:31 +08:00
wangyuan 90de34e399 科技树升级 2019-06-19 11:29:18 +08:00
wangyuan 6b2af2f0ce 科技树 2019-06-19 10:19:58 +08:00
wangyuan a7edd79b96 路径图 2019-06-18 19:35:03 +08:00
wangyuan d3a243b6b9 lua 2019-06-18 15:49:35 +08:00
lvxinran 7880fdc8c3 工坊升级协议 2019-06-18 15:43:09 +08:00
wangyuan b3e80c7fe7 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-06-18 15:40:09 +08:00
wangyuan 240379e453 fix room fight 2019-06-18 15:39:09 +08:00
wangyuan c651881f78 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-06-18 15:38:53 +08:00
gaojie 30c8984009 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-06-18 14:09:08 +08:00
gaojie 90115cb393 增加战斗力 2019-06-18 14:09:03 +08:00
wangyuan 12544b13d3 fight 2019-06-18 11:51:02 +08:00
gaojie 71e988a9b1 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-06-18 11:04:19 +08:00
wangyuan 0797985baa 移动 2019-06-23 12:20:04 +08:00
wangyuan 563c5bfa0e 血战战斗-beta 2019-06-23 11:03:34 +08:00
gaojie 9d8a8d65b7 fix 2019-06-18 11:04:15 +08:00
wangyuan 6e4a04b79e 改成小写 2019-06-17 10:55:43 +08:00
wangyuan e8d3938979 改成小写 2019-06-17 10:54:57 +08:00
wangyuan 2943d4b4e4 lua 2019-06-17 10:19:34 +08:00
wangyuan 36b8523262 五点任务推送 2019-06-17 10:17:26 +08:00
wangyuan 2145d01678 获取房间全量信息 2019-06-15 17:23:29 +08:00
wangyuan a97c2611b8 服务器五点推送 2019-06-15 17:03:04 +08:00
wangyuan cd2ca89bf5 五点刷新推送 2019-06-15 15:42:23 +08:00
wangyuan be57426afe 每日刷新次数走vip 2019-06-15 14:50:06 +08:00
wangyuan 7b01b0fbd7 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-06-14 19:09:26 +08:00
王永芳 d1a6e38869 在匹配成功创建房间后,发送地图信息 2019-06-14 18:48:13 +08:00
wangyuan 52d7b77125 match 2019-06-14 18:41:37 +08:00
王永芳 db35c69068 实现血战到底服务器端代码时,修改协议 2019-06-14 13:38:03 +08:00
王永芳 1895a22fe9 增加房间游戏结束协议 2019-06-14 10:00:04 +08:00