Commit Graph

556 Commits (56989b43cb56896c0564488daff3862038e1613a)

Author SHA1 Message Date
lvxinran 34c93b9b68 协议提交 2019-07-25 19:09:54 +08:00
lvxinran 87f93324d6 头像框修改 2019-07-25 10:49:40 +08:00
wangyuan 9943482a86 dead times 2019-07-23 19:41:06 +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 fb95a0c21a 云梦祈福协议修改 2019-07-22 18:13:32 +08:00
lvxinran 6d94ca929a 云梦祈福协议提交 2019-07-22 16:06:36 +08:00
lvxinran 1199066ea0 5点重置试炼副本 2019-07-19 17:39:58 +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
wangyuan 8ad62ae897 修改血战协议 2019-07-16 18:29:51 +08:00
lvxinran 0c412019e7 装备附带技能协议提交 2019-07-12 10:14:38 +08:00
lvxinran 94485f64ca 试炼排行榜协议 2019-07-10 11:34:38 +08:00
gaojie 887d5f8d64 fix 2019-07-03 16:26:27 +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 637924d5e3 刷新道具数量 2019-07-03 15:44:22 +08:00
jiahuiwen 84dd7e5a9a 试炼精气 2019-06-26 17:26:27 +08:00
jiahuiwen 9841869b38 试炼副本 修改 2019-06-26 11:20:36 +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 ba11565a6a 科技树 2019-06-19 14:49:31 +08:00
wangyuan be57426afe 每日刷新次数走vip 2019-06-15 14:50:06 +08:00
wangyuan 52d7b77125 match 2019-06-14 18:41:37 +08:00
wangyuan c7bc1ce163 装备入手时间 2019-06-13 19:26:45 +08:00
wangyuan 0b56484e50 获取天赋异妖信息 2019-06-12 20:13:55 +08:00
wangyuan d10fc68937 fix 2019-06-16 03:19:40 +08:00
gaojie a567484c5c 赠送体力,删除好友 2019-06-11 10:45:23 +08:00
gaojie ce75d59625 lua协议提交 2019-06-10 17:02:29 +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
wangyuan f3d340f839 每日任务 2019-06-05 10:47:38 +08:00
wangyuan c61e623dcc 累计充值活动 2019-06-04 09:52:53 +08:00
wangyuan d2b9af5cc7 fix comment 2019-06-02 17:09:57 +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 ff151b470d 挂机推送 2019-05-16 20:18:34 +08:00
wangyuan 46bb38fde3 delete 2019-05-16 19:22:49 +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 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 be9d558f17 时间控制功能 2019-05-14 10:23:05 +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 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 7cf2919302 获取竞技场基本信息 2019-05-09 15:37:36 +08:00
wangyuan 02f7b662b4 重铸等级 2019-05-09 11:03:49 +08:00
wangyuan 4f8acaf535 gm response 2019-04-30 15:56:18 +08:00
wangyuan 56b8cdf80e gm response 2019-04-30 10:27:36 +08:00
wangyuan ca61dbca3d 活动返回list 2019-04-22 18:00:38 +08:00
wangyuan 2ef1f58f1a 章节奖励移到活动中 2019-04-22 14:53:08 +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 1a1a709d3b outtime 2019-04-19 10:59:58 +08:00
jiahuiwen f39ccb0ce6 副本扫荡,购买挑战次数,获取排行榜 2019-04-17 19:01:54 +08:00
wangyuan a43111e382 探索度 删除无效协议 2019-04-16 19:56:39 +08:00
wangyuan e3289f2f1a 挂机 删除不必要的字段 2019-04-16 13:47:02 +08:00
jiahuiwen 917ea1f2fa 完成任务所用时间 2019-04-15 10:20:15 +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
jiahuiwen 389e96eabd buff 2019-04-02 15:57:18 +08:00
wangyuan f12956d06b 战斗失败给 地图探索详情 2019-03-26 11:59:56 +08:00
wangyuan 7806bf4420 地图探索度 2019-03-26 10:03:48 +08:00
wangyuan d142b55a52 地图探索度 2019-03-25 16:45:12 +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
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 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 d6ccee8777 修改作坊 2019-02-25 17:33:36 +08:00
wangyuan 95a1dacb2c 获取作坊基本信息 2019-02-25 10:18:28 +08:00
jiahuiwen 902ca3ab63 删除eventId 2019-02-22 11:43:53 +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 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 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
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 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
gaojie 82b0c81cdf 物品分页请求 2019-01-23 10:26:05 +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
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 75aeee4a0f 地图 2019-01-21 17:51:57 +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 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
mashiyu 369f373f48 测试完毕 2019-01-17 20:46:03 +08:00
mashiyu 24f12c58f3 提交 2019-01-17 19:09: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
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