Merge branch 'master' of http://60.1.1.230/backend/jieling_protocol

# Conflicts:
#	protos/MapInfoProto.proto

protos/CommonProto.proto

@@ -212,5 +212,18 @@ option optimize_for = SPEED;
 		optional int32 id =2;
 	}
 
+	message LevelDifficulty{
+		optional int32 fightId = 1;
+		optional int32 state = 2; //2 已开启 3:已打过未通过，=4：已通过
+		optional int32 num = 3;
+		optional int32 type = 4; //1:简单 2:中等 3:困难
+	}
+
+	message LevelDifficultyInfos{
+		optional int32 areaId = 1;
+		repeated LevelDifficulty LevelDifficulty = 2;
+	}
+
+
 
 	

protos/FightInfoProto.proto

@@ -31,6 +31,9 @@ import "CommonProto.proto";
 	message FightStartRequest {
 		// 战斗类型（手动，自动）
 		optional int32 fightType = 1;
+		optional int32 type = 2; // 类型 1: 关卡
+		optional int32 fightId = 3;
+
 	}
 	message FightStartResponse {
 		// 战斗属性
@@ -43,6 +46,8 @@ import "CommonProto.proto";
 		optional int32 monsterGroupId = 1;
 		// 战斗序列帧 14#1#0|14#1#0|14#1#0|...|14#1#0
 		optional string frames = 2;
+		optional int32 fightId = 3;
+		optional int32 type = 4; // 类型 1: 关卡
 	}
 	message FightEndResponse {
 		//战斗结果
@@ -56,4 +61,17 @@ import "CommonProto.proto";
 		// 探索地图剩余时间（秒）
 		optional int32 leftTime = 5; 
 	}
+		// 扫荡开始
+	message SweepRightRequest {
+		optional int32 type = 1; //1 :关卡
+		optional int32 fightId = 2;
+		optional int32 num = 3; //扫荡次数
+
+	}
+	message SweepRightResponse {
+		// 获得的道具
+		optional Drop Drop = 2;
+	}
+
+
 

protos/MapInfoProto.proto

@@ -103,4 +103,10 @@ import "CommonProto.proto";
 	message MapStartExploreResponse{
 		// 探索地图剩余时间（秒）
 		optional int32 leftTime = 1; 
-	}
+	}
+
+	//关卡信息
+	message getAllLevelDifficultyInfosResponse{  
+		repeated LevelDifficultyInfos levelDifficultyInfos = 1;
+	}
+

protos/MessageTypeProto.proto

@@ -81,8 +81,8 @@ enum MessageType{
     GET_ALL_MAP_ACCOMPLISH_REQUEST = 16620 ; //获取地图探索度
     GET_ALL_MAP_ACCOMPLISH_RESPONSE = 16621 ;
 
-
-
+    GET_ALL_LEVE_DIFFICULTT_REQUEST =16622; // 获取关卡信息
+    GET_ALL_LEVE_DIFFICULTT_RESPONSE = 16623;
 
 // H 10700
     HERO_RAND_REQQUEST = 10701;
@@ -94,6 +94,7 @@ enum MessageType{
 // J 10900
 // K 11000
 // L 11100
+
     LOGIN_REQUEST   = 11100; // 登陆或注册
     LOGIN_RESPONSE  = 11101;
 // M 11200
@@ -139,6 +140,9 @@ enum MessageType{
 
     SAVE_NEW_PLAYER_GUIDE_POINT_REQUEST = 11807; //保存新手引导节点
     SAVE_NEW_PLAYER_GUIDE_POINT_RESPONSE = 11808; 
+    
+    SWEEP_RIGHT_REQUEST = 11809;  // 扫荡
+    SWEEP_RIGHT_RESPONSE = 11810;
 // T 11900
     TRIGGER_EVENT_REQUEST   = 11900; //
     TRIGGER_EVENT_RESPONSE  = 11901;