Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

protos/CommonProto.proto

@@ -499,6 +499,15 @@ option optimize_for = SPEED;
 		optional string heroId = 1; //英雄Id
 		optional int32 hp = 2;//英雄血量
 	}
+	
+	//战力排行
+	message UseForceInfo{
+		optional string name = 1;
+		optional int32 leve = 2; 
+		optional int32 force = 3; 
+		optional int32 rank =4;
+	}
+
 	//无尽副本标志信息
 	message endlessSign{
 		optional int32 mapId = 1;

protos/MessageTypeProto.proto

@@ -74,6 +74,7 @@ enum MessageType{
      ADVENTURE_LEFT_RESPONSE = 10050;
 
      ACTIVITY_UPDATE_INDICATION = 10051 ;// 活动更新推送
+	 ACTIVITY_UPDATE_PROGRESS_INDICATION = 10052 ;// 活动进度推送
 
 // B 10100
     BUY_STORE_ITEM_REQUEST = 10100; // 购买商店物品
@@ -275,6 +276,9 @@ enum MessageType{
 	
 	GET_TOWER_RANK_BY_PAGE_REQUEST = 16644; //获取试炼副本排行
 	GET_TOWER_RANK_BY_PAGE_RESPONSE = 16645;
+	
+	GETF_FORCE_RANK_INFO_REQUEST = 16646;
+	GETF_FORCE_RANK_INFO_RESPONSE = 16647;
 
 // H 10700
     HERO_RAND_REQQUEST = 10701;
@@ -289,6 +293,7 @@ enum MessageType{
 
     LOGIN_REQUEST   = 11100; // 登陆或注册
     LOGIN_RESPONSE  = 11101;
+	
 // M 11200
     MAP_ENTER_REQUEST   = 11200; // 进入地图
     MAP_ENTER_RESPONSE  = 11201;

protos/PlayerInfoProto.proto

@@ -412,10 +412,19 @@ import "CommonProto.proto";
 		repeated int32 closeActivityId = 2;
 	}
 	
-	//招财猫
-	message LuckCatRewardResponse{
-		optional Drop drop = 1;
-		optional int32 missionId = 2;
+	message GetForceRankInfoRequest{
+		optional int32 page = 1; //页数
+		optional int32 activiteId = 2; //活动ID
 	}
 	
+	message GetForceRankInfoResponse{
+	    repeated UseForceInfo useForceInfo = 1;
+		optional int32 myForce = 2; //我的战力
+		optional int32 myRank =3 ;// 我的排名
+	}
+	
+	//活动进度推送
+	message ActivityUpateProgressIndication{
+	   required ActivityInfo activityInfo =1;
+	}