Merge branch 'master' into equip_develop

# Conflicts:
#	protos/HeroInfoProto.proto

protos/CommonProto.proto

@@ -100,6 +100,7 @@ option optimize_for = SPEED;
 		optional int32 lockState = 13;// 上锁状态 1 ：上锁 0：未上锁
 		repeated string jewels = 14;//宝器
 		optional int32 createtype  = 15;//创建类型 1猎妖援助
+		optional int32 changeId = 16;//置换模板id 默认0	
 	}
 	
 

protos/HeroInfoProto.proto

@@ -211,9 +211,39 @@ import "CommonProto.proto";
 		repeated string equipIds =1;//消耗的装备
 		optional Drop drop = 2;//合成的装备
 	}
+
 	message EspecialEquipBackRequest{
 		repeated string heroIdLsit = 1;//法宝归元
 	}
 	message EspecialEquipBackResponse{
 		optional Drop drop = 1;
 	}
+
+
+	message SaveHeroChangeRequest{
+		optional string heroId = 1; //操作英雄id
+	}
+	
+	message SaveHeroChangeResponse{
+	   optional int32 heroTempId = 2; //置换的id
+	}
+	
+	message CancelHeroChangeRequest{
+		optional string heroId = 1; //操作英雄id
+	}
+	
+	message CancelHeroChangeResponse{
+	}
+	
+
+	message DoHeroChangeRequest{ 
+		optional string heroId = 1; //操作英雄id
+	}
+	
+	message DoHeroChangeResponse{
+		optional Drop drop = 1;//掉落
+	}
+	
+	
+	
+

protos/MessageTypeProto.proto

@@ -1009,6 +1009,17 @@ enum MessageType{
 	//303501 - 303600 竞技场
 	TakeArenaBattleRewardRequest = 303501;
 	TakeArenaBattleRewardResponse = 303502;
+	
+	//303601 - 303650 英雄置换
+	SaveHeroChangeRequest = 303601;
+	SaveHeroChangeResponse = 303602;
+	
+	CancelHeroChangeRequest = 303603;
+	CancelHeroChangeResponse = 303604;
+	
+	DoHeroChangeRequest = 303605;
+	DoHeroChangeResponse = 303606;
+	
 }