root
/
miduo_protocol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,645 Commits
21 Branches
7 Tags
9.8 MiB
Commit Graph

1568 Commits (master_dev)

Author SHA1 Message Date
wangyuan 824d9d4596 已领取哪些好友体力 2019-08-19 11:43:28 +08:00
wangyuan 39a0cac945 更新秘盒赛季信息 2019-08-14 17:24:33 +08:00
lvxinran f36490863f Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-13 15:00:47 +08:00
lvxinran 822fec2cb2 公会战请求阶段信息 2019-08-13 15:00:38 +08:00
wangyuan 6e5d834841 更新玩家信息 2019-08-13 14:58:19 +08:00
lvxinran 906590cdc2 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-12 17:26:30 +08:00
lvxinran 0ba93477c8 公会战协议修改 2019-08-12 17:26:26 +08:00
wangyuan dffc55eaf7 玩家走路信息 2019-08-12 17:11:19 +08:00
wangyuan 499c2e87ee Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-12 16:22:15 +08:00
wangyuan 7ecb94bddd 更新状态 2019-08-12 16:21:45 +08:00
lvxinran 92c4569067 公会获取对手信息协议增加 2019-08-12 16:04:45 +08:00
lvxinran 9af395e4da 查看公会信息 2019-08-12 14:59:14 +08:00
lvxinran 4df16edaeb 公会协议 2019-08-09 16:36:16 +08:00
wangyuan 6132992f3f dropout 2019-08-09 16:13:08 +08:00
lvxinran 2abb0fb55f Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-09 15:36:19 +08:00
lvxinran cd87912fb3 公会战协议修改 2019-08-09 15:36:15 +08:00
wangyuan 36f8abb998 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-09 15:02:29 +08:00
wangyuan 421701bdcf family indication 2019-08-09 15:02:09 +08:00
lvxinran a37b194abb 布防indication协议 2019-08-09 14:54:46 +08:00
lvxinran d48cca2488 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-09 14:40:40 +08:00
lvxinran 12947b78a7 布防协议修改 2019-08-09 14:40:33 +08:00
wangyuan b276b090d7 family move name indication 2019-08-09 14:20:27 +08:00
wangyuan 4f75ba96ee 公会人员行走 2019-08-09 14:15:33 +08:00
lvxinran 5a3ac6a8e3 调整布防协议 2019-08-08 16:59:19 +08:00
lvxinran d8157bd9b3 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-07 17:17:48 +08:00
lvxinran 8978a5be54 公会战协议 2019-08-07 17:17:44 +08:00
zhangshanxue 04062c96b2 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-07 16:48:16 +08:00
zhangshanxue 63f0f27036 排行榜 2019-08-07 16:48:11 +08:00
lvxinran 5b0875c749 公会协议 2019-08-07 16:00:41 +08:00
lvxinran 0d54e14658 无尽副本已开启的地图信息 2019-08-07 15:11:35 +08:00
wangyuan dc3500d04c test 2019-08-07 14:47:10 +08:00
lvxinran dc3ffc9860 工会战协议 2019-08-07 13:44:18 +08:00
lvxinran d5f6bcd391 公会战布防协议 2019-08-07 11:27:24 +08:00
wangyuan c1cc40fa4e fight lastXy 2019-08-06 20:08:13 +08:00
wangyuan 3c7d3b5183 领取七日狂欢积分奖励 2019-08-06 18:16:16 +08:00
lvxinran 1f5fcc0276 协议修改 2019-08-06 10:36:00 +08:00
lvxinran e8f9862e18 第一编队信息协议修改 2019-08-06 10:16:51 +08:00
lvxinran f6379aadda 无尽副本出图统计 2019-08-06 09:59:38 +08:00
lvxinran 396ee7e85a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-06 09:57:04 +08:00
lvxinran 8c700c695d 玩家第一编队信息 2019-08-06 09:57:00 +08:00
zhangshanxue 67b85d269d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-05 21:05:31 +08:00
zhangshanxue bbdcc06c3e 签到 2019-08-05 21:05:23 +08:00
lvxinran b6811294a3 获取异妖编队协议修改 2019-08-05 20:42:26 +08:00
lvxinran edc539754c 获取协议 2019-08-05 20:36:55 +08:00
lvxinran 83ecb337f2 冲突处理 2019-08-05 20:31:40 +08:00
lvxinran 6ecb1bfe9d 获取第一编队信息 2019-08-05 20:31:20 +08:00
lvxinran 1764c308d7 获取第一编队 2019-08-05 20:28:40 +08:00
zhangshanxue 655bce376b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-05 18:34:11 +08:00
zhangshanxue 36269c24a8 签到 2019-08-05 18:33:55 +08:00
zhangshanxue 7d53c7aad1 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-07 09:38:58 +08:00
zhangshanxue f6f3d363d7 达人协议 2019-08-07 09:38:53 +08:00
wangyuan 1adee6d68e giftgoods time 2019-08-05 17:04:54 +08:00
lvxinran 9da9b92d8e 无尽协议 2019-08-05 16:22:56 +08:00
wangyuan 531f6b729e 解散公会开始时间 2019-08-03 18:02:21 +08:00
wangyuan d5f454fef8 解散公会开始时间 2019-08-03 17:37:46 +08:00
wangyuan 6c8ca3156f 退出公会 2019-08-03 16:15:02 +08:00
wangyuan f2a3c76e6f repeated -> optional 2019-08-03 15:13:07 +08:00
wangyuan 82961ba9f4 fix 2019-08-03 11:57:55 +08:00
wangyuan f49fed39c1 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-03 11:55:16 +08:00
wangyuan 83f77f4940 success or fail for family notice 2019-08-03 11:55:02 +08:00
lvxinran 92097831a7 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-03 11:33:47 +08:00
lvxinran ad6a305b8e 无尽副本刷新行动力 2019-08-03 11:33:34 +08:00
wangyuan 3bb6903c21 family update 2019-08-03 10:59:47 +08:00
wangyuan e8461ef49b family change indicaiton 2019-08-02 18:41:25 +08:00
wangyuan 529a74da6f fix 2019-08-02 18:12:37 +08:00
wangyuan 59230cdb0c 修改公会加入类型 2019-08-02 17:52:19 +08:00
wangyuan d6939d5556 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-02 17:46:12 +08:00
wangyuan 2dcd2e2afa 公会宣言 2019-08-02 17:45:52 +08:00
zhangshanxue bbc027484c Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-02 14:42:46 +08:00
zhangshanxue 6906e62757 活动进度推送 2019-08-02 14:42:43 +08:00
wangyuan 137b294e8a family indication 2019-08-02 14:36:27 +08:00
zhangshanxue e0e2793e8b Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 
# Conflicts:
#	protos/CommonProto.proto
#	protos/MessageTypeProto.proto
 2019-08-02 13:28:09 +08:00
