Merge branch 'master' of 60.1.1.230:backend/jieling_protocol

protos/CommonProto.proto

@@ -378,8 +378,7 @@ option optimize_for = SPEED;
 
 	message VipBaseInfo{
 		optional int32 vipLevel =1; //vip等级
-		optional int32 hadTakeLevelBox = 2 ;//是否领取特权等级礼包 1：已领取 0：未领取
-		optional int32 hadTakeDailyBox = 3 ;//是否领取每日礼包 1：已领取vip等级 -1：未领取
+		optional int32 hadTakeLevelBox = 2 ;//是否购买特权等级礼包 1：已购买 0：未购买
 	}
 
 	message Friend {

protos/MessageTypeProto.proto

@@ -692,6 +692,7 @@ enum MessageType{
 	TREASURE_REFRESH_INDICATION = 11916;//戒灵秘宝刷新推送
 	
 	TREASURE_LEVELUP_INDICATION = 11917;//戒灵秘宝等级提升推送
+	
      
 // U 12000
     UP_HERO_LEVEL_REQUEST = 12000; // 升级或突破
@@ -737,6 +738,9 @@ enum MessageType{
 
     VIEW_HERO_INFO_REQUEST = 12106; // 查看英雄详情信息
     VIEW_HERO_INFO_RESPONSE = 12107;
+	
+	VIP_TAKE_DAILY_REQUEST = 12108; //领取vip每日礼包
+    VIP_TAKE_DAILY_RESPONSE = 12109;
 // W 12200
     WORKSHOP_FOUNDATION_REQUEST = 12200;  //基础打造
     WORKSHOP_FOUNDATION_RESPONSE = 12201;

protos/PlayerInfoProto.proto

@@ -43,7 +43,7 @@ import "CommonProto.proto";
 		repeated GiftGoodsInfo giftGoodsInfo =4;
 		repeated int32 buyGoodsId = 5;
 		optional SuddenlyBossInfo SuddenlyBossInfo = 6;//精英怪信息
-		optional VipBaseInfo vipBaseInfo = 7;
+		repeated int32 vipLeveTake = 7;
 		optional int32 userCreateTime = 8; // 玩家创角时间
 		repeated int32 redType = 9;// 红点信息
 		optional int32 randCount = 10;//已招募次数
@@ -63,6 +63,7 @@ import "CommonProto.proto";
 		optional int32 SoulEquipPool = 24;//占星卡池
 		repeated int32 playedMapTypes = 25;//已经玩过的副本类型
 		optional int32 amount = 26;//总储值
+		optional int32 vipDaily = 27;//特权每日礼包是否领取 0 未领 >0vip 等级
 	
 	}
 
@@ -649,4 +650,11 @@ import "CommonProto.proto";
 	message RefreshRechargeIndication{
 		optional int32 amount = 1;//总储值
 	}
+	
+	message VipTakeDilyRequest{
+	}
+
+	message VipTakeDilyResponse{
+		optional Drop drop =1;
+	}