From a251ab906b41306dd7c406c9f7d885185b92c502 Mon Sep 17 00:00:00 2001
From: jiahuiwen <1024696487@qq.com>
Date: Fri, 12 Apr 2019 13:49:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9C=B0=E5=9B=BE=E6=8E=A2=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 protos/CommonProto.proto      |  1 -
 protos/FightInfoProto.proto   |  2 ++
 protos/MapInfoProto.proto     | 20 ++++++++++++++------
 protos/MessageTypeProto.proto | 10 ++--------
 protos/MissionInfoProto.proto | 23 -----------------------
 5 files changed, 18 insertions(+), 38 deletions(-)
 delete mode 100644 protos/MissionInfoProto.proto

diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto
index 4b71ac8..dff3134 100644
--- a/protos/CommonProto.proto
+++ b/protos/CommonProto.proto
@@ -103,7 +103,6 @@ option optimize_for = SPEED;
 		optional int32 itemId = 1;
 		optional string state = 2;
 		optional int32 missionStep = 3;
-		optional bool isOpen = 4;
 	}
 
 
diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto
index f711732..8164fb5 100644
--- a/protos/FightInfoProto.proto
+++ b/protos/FightInfoProto.proto
@@ -53,5 +53,7 @@ import "CommonProto.proto";
 		repeated int32 remainHpList = 3; 
 		// 更新主线任务
 		repeated Mission mission = 4;
+		// 探索地图剩余时间（秒）
+		optional int32 leftTime = 5; 
 	}
 
diff --git a/protos/MapInfoProto.proto b/protos/MapInfoProto.proto
index 64547fd..d245afc 100644
--- a/protos/MapInfoProto.proto
+++ b/protos/MapInfoProto.proto
@@ -23,14 +23,16 @@ import "CommonProto.proto";
 		optional int32 curXY = 2;
 		// 所用英雄
 		repeated HeroInfo heroInfos = 3;
-		// 剩余步数
-		optional int32 leftStep = 4;
+		// 探索地图剩余时间（秒）
+		optional int32 leftTime = 4; 
 		// 临时背包
 		optional Drop temporaryItems = 5;
 		// buff
 		repeated FoodBuffer foodBuffers = 6;
 		// 走过的格子
 		repeated int32 wakeCells = 7;
+		// 任务
+		optional Mission missions = 8; // 所有任务
 	}
 
 	// 更新事件
@@ -49,8 +51,8 @@ import "CommonProto.proto";
 		optional Drop drop = 3;
 		// 更新主线任务
 		repeated Mission mission = 4;
-		// 剩余步数
-		optional int32 leftStep = 5;
+		// 探索地图剩余时间（秒）
+		optional int32 leftTime = 5; 
 	}
 
 	// 更新地图状态
@@ -64,8 +66,8 @@ import "CommonProto.proto";
 	}
 	message MapUpdateResponse{
 		optional int32 eventId = 1;
-		// 剩余步数
-		optional int32 leftStep = 2;
+		// 探索地图剩余时间（秒）
+		optional int32 leftTime = 2; 
 	}
 
 	// 出地图
@@ -96,3 +98,9 @@ import "CommonProto.proto";
 	message GetMapAccomplishResponse{
 		repeated MapAccomplishInfo mapAccomplishInfo= 1; // 地图探索详情
 	}
+
+	// 开始探索回复
+	message MapStartExploreResponse{
+		// 探索地图剩余时间（秒）
+		optional int32 leftTime = 1; 
+	}
\ No newline at end of file
diff --git a/protos/MessageTypeProto.proto b/protos/MessageTypeProto.proto
index 9c2efae..964d13b 100644
--- a/protos/MessageTypeProto.proto
+++ b/protos/MessageTypeProto.proto
@@ -112,14 +112,8 @@ enum MessageType{
     MAIL_TAKE_MAIL_ITEM_REQUEST = 11208; //领取附件
     MAIL_TAKE_MAIL_ITEM_RESPONESE = 11209;
 
-    MISSION_GET_ALL_REQUEST = 11210;  // 获取任务
-    MISSION_GET_ALL_RESPONSE = 11211;
-
-    MISSION_TAKE_REWARD_REQUEST = 11212; // 领取任务奖励
-    MISSION_TAKE_REWARD_RESPONSE = 11213;
-
-    MISSION_OPEN_REQUEST = 11214; // 开启任务
-    MISSION_OPEN_RESPONSE = 11215;
+    MAP_START_EXPLORE_REQUEST = 11210;  // 开始探索
+    MAP_START_EXPLORE_RESPONSE = 11211;
 // N 11300
 // O 11400
 // P 11500
diff --git a/protos/MissionInfoProto.proto b/protos/MissionInfoProto.proto
deleted file mode 100644
index b61c226..0000000
--- a/protos/MissionInfoProto.proto
+++ /dev/null
@@ -1,23 +0,0 @@
-package com.ljsd.jieling.protocols;
-
-option optimize_for = SPEED;
-
-import "CommonProto.proto";
-
-	// 获取任务信息
-	message MissionGetAllResponse{  
-		repeated Mission missions = 1; // 所有任务
-	}
-
-	// 领取任务奖励
-	message TakeMissionRewardRequest{
-		optional int32 missionId = 1; // 要领取奖励的任务id
-	}
-	message TakeMissionResponse{
-		optional Drop Drop = 1;
-	}
-
-	// 开启任务
-	message OpenMissionRequest{
-		optional int32 missionId = 1; // 要开启任务 id
-	}
\ No newline at end of file