zhangshanxue 9b5246ce0a 战力排行 2019-08-02 13:26:05 +08:00
lvxinran 399596c8b8 修改 2019-08-02 11:12:27 +08:00
lvxinran cc4baf23fa 标志协议 2019-08-02 11:11:26 +08:00
lvxinran 32169e38dd 删除标记 2019-08-02 11:06:00 +08:00
wangyuan ca23bed2fa family apply 2019-08-01 21:03:02 +08:00
lvxinran 147e970a16 设置标志协议 2019-08-01 20:52:43 +08:00
wangyuan 62cd526772 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-08-01 19:53:49 +08:00
wangyuan 15126d39ae family 2019-08-01 19:53:33 +08:00
lvxinran 984bb32665 WUJIN 2019-08-01 18:43:04 +08:00
lvxinran d7bf2a8c0e Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-01 18:22:47 +08:00
lvxinran bd95c213dc 协议提交 2019-08-01 18:22:43 +08:00
wangyuan 7863f2c302 fix family 2019-08-01 17:56:31 +08:00
wangyuan 80fa28f767 family join 2019-08-01 15:16:22 +08:00
lvxinran b3d7f35ca1 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-01 13:57:38 +08:00
lvxinran bde11a7d0f 无尽副本协议 2019-08-01 13:57:31 +08:00
zhangshanxue d657ae3822 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-08-01 11:58:44 +08:00
zhangshanxue 09ca37893f 招财猫 2019-08-01 11:58:19 +08:00
wangyuan a109e67d2c family base 2019-08-01 11:51:34 +08:00
zhangshanxue f0504aeef5 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-07-31 18:14:39 +08:00
zhangshanxue 0e9f57ca9c 招财猫协议 2019-07-31 18:13:45 +08:00
wangyuan 883713badc Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 
# Conflicts:
#	protos/CommonProto.proto
 2019-07-31 17:44:54 +08:00
