update

protocol/player/player.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 package player;
 option go_package = "mongo.games.com/game/protocol/player";
 
-import "mongo.games.com/game/protocol/server/pbdata.proto";
+import "protocol/server/pbdata.proto";
 
 //操作结果
 enum OpResultCode {
@@ -211,14 +211,7 @@ enum PlayerPacketID {
   PACKET_SCExchangeChannel = 2826; // 开启兑换的渠道
   PACKET_CSSMSConfig = 2827;	//获取运营商配置
   PACKET_SCSMSConfig = 2828;	//返回运营商配置
-  PACKET_CS_DiamondLotteryInfo = 2829; //请求钻石抽奖信息
+  PACKET_SCItem = 2830; // 返回道具列表
-  PACKET_SC_DiamondLotteryInfo = 2830; //返回钻石抽奖信息
-  PACKET_CS_DiamondLottery = 2831;	//请求钻石抽奖
-  PACKET_SC_DiamondLottery = 2832;	//钻石抽奖返回
-  PACKET_CSDiamondLotteryLuckyAward = 2833;	//请求领取钻石抽奖幸运奖励
-  PACKET_SCDiamondLotteryLuckyAward = 2834;	//返回领取钻石抽奖幸运奖励
-  PACKET_SCItem = 2835; // 返回道具列表
-
 }
 
 // 账变记录
@@ -1160,7 +1153,6 @@ message LotteryItem{
 	int32 Id = 1;
 	int32 ItemId = 2;
 	int64 ItemNum =3;
-	int32 TypeId = 4;
 }
 
 //通知抽奖剩余次数
@@ -1202,7 +1194,7 @@ message CSExchangeChannel{
 
 message ChannelSwitch {
   repeated string OnChannelName = 1;  // 开启渠道
-  int32 Tp = 2; // 开关类型 1：兑换 2：v卡掉落 3:邀请活动开关 4:钻石抽奖
+  int32 Tp = 2; // 开关类型 1：兑换 2：v卡掉落 3:邀请活动开关
 }
 
 // PACKET_SCExchangeChannel
@@ -1223,39 +1215,6 @@ message SMSInfo{
 	string SmsName = 2;
 }
 
-//钻石抽奖 请求抽奖数据
-//PACKET_CS_DiamondLotteryInfo
-message CSDiamondLotteryInfo{
-
-}
-//钻石抽奖 返回抽奖数据
-//PACKET_SC_DiamondLotteryInfo
-message SCDiamondLotteryInfo{
-	int64 LuckyScore = 1;	//幸运积分
-	repeated LotteryItem Item = 2;//抽奖物品信息
-	int32 MaxScore = 3;//保底奖励最大值
-	int32 DiamondNum = 4;	//单次抽奖消耗钻石数量
-}
-//请求钻石抽奖
-//PACKET_CS_DiamondLottery
-message CSDiamondLottery{
-	int32 LotteryType = 1;	//1-单抽 2-十连抽
-}
-//请求钻石抽奖返回
-//PACKET_SC_DiamondLottery
-message SCDiamondLottery{
-	int64 LuckyScore = 1;	//幸运积分
-	repeated LotteryItem Item = 2; //获得的物品
-}
-//请求领取保底奖励
-//PACKET_CSDiamondLotteryLuckyAward
-message CSDiamondLotteryLuckyAward{
-}
-////PACKET_SCDiamondLotteryLuckyAward
-message SCDiamondLotteryLuckyAward{
-  int64 LuckyScore = 1;  //幸运积分
-  repeated LotteryItem Item = 2; //获得的物品
-}
 // PACKET_SCItem
 message SCItem{
   repeated server.DB_GameItem Items = 1; // 道具列表

protocol/server/server.proto

@@ -225,6 +225,8 @@ message WGPlayerEnter {
   map<int32, int64> Items = 17;
   repeated int32 MatchParams = 18;//比赛参数
   map<int32, int64> RankScore = 19;// 排位积分
+  int64 Recharge = 20; // 充值总金额
+  int64 VCardCost = 21; // v卡消耗数量
 }
 
 //从观众席坐到座位

protocol/webapi/common.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 package webapi;
 option go_package = "mongo.games.com/game/protocol/webapi";
 
-import "mongo.games.com/game/protocol/server/pbdata.proto";
+import "protocol/server/pbdata.proto";
 /*
  这个文件保存公共结构
 */
@@ -672,7 +672,7 @@ message WelfareCollectConfig{
 
 // etcd /game/channel/switch
 message ChannelSwitchConfig{
-  int32 Tp = 1; // 开关类型 1.兑换 2.道具掉落 3.邀请活动开关 4.钻石抽奖
+  int32 Tp = 1; // 开关类型 1.兑换 2.道具掉落 3.邀请活动开关
   string Platform = 2; // 平台id
   repeated string OnChannelName = 3;  // 开启渠道
 }
@@ -737,36 +737,6 @@ message ActPermitConfig{
   repeated PermitChannelConfig Configs = 4; // 渠道配置
 }
 
-//钻石抽奖
-message DiamondLotteryInfo{
-	int32 Id = 1;
-	int32 Type = 2;
-	string Name = 3;
-	int32 ItemId = 4;
-	int32 Grade = 5;
-	int32 Oddrate =6;
-}
-//钻石抽奖白名单
-message DiamondLotteryPlayers{
-	int32 uid = 1;
-	int32  Count = 2;	//抽奖次数
-	repeated int32 AwatdId = 3;	//配置表里的奖励ID
-}
-message DiamondLotteryData{
-	string Channel = 1;	//渠道
-	repeated DiamondLotteryInfo Info = 2;
-	int32 MaxScore = 3;	//保底奖励最大值
-	int32 DiamondNum = 4;	//单次抽奖消耗钻石数量
-	repeated DiamondLotteryPlayers Players = 5;//白名单
-	
-}
-
-// etcd /game/diamond_lottery
-message DiamondLotteryConfig{
-	string Platform = 1; // 平台
-	repeated DiamondLotteryData  LotteryData = 2;
-}
-
 // etcd /game/item
 message ItemConfig {
   string Platform = 1; // 平台