Commit Graph

1499 Commits (62e1354ac1edfa5078c51fd8ba224087092ae69d)

Author SHA1 Message Date
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