wangyuan c49a9d6c3f family 2019-07-31 17:43:51 +08:00
lvxinran c81581b51c 修改 2019-07-30 15:52:47 +08:00
lvxinran 9c42fa82ae Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-07-30 15:49:24 +08:00
lvxinran 052fc147dc 无尽副本协议 2019-07-30 15:49:12 +08:00
wangyuan 0f71b4ef26 关闭活动推送 2019-07-30 15:12:16 +08:00
wangyuan 30411073d0 activity update 2019-07-30 14:51:53 +08:00
lvxinran 34c93b9b68 协议提交 2019-07-25 19:09:54 +08:00
lvxinran 87f93324d6 头像框修改 2019-07-25 10:49:40 +08:00
lvxinran fbcbc3f146 云梦祈福刷新时间 2019-07-25 05:25:29 +08:00
lvxinran 3cbe6fb795 预览 2019-07-23 20:30:10 +08:00
wangyuan 9943482a86 dead times 2019-07-23 19:41:06 +08:00
wangyuan 10dd9af0e3 够买孙龙 2019-07-23 16:26:09 +08:00
wangyuan 280dfb67fc 商店推送 2019-07-23 15:32:16 +08:00
wangyuan 173afde77f 任务id 2019-07-23 14:49:21 +08:00
wangyuan 6250c4e956 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-07-23 11:20:05 +08:00
wangyuan 900ac5532d treasure task 2019-07-23 11:19:53 +08:00
lvxinran 633e0953a2 协议修改 2019-07-22 18:25:14 +08:00
lvxinran fb95a0c21a 云梦祈福协议修改 2019-07-22 18:13:32 +08:00
lvxinran 82932eb2ba 云梦祈福协议修改 2019-07-22 16:46:11 +08:00
lvxinran 6d94ca929a 云梦祈福协议提交 2019-07-22 16:06:36 +08:00
lvxinran 1199066ea0 5点重置试炼副本 2019-07-19 17:39:58 +08:00
wangyuan 8df7f5a45e 扫荡要精英怪信息 2019-07-19 14:52:03 +08:00
wangyuan 977f10abf6 指令结果 2019-07-19 11:19:37 +08:00
lvxinran 7ebb8db885 头像框修改添加 2019-07-18 16:02:57 +08:00
wangyuan e9fc318776 购买商品类型结束时间 2019-07-17 15:13:27 +08:00
wangyuan 54707d07f3 fix Proto 2019-07-16 20:57:05 +08:00
lvxinran b7a749313a 试炼层级奖励 2019-07-16 20:06:44 +08:00
lvxinran e92a4e4996 试炼副本层级奖励 2019-07-16 19:43:26 +08:00
wangyuan 8ad62ae897 修改血战协议 2019-07-16 18:29:51 +08:00
lvxinran 84567222a5 图鉴协议添加 2019-07-16 17:38:13 +08:00
wangyuan 5d7bfba2e2 血战场景 2019-07-16 14:54:48 +08:00
wangyuan 80e8e82111 hero count 2019-07-16 10:55:15 +08:00
wangyuan 6f9b3d2f46 随机生成动态地图信息 2019-07-15 14:17:01 +08:00
lvxinran 358584e57f 扫荡协议 2019-07-15 11:29:20 +08:00
lvxinran f10da03294 精英副本扫荡云游商店 2019-07-15 09:54:59 +08:00
lvxinran 0c412019e7 装备附带技能协议提交 2019-07-12 10:14:38 +08:00
lvxinran 802ea0c24f 试炼排行榜修改 2019-07-11 14:51:34 +08:00
lvxinran 94485f64ca 试炼排行榜协议 2019-07-10 11:34:38 +08:00
wangyuan c73af881ca red type 2019-07-09 19:08:59 +08:00
wangyuan 5b4e17621e bag type 2019-07-09 11:33:45 +08:00
wangyuan 4f78f1d2ff update bag 2019-07-08 22:33:07 +08:00
wangyuan 3216a43d08 红点 & boss 信息 2019-07-08 12:06:49 +08:00
lvxinran 66d1950727 接收数据协议提交 2019-07-05 14:19:42 +08:00
wangyuan 67df154335 fix 2019-07-04 22:05:13 +08:00
wangyuan c7e4e6a467 adventure left 2019-07-04 21:46:34 +08:00
lvxinran fa81ab9d07 精英副本选择协议修改 2019-07-04 17:39:16 +08:00
lvxinran 0d3d997df8 精英副本选择暂存 2019-07-04 17:19:51 +08:00
gaojie 887d5f8d64 fix 2019-07-03 16:26:27 +08:00
gaojie c2b25acd9a 扫荡 2019-07-03 16:21:56 +08:00
gaojie fa160da8b7 fix 2019-07-03 16:12:01 +08:00
gaojie 0e944118f4 fix 2019-07-03 16:11:11 +08:00
gaojie b7a839d464 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-07-03 15:44:27 +08:00
gaojie 637924d5e3 刷新道具数量 2019-07-03 15:44:22 +08:00
lvxinran 2af3780258 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-07-03 14:51:21 +08:00
lvxinran 91a12b0b10 试炼精气值修改 2019-07-03 14:51:17 +08:00
wangyuan 28e8fe5bf0 kill reward 2019-07-03 14:20:40 +08:00
wangyuan f2cd7cb6bf 已经玩过的普通副本信息已经玩过的普通副本信息已经玩过的普通副本信 2019-07-03 13:50:25 +08:00
lvxinran 3b88b6fb5e 爬塔试炼退出副本时间协议 2019-07-02 17:57:09 +08:00
lvxinran 9b87b32132 使用buff事件协议修改 2019-07-02 12:12:10 +08:00
lvxinran 6b8e7dc9af 使用buff协议修改 2019-07-02 11:39:51 +08:00
lvxinran aec3f9046a 退出地图协议修改 2019-07-01 19:44:04 +08:00
lvxinran 5a882c263a 爬塔最后一层时间协议 2019-07-01 19:28:03 +08:00
lvxinran 4947f41a47 重置副本多余协议删除 2019-07-06 06:36:03 +08:00
lvxinran 2d1f3686fe 出图使用时间 2019-07-03 05:03:30 +08:00
wangyuan a1cac78e87 扫荡 2019-07-02 13:01:05 +08:00
lvxinran cfa80271d9 是否显示重置 2019-06-29 16:25:22 +08:00
wangyuan 0c421d4dc6 fix 2019-06-29 12:12:48 +08:00
lvxinran 16ee74c80e buff信息协议 2019-06-28 16:23:47 +08:00
lvxinran 15afb838e3 试炼buff协议提交 2019-06-28 14:53:26 +08:00
wangyuan 718c85d13d Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-06-30 16:46:16 +08:00
wangyuan 8b3f55138b 刷新boss indication 2019-06-30 16:45:12 +08:00
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
lvxinran 7880fdc8c3 工坊升级协议 2019-06-18 15:43:09 +08:00
wangyuan 240379e453 fix room fight 2019-06-18 15:39:09 +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 e8d3938979 改成小写 2019-06-17 10:54:57 +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
wangyuan 7b8dd308d2 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-06-13 19:27:01 +08:00
wangyuan c7bc1ce163 装备入手时间 2019-06-13 19:26:45 +08:00
王永芳 12cd1b5a1a 整理血战协议及消息ID 2019-06-13 17:28:11 +08:00
王永芳 be8e68a55b 血战到底协议定义，和郭涛简单确认过 2019-06-13 14:52:12 +08:00
王永芳 1543d1f8f6 血战到底协议定义 2019-06-13 13:34:54 +08:00
王永芳 3e43c06dae 血战到底的协议预定义 2019-06-13 12:36:40 +08:00
gaojie 08f82be45e 刷新好友状态 2019-06-13 11:40:53 +08:00
gaojie 75dc58d651 Merge branches 'master' and 'master' of http://60.1.1.230/backend/jieling_protocol 2019-06-12 20:44:52 +08:00
gaojie 3c3486c5bb 好友信息推送 2019-06-12 20:44:48 +08:00
wangyuan 0b56484e50 获取天赋异妖信息 2019-06-12 20:13:55 +08:00
wangyuan 601ce8c466 Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-06-12 19:49:25 +08:00
wangyuan 00c63ca7dd 天赋异妖 2019-06-12 19:49:10 +08:00
wangyuan d10fc68937 fix 2019-06-16 03:19:40 +08:00
gaojie 02250eacda 好友聊天推送 2019-06-12 18:14:25 +08:00
wangyuan 8dd0438140 修改indication回复 2019-06-11 20:21:18 +08:00
gaojie 14bed7e3f6 好友聊天推送 2019-06-11 17:57:57 +08:00
wangyuan 7b55af89bc 回执indication 2019-06-11 16:35:40 +08:00
gaojie 17c133ab4c 搜索好友 2019-06-11 14:20:29 +08:00
gaojie 7d9a7d4601 删除好友,领取赠礼 2019-06-11 11:41:25 +08:00
gaojie a567484c5c 赠送体力,删除好友 2019-06-11 10:45:23 +08:00
gaojie ce75d59625 lua协议提交 2019-06-10 17:02:29 +08:00
gaojie 875a171514 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-06-10 10:37:54 +08:00
gaojie 5348c9d16a 好友申请 2019-06-10 10:37:49 +08:00
wangyuan dd061a5f87 历史买过礼包id 2019-06-06 18:26:33 +08:00
gaojie b32cef852a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 
# Conflicts:
#	protos/CommonProto.proto
#	protos/MessageTypeProto.proto
#	protos/PlayerInfoProto.proto
 2019-06-06 17:23:25 +08:00
