Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

protos/CommonProto.proto

@@ -84,7 +84,12 @@ option optimize_for = SPEED;
 		optional int32 starBreakId = 10 ;//升星对应的breakId
 		
 		repeated string especialEquip = 11;//所穿戴法宝
-		repeated string soulEquipIdList = 12;//魂印
+		repeated SoulPos soulPos = 12;//魂印
+	}
+	
+	message SoulPos{
+		optional string equipId =1 ; //装备id
+		optional int32 position= 2; //卡槽位置
 	}
 
 	message FightUnitInfo {
@@ -644,7 +649,9 @@ option optimize_for = SPEED;
 		optional int32 headFrame = 3;
 		optional string head = 4;
 		optional int32 serverId =5;
-		optional int32 rank = 6;
+		optional int32 level = 6;
+		optional int32 rank = 7;
+		optional int32 score = 8;
 	}
 	
 	

protos/HeroInfoProto.proto

@@ -58,23 +58,17 @@ import "CommonProto.proto";
 		optional int32 type = 3;//1为英雄进阶 2为法宝进阶
 	}
 
-	message UpSoulEquipRequest{
-		optional string pos = 1; //升级槽位
-		optional string equipId = 2; //升级魂印id
-	}
 	
 	message UpQuickSoulEquipRequest{
-		optional string pos = 1; //升级槽位
-		optional string equipId = 2; //升级魂印id
-		repeated string soulEquipIds= 3; //消耗信息
+		optional string equipId = 1; //升级魂印id
+		repeated string soulEquipIds= 2; //消耗信息
 	}
 	
 	message UpSoulEquipResponse{
-		optional string pos = 1; //升级槽位、
-		optional string equipId = 2; //升级魂印id
-		optional int32 leve =3;//经验
-		optional int32 exp =4;//等级
-		repeated string soulEquipIds= 5; //消耗信息
+		optional string equipId = 1; //升级魂印id
+		optional int32 leve =2;//经验
+		optional int32 exp =3;//等级
+		repeated string soulEquipIds= 4; //消耗信息
 	}
 	
 	message EquipWearRequest{

protos/MapInfoProto.proto

@@ -58,6 +58,8 @@ import "CommonProto.proto";
 		repeated endlessSign signs = 13;
 		// 无尽副本地图点刷新信息
 		repeated EndlessRefreshInfo refreshInfo = 14;
+		//无尽副本是否跳过战斗
+		optional int32 skipFight = 15;
 
 	}
 
@@ -296,3 +298,7 @@ import "CommonProto.proto";
 	message RefreshMonsterResponse{
 		repeated Cell cell = 1; 
 	}
+	//无尽副本设置是否跳过战斗
+	message EndlessSetSkipRequest{
+		optional int32 type = 1;
+	}

protos/MessageTypeProto.proto

@@ -157,6 +157,9 @@ enum MessageType{
 	ENDLESS_MIN_MAP_INFO_RESPONSE = 10422;
 	
 	ENDLESS_MONSTER_REFRESH_INDICATION = 10423;//无尽副本空地刷新小怪
+	
+	ENDLESS_SET_SKIPFIGHT_REQUEST = 10424;//无尽副本是否跳过战斗
+	ENDLESS_SET_SKIPFIGHT_RESPONSE = 10425;
 		
 // F 10500
     FIGHT_START_REQUEST   = 10500; //
@@ -626,10 +629,8 @@ enum MessageType{
 	UPDATE_QUESTION_REQUEST = 12015; //问卷
 	UPDATE_QUESTION_RESPONSE = 12016;
 	
-	
-	UP_SOUL_EQUIP_REQUEST = 12017; // 升一级
     UP_SOUL_EQUIP_QUICK_REQUEST = 12018;
-    UP_SOUL_UNLOAD_RESPONSE = 12019; //快速升级
+    UP_SOUL_EQUIP_RESPONSE = 12019; //魂印升级
 
 
 // V 12100

protos/RoomProto.proto

@@ -65,6 +65,7 @@ import "CommonProto.proto";
 	//血战排行榜
 	message BloodRankResponse{
 		repeated BloodPersonInfo infos = 1;
+		optional int32 myRank = 2;
 	}
 
 	message RoomAddressIndication{