Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

protos/CommonProto.proto

@@ -439,6 +439,7 @@ option optimize_for = SPEED;
 		optional string userName = 4;
 		optional RankInfo rankInfo = 5;
 		optional int32 headFrame = 6;//头像框
+		optional string guildName = 7;//公会名称
 	}
 	
 

protos/MessageTypeProto.proto

@@ -511,6 +511,8 @@ enum MessageType{
 	
 // N 11300
     NOTIFY_PAY_SUCCESS_INDICATION = 11300 ; // 通知前端充值成功
+	NEXT_ACTIVITY_REQUEST = 11301;//活动预告
+	NEXT_ACTIVITY_RESPONSE = 11302;
 // O 11400
 // P 11500
     POKEMON_COMONPENT_LEVELUP_REQUEST = 11500; //异妖相关 组件放置升级

protos/PlayerInfoProto.proto

@@ -637,5 +637,11 @@ import "CommonProto.proto";
 		repeated UserRank ranks = 1;
 		optional RankInfo myRankInfo = 2;
 	}
-
+	message NextActivityRequest{
+		optional int32 activityId = 1;
+	}
+	message NextActivityResponse{
+		optional int32 id = 1;//下期活动id
+		optional int32 time = 2;//下期活动开启时间
+	}