gaojie 4ea63dbdbf 好友 2019-06-06 17:22:03 +08:00
wangyuan ed8a860468 活动开启状态 2019-06-06 14:22:52 +08:00
wangyuan fe9e6d3826 提交首冲 2019-06-06 12:14:28 +08:00
wangyuan 58076f61d1 购买礼包 2019-06-06 10:15:01 +08:00
gaojie dd9651f8f7 fix 2019-06-05 15:39:39 +08:00
gaojie 1405ed0a78 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 
# Conflicts:
#	protos/MessageTypeProto.proto
 2019-06-05 14:36:22 +08:00
wangyuan 69f41d63cf fix 2019-06-06 19:03:37 +08:00
gaojie b4c8f0be9f 聊天 2019-06-05 14:35:30 +08:00
wangyuan f3d340f839 每日任务 2019-06-05 10:47:38 +08:00
wangyuan c61e623dcc 累计充值活动 2019-06-04 09:52:53 +08:00
jiahuiwen 341c590c05 回退 2019-05-31 17:26:56 +08:00
jiahuiwen 364c321118 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-05-31 17:25:28 +08:00
wangyuan d2b9af5cc7 fix comment 2019-06-02 17:09:57 +08:00
wangyuan 35aa61409f delete unuse 2019-06-03 17:38:52 +08:00
jiahuiwen 537b847442 快速战斗推 主线任务 2019-05-31 17:25:17 +08:00
wangyuan 6bb775a7c8 fix 2019-05-28 15:22:59 +08:00
wangyuan f694a4529f 锻造个数 2019-05-28 14:42:24 +08:00
wangyuan 0679029853 fix 2019-05-28 09:58:02 +08:00
wangyuan 6569401a46 fix 2019-05-27 20:21:42 +08:00
wangyuan b59f3e25e7 战力变更 2019-05-27 20:18:55 +08:00
wangyuan 09f75235fb Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-27 14:02:01 +08:00
wangyuan f0034260c9 vip任务相关协议 2019-05-27 14:01:40 +08:00
wangyuan bd840fc87f fix name 2019-05-24 16:26:43 +08:00
wangyuan 3fc5344b23 vip特权 2019-05-24 07:34:22 +08:00
wangyuan 11abb3d96a 区域等级 2019-05-21 17:37:25 +08:00
wangyuan b4ba4a8e5e 挂机奖励 2019-05-20 14:50:16 +08:00
wangyuan 39cf14b335 增加怪物是否被击杀 2019-05-16 20:33:55 +08:00
gaojie c791eaa706 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-05-16 20:22:03 +08:00
gaojie 48b1889e27 分解卡牌 2019-05-16 20:21:57 +08:00
wangyuan ff151b470d 挂机推送 2019-05-16 20:18:34 +08:00
wangyuan 46bb38fde3 delete 2019-05-16 19:22:49 +08:00
wangyuan 8a76db460c 修改名称 2019-05-16 16:53:11 +08:00
wangyuan bcbab8834d fix 2019-05-16 16:45:11 +08:00
wangyuan 5397f27327 挂机刷新发现boss 2019-05-16 16:33:33 +08:00
wangyuan fadd30c694 delete unuse 2019-05-16 14:44:16 +08:00
wangyuan e6532f394e Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-05-16 14:37:13 +08:00
wangyuan 9872ff269f 挂机协议 2019-05-16 14:36:57 +08:00
gaojie 7563a5c03a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 
# Conflicts:
#	protos/PlayerInfoProto.proto
 2019-05-14 17:15:01 +08:00
