Merge branch 'equip_develop'

protos/CommonProto.proto

@@ -822,4 +822,9 @@ option optimize_for = SPEED;
 		optional int32 heroId = 1;
 		optional int32 maxStar = 2;
 	}
+	message SituationInfo {
+		optional int32 id = 1;
+		optional int32 overTime = 2;
+		optional int32 passId = 3;//已通关的id
+	}
 	

protos/HeroInfoProto.proto

@@ -212,6 +212,14 @@ import "CommonProto.proto";
 		optional Drop drop = 2;//合成的装备
 	}
 
+	message EspecialEquipBackRequest{
+		repeated string heroIdLsit = 1;//法宝归元
+	}
+	message EspecialEquipBackResponse{
+		optional Drop drop = 1;
+	}
+
+
 	message SaveHeroChangeRequest{
 		optional string heroId = 1; //操作英雄id
 	}
@@ -238,4 +246,4 @@ import "CommonProto.proto";
 	
 	
 	
-	
+

protos/MapInfoProto.proto

@@ -352,4 +352,14 @@ import "CommonProto.proto";
 		optional Drop drop = 2;//获得奖励
 		optional int32 resultId = 3;//结果id，对应表id，若为-1单独处理
 	}
-	
+	message GetAllSituationInfoResponse{
+		repeated SituationInfo infos = 1;//id 结束时间
+	}
+	message SituationChallengeRequest{
+		optional int32 id = 1;//挑战id
+		optional int32 type = 2;//1挑战 2扫荡
+	}
+	message SituationChallengeResponse{
+		optional Drop drop = 1;
+		optional FightData fightData = 2;//战斗数据
+	}

protos/MessageTypeProto.proto

@@ -242,7 +242,8 @@ enum MessageType{
 	
 	ENDLESS_MAP_CHANGE_INDICATION = 10429;//无尽地图修改推送
 	
-	
+	ESPECIAL_EQUIP_BACK_REQUEST = 10430;//法宝归元
+	ESPECIAL_EQUIP_BACK_RESPONSE = 10431;
 	
 		
 // F 10500
@@ -774,7 +775,14 @@ enum MessageType{
 	
 	SOUL_MERGE_REQUEST = 11839; //合成魂印
 	SOUL_MERGE_RESPONSE = 11840;
-
+	
+	SITUATION_INFO_GET_REQUEST = 11841;//获取轩辕宝镜状态
+	SITUATION_INFO_GET_RESPONSE = 11842;
+	
+	SITUATION_CHALLENGE_REQUEST = 11843;//挑战或扫荡轩辕宝镜
+	SITUATION_CHALLENGE_RESPONSE = 11844;
+	
+	SITUATION_INFO_INDICATION = 11845;//轩辕宝镜刷新推送
 // T 11900
     TRIGGER_EVENT_REQUEST   = 11900; //
     TRIGGER_EVENT_RESPONSE  = 11901;