Merge branch 'master_test_gn' into master_test_gn_xxp

protos/CommonProto.proto

@@ -1092,4 +1092,18 @@ option optimize_for = SPEED;
 		optional int32 id = 1;//遗物id
 		optional int32 status = 2;//遗物状态，0：未激活，1：已激活
 	}
+
+	// 好感度信息
+	message LikableInfo{
+		optional int32 heroStaticid = 1;//英雄静态id
+		optional int32 likableNum = 2;//好感度值
+	}
+
+	// 装备图鉴信息
+	message EquipBookInfo{
+		optional int32 equipId = 1;//装备静态id
+		optional int32 num = 2;//装备曾经获取过的数量
+	}
+
+
 	

protos/HeroInfoProto.proto

@@ -162,6 +162,7 @@ import "CommonProto.proto";
 	message GetAllPropertyInfoResponse{
 		repeated int32 allBookEnabled = 1;//已经激活的羁绊
 		repeated int32 equipGot = 2;//已经获得过的魂印 
+		repeated EquipBookInfo equipList = 3;//已经获得过的装备
 
 	}
 
@@ -441,6 +442,25 @@ import "CommonProto.proto";
 		repeated SixiangxinfaPropertyInfo infoList = 2;
 
 	}
+	
+
+	//获取好感度数据协议
+	message GetLikableDataResponse{
+		repeated LikableInfo infoList = 1;
+		optional int32 likableRemainTime = 2;//好感度剩余捐赠次数
+	}
+
+
+	//好感度提升协议
+	message HeroUpLikableRequest{
+		optional int32 heroStaticId = 1;//英雄静态id
+		optional int32 itemId = 2;//消耗道具id
+		optional int32 itemNum = 3;//消耗道具数量
+	}
+	
+
+
+
 
 	
 

protos/MessageTypeProto.proto

@@ -1106,6 +1106,12 @@ enum MessageType{
 
 	SIXIANG_UP_STAR_REQUEST = 20203;//四象心法进阶
 	SIXIANG_UP_STAR_RESPONSE = 20204;
+
+	HERO_UP_LIKABLE_REQUEST = 20205;//英雄提升好感度请求
+	HERO_UP_LIKABLE_RESPONSE = 20206;
+
+	GET_LIKABLE_DATA_REQUEST = 20207;//获取英雄好感度数据请求
+	GET_LIKABLE_DATA_RESPONSE = 20208;
 	
 	
 	

protos/PlayerInfoProto.proto

@@ -408,6 +408,7 @@ import "CommonProto.proto";
 		optional int32 expeditionLeve =13 ; //猎妖之路阶段 -1 待选择
 		optional int32 hadLuckTime = 14;//幸运探宝次数
 		optional int32 hadAdvanceLuckTime = 15;//高级幸运探宝次数
+		optional int32 likableRemainTime = 16;//好感度剩余捐赠次数
 	}
 	
 	message ZeroPlayerUpdateIndication{
@@ -538,7 +539,8 @@ import "CommonProto.proto";
 
 	message UpdateUserExpIndicaiton{
 		optional int32 level = 1 ;// 玩家等级
-		optional int64 exp  =2 ; // 玩家经验
+		optional int64 exp  = 2 ; // 玩家经验
+		optional Drop drop = 3; // 玩家升级给的道具
 	}