gaojie 7254e72af6 fix 2019-05-14 17:14:13 +08:00
wangyuan d82265d293 time function 2019-05-14 16:31:30 +08:00
wangyuan 90dfae824a 秘盒今日抽取次数 2019-05-14 13:44:23 +08:00
wangyuan 1b1d14f4a2 fix 2019-05-14 10:36:48 +08:00
wangyuan d13086812d fix 2019-05-14 10:23:58 +08:00
wangyuan be9d558f17 时间控制功能 2019-05-14 10:23:05 +08:00
wangyuan 2ba6acdf68 增加是否跳过战斗 2019-05-13 15:17:17 +08:00
gaojie b7be080011 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-05-13 14:58:05 +08:00
gaojie 7035b62cc4 商店刷新 2019-05-13 14:58:01 +08:00
wangyuan 56553a36a3 查看战斗回放 2019-05-13 12:07:20 +08:00
gaojie d88f58b835 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 
# Conflicts:
#	protos/CommonProto.proto
 2019-05-11 17:22:51 +08:00
gaojie 5265a6302b 获取商店信息 2019-05-11 17:22:16 +08:00
wangyuan 5b9874121c arena record 2019-05-11 16:24:06 +08:00
wangyuan c1396c4970 秘盒协议 2019-05-11 15:16:37 +08:00
wangyuan 08d899480e 删除无效字段 2019-05-11 10:47:37 +08:00
wangyuan bdaff6d8b0 我的进攻队伍 2019-05-10 17:43:12 +08:00
wangyuan 5f9a967322 只给我自己分数&排名 2019-05-10 16:15:50 +08:00
wangyuan aa28a176ba 竞技场进攻 2019-05-10 13:42:09 +08:00
wangyuan f4f4ba33f4 秘盒 2019-05-10 13:33:25 +08:00
wangyuan 427b1e8f92 排行榜信息 2019-05-10 10:31:06 +08:00
wangyuan 04f4958ab3 删除排名 2019-05-10 10:11:57 +08:00
wangyuan c62740355b fight time 2019-05-09 17:44:53 +08:00
wangyuan ffc5f435ee fix 2019-05-09 16:34:31 +08:00
wangyuan ebe0467572 fix 2019-05-09 15:50:20 +08:00
wangyuan 7cf2919302 获取竞技场基本信息 2019-05-09 15:37:36 +08:00
wangyuan 02f7b662b4 重铸等级 2019-05-09 11:03:49 +08:00
wangyuan 5df64e1a0b 装备重铸确认 2019-05-07 11:05:58 +08:00
wangyuan 4f8acaf535 gm response 2019-04-30 15:56:18 +08:00
jiahuiwen 918df26d74 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-30 13:49:36 +08:00
jiahuiwen 81ddc08e7b 任务完成奖励 2019-04-30 13:49:30 +08:00
wangyuan 56b8cdf80e gm response 2019-04-30 10:27:36 +08:00
jiahuiwen 84fcee959a 战斗事件 nextEventId 放到战后给 2019-04-29 15:10:25 +08:00
gaojie 4432eafb25 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-25 18:16:33 +08:00
wangyuan a38049b909 挂机 界面不展示背包信息 2019-04-25 23:52:24 +08:00
gaojie 4af0fa2467 起名 2019-04-25 18:16:28 +08:00
gaojie cde6387572 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-25 14:52:14 +08:00
gaojie c8888f89ee 随机名字 2019-04-25 14:52:06 +08:00
wangyuan c8990f16e4 进地图给最大血量 2019-04-25 14:37:05 +08:00
wangyuan ca61dbca3d 活动返回list 2019-04-22 18:00:38 +08:00
wangyuan 2ef1f58f1a 章节奖励移到活动中 2019-04-22 14:53:08 +08:00
wangyuan d0baaa1c7a 章节奖励 2019-04-22 11:48:22 +08:00
gaojie e2e5f55710 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-19 18:20:51 +08:00
gaojie 4bf1fbc2d1 分解 2019-04-19 18:20:47 +08:00
wangyuan 7d08c6f7fb Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-04-19 11:30:11 +08:00
wangyuan 445b09b7c7 delete unuse 2019-04-19 11:29:00 +08:00
jiahuiwen 7fe15d037a Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-19 11:28:27 +08:00
jiahuiwen 26e55d63b5 地图信息 2019-04-19 11:28:15 +08:00
wangyuan b1ad11676a outtime 2019-04-19 11:27:35 +08:00
wangyuan 1a1a709d3b outtime 2019-04-19 10:59:58 +08:00
jiahuiwen ebbd3145ec 快速战斗 2019-04-18 15:20:16 +08:00
zhangqiang 3e7059c333 副本排行加字段 2019-04-18 14:24:36 +08:00
mashiyu 332cf2da0e 加字段 2019-04-17 23:09:45 +08:00
jiahuiwen 6fd8d02fb1 改repeated 2019-04-17 19:20:17 +08:00
jiahuiwen f39ccb0ce6 副本扫荡，购买挑战次数，获取排行榜 2019-04-17 19:01:54 +08:00
wangyuan a43111e382 探索度 删除无效协议 2019-04-16 19:56:39 +08:00
wangyuan 9f356b9bc5 探索度 删除不必要的协议 2019-04-16 17:58:47 +08:00
wangyuan e3289f2f1a 挂机 删除不必要的字段 2019-04-16 13:47:02 +08:00
wangyuan f812510e3b 挂机 2019-04-16 10:23:09 +08:00
jiahuiwen 7ab5220d15 进图信息 2019-04-15 20:08:45 +08:00
gaojie d7eaff2b69 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-15 13:44:10 +08:00
gaojie 699c2ebd52 fix 2019-04-15 13:44:06 +08:00
jiahuiwen 917ea1f2fa 完成任务所用时间 2019-04-15 10:20:15 +08:00
jiahuiwen ccc38716f2 更新单个任务 2019-04-12 19:37:32 +08:00
jiahuiwen 185adf8c66 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-04-12 19:35:47 +08:00
gaojie a74c663510 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-06-27 00:14:44 +08:00
gaojie 00ab5c2365 增加队伍ID 2019-06-27 00:14:40 +08:00
jiahuiwen a657dbe58f 任务 2019-04-12 19:35:41 +08:00
jiahuiwen e2718b20c6 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 
# Conflicts:
#	protos/MapInfoProto.proto
 2019-04-12 14:54:23 +08:00
