Merge branch 'master_test_gn_ys' into master_test_gn

# Conflicts:
#	protos/CommonProto.proto

protos/CommonProto.proto

@@ -1050,6 +1050,20 @@ option optimize_for = SPEED;
 		optional string myServerName = 18; //我的服务器名称
     }
 
+
+	//四象心法屬性結果
+	message SixiangxinfaPropertyInfo{
+	    optional int32 propertyId = 1;//屬性id
+	    optional int32 propertyNum=2;//屬性值
+	}
+
+	//四象心法信息
+	message SixiangxinfaInfo{
+	    optional int32 professionId = 1;//职业id 
+	    optional int32 level = 2;//对应职业进阶等级 
+	    repeated SixiangxinfaPropertyInfo propertyInfoList=3;//属性信息列表
+	}
+	
 	// 四灵试炼信息
 	message FourChallengeInfo{
 		optional int32 type = 1;//四灵类型

protos/HeroInfoProto.proto

@@ -420,7 +420,30 @@ import "CommonProto.proto";
 		repeated beautyBagCardInfo infoList = 1;
 
 	}
+
+	//四象心法强化协议
+	message SixiangUpRequest{
+		optional int32 professionId = 1;
+	}
 	
+	message SixiangUpResponse{
+		repeated SixiangxinfaPropertyInfo infoList = 1;
+
+	}
+
+	//四象心法进阶协议
+	message SixiangUpStarRequest{
+		optional int32 professionId = 1;
+	}
+	
+	message SixiangUpStarResponse{
+		optional int32 starLv = 1;
+		repeated SixiangxinfaPropertyInfo infoList = 2;
+
+	}
+
+	
+
 	
 	
 	

protos/MessageTypeProto.proto

@@ -1100,6 +1100,12 @@ enum MessageType{
 //20111 - 20200 装备、
 	EQUIP_COMPLEX_REQUEST = 20111;//合成装备
 	EQUIP_COMPLEX_RESPONSE = 20112;
+
+	SIXIANG_UP_REQUEST = 20201;//四象心法强化
+	SIXIANG_UP_RESPONSE = 20202;
+
+	SIXIANG_UP_STAR_REQUEST = 20203;//四象心法进阶
+	SIXIANG_UP_STAR_RESPONSE = 20204;
 	
 	
 	

protos/PlayerInfoProto.proto

@@ -84,6 +84,7 @@ import "CommonProto.proto";
 		optional int32 randomCount = 43;//抽卡剩余必出
 		repeated randomTypeNum drawTimes = 44;//类型抽卡总次数
 		repeated HelpFightList helpFightList = 45;//已选取的助战信息
+		repeated SixiangxinfaInfo sixiangInfos = 46;//四象心法数据
 	}