Commit Graph

224 Commits (341c590c05f714bb8a73abe4f3fcbe461361ab30)

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