jiahuiwen a251ab906b 地图探索 2019-04-12 13:49:17 +08:00
gaojie 2fd2313ab9 fix 2019-04-11 20:37:22 +08:00
gaojie 6059e4ce3d 关卡 2019-04-11 17:25:57 +08:00
wangyuan aab529209e 保存新手节点 2019-04-09 14:12:30 +08:00
wangyuan ad7f63470a 红点类型 2019-04-03 20:22:31 +08:00
jiahuiwen e253b7914b 走过的格子 2019-04-03 18:58:40 +08:00
jiahuiwen 389e96eabd buff 2019-04-02 15:57:18 +08:00
wangyuan f982bb68d1 可以穿多件装备 2019-04-02 14:34:44 +08:00
jiahuiwen 4d75739f1d 任务刷新 2019-03-27 18:54:11 +08:00
wangyuan bacf989c5e 更新地图探索度 2019-03-26 13:53:35 +08:00
wangyuan f12956d06b 战斗失败给 地图探索详情 2019-03-26 11:59:56 +08:00
wangyuan aa45cc7e5f add response 2019-03-26 10:13:16 +08:00
wangyuan 7806bf4420 地图探索度 2019-03-26 10:03:48 +08:00
wangyuan dfa58afb24 fix 2019-03-25 18:33:47 +08:00
wangyuan d142b55a52 地图探索度 2019-03-25 16:45:12 +08:00
mashiyu 2c8443f2d3 加结果 2019-03-22 18:29:43 +08:00
wangyuan 4956ce1e5a 驻扎时长 2019-03-22 17:42:06 +08:00
wangyuan 3b097de7c1 冒险每日限制时长 2019-03-21 20:44:05 +08:00
wangyuan 090204225e 冒险推荐英雄 2019-03-21 18:33:42 +08:00
mashiyu e2a22aba55 返回血量 2019-03-21 14:31:24 +08:00
jiahuiwen 9c3d7b972a 修改顺序 2019-03-20 19:56:46 +08:00
jiahuiwen 879151a475 还原 2019-03-20 17:16:19 +08:00
jiahuiwen d468b18a7b 任务记录eventId 2019-03-20 16:39:20 +08:00
jiahuiwen 49a5fc318c 抽出开始战斗 2019-03-20 15:55:10 +08:00
mashiyu 3d678bf934 协议修改 2019-03-20 14:52:03 +08:00
wangyuan 441383e134 server time 2019-03-19 19:51:25 +08:00
wangyuan 6f848bd96e 删除英雄行动力 2019-03-19 18:31:25 +08:00
wangyuan 9e0c1d726b Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-03-19 17:47:26 +08:00
wangyuan 5afbef0beb 精力 英雄->玩家 2019-03-19 17:47:12 +08:00
jiahuiwen 85890d13d3 手动开启任务 2019-03-19 16:14:39 +08:00
jiahuiwen e5b2cb20ac 事件也可消耗行动力 2019-03-19 15:55:25 +08:00
jiahuiwen fb14de2ef9 行动力和临时背包 2019-03-12 09:41:53 +08:00
jiahuiwen 34ae6dbabb 触发坐标 2019-03-09 18:01:46 +08:00
jiahuiwen 1179a40428 任务 2019-03-07 14:03:46 +08:00
jiahuiwen 27d7dcdeab 战斗结算 2019-03-06 17:11:00 +08:00
gaojie 591a91dbaf 卡牌,装备分页请求 2019-03-05 10:27:42 +08:00
jiahuiwen 324ba6054c 更改顺序 2019-03-02 18:33:22 +08:00
jiahuiwen 2ca478349d Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-03-02 18:21:54 +08:00
jiahuiwen 5af7cc2907 在地图战斗 2019-03-02 18:21:48 +08:00
wangyuan 6ce333daf9 英雄精力和行动力 2019-03-02 16:11:58 +08:00
wangyuan b0e20fc305 抽卡掉落 & lua 2019-03-02 10:56:05 +08:00
mashiyu 2c5fed5887 开始战斗协议 2019-02-26 19:43:40 +08:00
wangyuan 89b3d1d026 cook 2019-02-25 20:46:35 +08:00
wangyuan d6ccee8777 修改作坊 2019-02-25 17:33:36 +08:00
wangyuan 6561794ba4 激活蓝图 2019-02-25 11:43:10 +08:00
wangyuan 95a1dacb2c 获取作坊基本信息 2019-02-25 10:18:28 +08:00
jiahuiwen 902ca3ab63 删除eventId 2019-02-22 11:43:53 +08:00
jiahuiwen 85b5bbdde3 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-02-21 20:26:53 +08:00
jiahuiwen 81939dfaf4 地图更新response 2019-02-21 20:26:48 +08:00
wangyuan 608a4a891f Merge branch 'master' of 60.1.1.230:backend/jieling_protocol 2019-02-21 10:27:07 +08:00
wangyuan fc562030ff 异妖 2019-02-21 10:22:55 +08:00
jiahuiwen bd0f446795 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-02-19 20:49:56 +08:00
jiahuiwen a1316b19cd 主线任务 2019-02-19 20:49:44 +08:00
wangyuan 9d7e6092d3 fix 2019-02-19 20:39:41 +08:00
jiahuiwen ff8b5384d1 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-02-19 13:35:58 +08:00
jiahuiwen 7db89c6064 任务 2019-02-19 13:35:54 +08:00
wangyuan 74926e593e fix 2019-02-18 18:34:34 +08:00
wangyuan 1df3134bed 获取装备 2019-02-18 18:22:00 +08:00
wangyuan 64b6ee86bf 阵容位置 2019-02-18 14:08:42 +08:00
wangyuan a19f53faf9 fix 2019-02-15 17:39:19 +08:00
wangyuan 04335db670 name 2019-02-15 10:48:21 +08:00
wangyuan cc095c904f 编队名称 2019-02-15 10:30:56 +08:00
wangyuan 1ec82ab05f 编队 2019-02-15 10:24:17 +08:00
wangyuan 8eb45d7a08 工坊 2019-02-14 17:53:16 +08:00
gaojie 49e086be92 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-01-28 17:51:18 +08:00
gaojie 39911336be 道具出售道具使用 2019-01-28 17:51:14 +08:00
jiahuiwen 708f5eb20d 探索得道具 2019-01-28 17:29:47 +08:00
jiahuiwen 8b04095a23 退出地图 2019-01-26 16:54:33 +08:00
jiahuiwen 7782aee24a 更新事件增加eventId参数 2019-01-26 14:37:18 +08:00
jiahuiwen ffcf1334ee 地图更新和事件更新 消息类型 2019-01-26 13:08:02 +08:00
jiahuiwen 74516ccae5 地图修改 2019-01-26 12:49:43 +08:00
jiahuiwen 270933a637 Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol 2019-01-25 18:27:38 +08:00
jiahuiwen 979455969b 英雄战斗数据 2019-01-25 18:27:33 +08:00
wangyuan c10f246ad5 equip 2019-01-25 17:23:34 +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 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 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 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 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 03aff99c15 提交 2019-01-17 19:24:08 +08:00
mashiyu 24f12c58f3 提交 2019-01-17 19:09:23 +08:00
wangyuan 7656d83468 back 2019-01-17 17:11:52 +08:00
wangyuan 69d2be4949 change repeated 2019-01-17 17:08:31 +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 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