Merge branch 'master_test_hw' into master_test_hongmeng

protos/ActivityProto.proto

@@ -55,4 +55,14 @@ import "CommonProto.proto";
 	message UpgradeGodTreeRequest{
 	}
 	message UpgradeGodTreeResponse{
+	}
+	
+	//扭转乾坤
+	message GoodLuckRequest{
+		optional int32 activityId = 1;
+	}
+
+	message GoodLuckResponse{
+		optional int32 index = 1;
+		optional Drop drop = 2;
 	}

protos/CommonProto.proto

@@ -63,7 +63,10 @@ option optimize_for = SPEED;
 		optional int32 propertyValue = 2;
 	}
 
-
+	message HeadFrameList{
+		optional int32 headFrameId = 1;//头像框id 
+		optional int32 validTime = 2;//有效时间
+	}
 
 	message Equip{
 		optional string id = 1; 

protos/MessageTypeProto.proto

@@ -503,6 +503,8 @@ enum MessageType{
 	GUILD_CHALLENGE_SEND_MESSAGE_RESPONSE = 16685;
 	
 	//GUILD_CHALLENGE_FIVE_INDICATION = 16686;//公会副本五点刷新
+	GOOD_LUCK_REQUEST = 16687;//扭转乾坤
+	GOOD_LUCK_RESPONSE = 16688;
 
 // H 10700
     HERO_RAND_REQQUEST = 10701;
@@ -1139,6 +1141,9 @@ enum MessageType{
 	DemonsTrialRewardRequest = 303801;
 	DemonsTrialRewardResponse = 303802;
 	
+	// 使用头像框
+	UseHeadFrameRequest = 303901;
+	UseHeadFrameResponse = 303902;
 	
 	//800000起为global 协议
 	GetWorldServerRequest = 800001;//获取世界服ip

protos/PlayerInfoProto.proto

@@ -74,6 +74,7 @@ import "CommonProto.proto";
 		optional int32 hadAdvanceLuckTime = 33;//高级幸运探宝次数
 		optional int32 worldLeve = 34;//世界等级
 		repeated int32 DemonsTrialRewardInfo = 35;//心魔试炼已领取奖励信息
+		repeated HeadFrameList headFrameBag = 36;//头像框背包
 	}
 
 
@@ -109,6 +110,7 @@ import "CommonProto.proto";
 	}
 	message TakeMailResponse{
 		optional Drop drop = 1;
+		optional int32 msg = 2;// 1：成功，0：道具为空，2：背包已满
 	}
 
 
@@ -780,9 +782,10 @@ import "CommonProto.proto";
 		optional int32 worldLeve = 1;//世界等级推送
 	}
 	
-	
-	
-	
-
-	
-	
+	// 使用头像框
+	message UseHeadFrameRequest{
+		optional int32 headFrameId = 1;//头像框id
+	}
+	message UseHeadFrameResponse{
+		optional int32 validTime = 1;//到期时间
+	}