update

data/DB_ACTPushCoin.json

@@ -0,0 +1 @@
+{}

data/DB_PigBank_Diamond.dat

@@ -1,4 +1,4 @@
 
 


 (€­β8–
@΅θ;PdX–
`c
 < ((€­β2ΕΈ
2συ
8¬@Άθ;JΖΈ
Jσυ
PdX¬`Η

-?<18>ΑΧ/ 2(€­β2ΕΈ2συ
8ξ@£θ;Jσυ
JΖΈPdXξ`σ
+?<18>ΑΧ/ 2(€­β2ΕΈ2συ
8ξ@£θ;JΖΈJσυ
PdXξ`σ

protocol/activity/pushcoin.pb.go

@@ -24,27 +24,33 @@ type PushCoinPacketID int32
 
 const (
 	PushCoinPacketID_PACKET_PushCoin_ZERO      PushCoinPacketID = 0    // 弃用消息号
-	PushCoinPacketID_PACKET_CSPushCoinInfo     PushCoinPacketID = 2670 // 信息
+	PushCoinPacketID_PACKET_CSPushCoinInfo     PushCoinPacketID = 2680 // 信息
-	PushCoinPacketID_PACKET_SCPushCoinInfo     PushCoinPacketID = 2671 // 信息返回
+	PushCoinPacketID_PACKET_SCPushCoinInfo     PushCoinPacketID = 2681 // 信息返回
-	PushCoinPacketID_PACKET_CSPushCoinPlayerOp PushCoinPacketID = 2672 // 玩家操作
+	PushCoinPacketID_PACKET_CSPushCoinPlayerOp PushCoinPacketID = 2682 // 玩家操作
-	PushCoinPacketID_PACKET_SCPushCoinPlayerOp PushCoinPacketID = 2673 // 玩家操作返回
+	PushCoinPacketID_PACKET_SCPushCoinPlayerOp PushCoinPacketID = 2683 // 玩家操作返回
+	PushCoinPacketID_PACKET_NotifyPowerLine    PushCoinPacketID = 2684 // 通知能量值
+	PushCoinPacketID_PACKET_NotifyDrawInfo     PushCoinPacketID = 2685 // 抽奖信息
 )
 
 // Enum value maps for PushCoinPacketID.
 var (
 	PushCoinPacketID_name = map[int32]string{
 		0:    "PACKET_PushCoin_ZERO",
-		2670: "PACKET_CSPushCoinInfo",
+		2680: "PACKET_CSPushCoinInfo",
-		2671: "PACKET_SCPushCoinInfo",
+		2681: "PACKET_SCPushCoinInfo",
-		2672: "PACKET_CSPushCoinPlayerOp",
+		2682: "PACKET_CSPushCoinPlayerOp",
-		2673: "PACKET_SCPushCoinPlayerOp",
+		2683: "PACKET_SCPushCoinPlayerOp",
+		2684: "PACKET_NotifyPowerLine",
+		2685: "PACKET_NotifyDrawInfo",
 	}
 	PushCoinPacketID_value = map[string]int32{
 		"PACKET_PushCoin_ZERO":      0,
-		"PACKET_CSPushCoinInfo":     2670,
+		"PACKET_CSPushCoinInfo":     2680,
-		"PACKET_SCPushCoinInfo":     2671,
+		"PACKET_SCPushCoinInfo":     2681,
-		"PACKET_CSPushCoinPlayerOp": 2672,
+		"PACKET_CSPushCoinPlayerOp": 2682,
-		"PACKET_SCPushCoinPlayerOp": 2673,
+		"PACKET_SCPushCoinPlayerOp": 2683,
+		"PACKET_NotifyPowerLine":    2684,
+		"PACKET_NotifyDrawInfo":     2685,
 	}
 )
 
@@ -79,12 +85,11 @@ type OpCodes int32
 
 const (
 	OpCodes_OP_Zero     OpCodes = 0
-	OpCodes_OP_Bet      OpCodes = 1 // 下注 [下注金额]
+	OpCodes_OP_Bet      OpCodes = 1 // 下注 OpParam 下注金额
-	OpCodes_OP_Gain     OpCodes = 2 // 得分 [得分金额]
+	OpCodes_OP_Gain     OpCodes = 2 // 得分 OpItem 获得道具
-	OpCodes_OP_Shake    OpCodes = 3 // 震动 [消耗次数]
+	OpCodes_OP_Shake    OpCodes = 3 // 震动 OpParam 消耗次数
-	OpCodes_OP_Refresh  OpCodes = 4 // 刷新 [桌面金额]
+	OpCodes_OP_Refresh  OpCodes = 4 // 刷新 OpParam 桌面金额
-	OpCodes_OP_Exchange OpCodes = 5 // 兑换 [兑换id]
+	OpCodes_OP_Exchange OpCodes = 5 // 兑换 OpParam 兑换id
-	OpCodes_OP_Draw     OpCodes = 6 // 抽奖 [抽奖id]
 )
 
 // Enum value maps for OpCodes.
@@ -96,7 +101,6 @@ var (
 		3: "OP_Shake",
 		4: "OP_Refresh",
 		5: "OP_Exchange",
-		6: "OP_Draw",
 	}
 	OpCodes_value = map[string]int32{
 		"OP_Zero":     0,
@@ -105,7 +109,6 @@ var (
 		"OP_Shake":    3,
 		"OP_Refresh":  4,
 		"OP_Exchange": 5,
-		"OP_Draw":     6,
 	}
 )
 
@@ -390,6 +393,8 @@ type ExchangeInfo struct {
 	Cost       []*ItemInfo `protobuf:"bytes,2,rep,name=Cost,proto3" json:"Cost,omitempty"`              //消耗道具
 	Gain       []*ItemInfo `protobuf:"bytes,3,rep,name=Gain,proto3" json:"Gain,omitempty"`              //获得道具
 	ShakeTimes int32       `protobuf:"varint,4,opt,name=ShakeTimes,proto3" json:"ShakeTimes,omitempty"` //获得震动次数
+	Times      int64       `protobuf:"varint,5,opt,name=Times,proto3" json:"Times,omitempty"`           //可兑换次数 -1无限
+	TotalTimes int64       `protobuf:"varint,6,opt,name=TotalTimes,proto3" json:"TotalTimes,omitempty"` //总共兑换次数 -1无限
 }
 
 func (x *ExchangeInfo) Reset() {
@@ -452,6 +457,22 @@ func (x *ExchangeInfo) GetShakeTimes() int32 {
 	return 0
 }
 
+func (x *ExchangeInfo) GetTimes() int64 {
+	if x != nil {
+		return x.Times
+	}
+	return 0
+}
+
+func (x *ExchangeInfo) GetTotalTimes() int64 {
+	if x != nil {
+		return x.TotalTimes
+	}
+	return 0
+}
+
+//抽奖信息
+//PACKET_NotifyDrawInfo
 type DrawInfo struct {
 	state         protoimpl.MessageState
 	sizeCache     protoimpl.SizeCache
@@ -530,8 +551,9 @@ type CSPushCoinPlayerOp struct {
 	sizeCache     protoimpl.SizeCache
 	unknownFields protoimpl.UnknownFields
 
-	OpCode  OpCodes `protobuf:"varint,1,opt,name=OpCode,proto3,enum=activity.OpCodes" json:"OpCode,omitempty"`
+	OpCode  OpCodes     `protobuf:"varint,1,opt,name=OpCode,proto3,enum=activity.OpCodes" json:"OpCode,omitempty"`
-	OpParam []int64 `protobuf:"varint,2,rep,packed,name=OpParam,proto3" json:"OpParam,omitempty"`
+	OpParam int64       `protobuf:"varint,2,opt,name=OpParam,proto3" json:"OpParam,omitempty"`
+	OpItem  []*ItemInfo `protobuf:"bytes,3,rep,name=OpItem,proto3" json:"OpItem,omitempty"`
 }
 
 func (x *CSPushCoinPlayerOp) Reset() {
@@ -573,10 +595,17 @@ func (x *CSPushCoinPlayerOp) GetOpCode() OpCodes {
 	return OpCodes_OP_Zero
 }
 
-func (x *CSPushCoinPlayerOp) GetOpParam() []int64 {
+func (x *CSPushCoinPlayerOp) GetOpParam() int64 {
 	if x != nil {
 		return x.OpParam
 	}
+	return 0
+}
+
+func (x *CSPushCoinPlayerOp) GetOpItem() []*ItemInfo {
+	if x != nil {
+		return x.OpItem
+	}
 	return nil
 }
 
@@ -589,7 +618,6 @@ type SCPushCoinPlayerOp struct {
 	OpRetCode OpResultPushCoinCode `protobuf:"varint,1,opt,name=OpRetCode,proto3,enum=activity.OpResultPushCoinCode" json:"OpRetCode,omitempty"`
 	OpCode    OpCodes              `protobuf:"varint,2,opt,name=OpCode,proto3,enum=activity.OpCodes" json:"OpCode,omitempty"`
 	Exchange  *ExchangeInfo        `protobuf:"bytes,3,opt,name=Exchange,proto3" json:"Exchange,omitempty"` // 兑换信息,加到背包
-	Draw      *DrawInfo            `protobuf:"bytes,4,opt,name=Draw,proto3" json:"Draw,omitempty"`         // 抽奖信息，掉落到桌面
 }
 
 func (x *SCPushCoinPlayerOp) Reset() {
@@ -645,11 +673,61 @@ func (x *SCPushCoinPlayerOp) GetExchange() *ExchangeInfo {
 	return nil
 }
 
-func (x *SCPushCoinPlayerOp) GetDraw() *DrawInfo {
+//通知能量值
-	if x != nil {
+//PACKET_NotifyPowerLine
-		return x.Draw
+type NotifyPowerLine struct {
+	state         protoimpl.MessageState
+	sizeCache     protoimpl.SizeCache
+	unknownFields protoimpl.UnknownFields
+
+	PowerLine    int64 `protobuf:"varint,1,opt,name=PowerLine,proto3" json:"PowerLine,omitempty"`       // 当前能量值
+	PowerLineMax int64 `protobuf:"varint,2,opt,name=PowerLineMax,proto3" json:"PowerLineMax,omitempty"` // 能量值上限
+}
+
+func (x *NotifyPowerLine) Reset() {
+	*x = NotifyPowerLine{}
+	if protoimpl.UnsafeEnabled {
+		mi := &file_protocol_activity_pushcoin_proto_msgTypes[7]
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		ms.StoreMessageInfo(mi)
 	}
-	return nil
+}
+
+func (x *NotifyPowerLine) String() string {
+	return protoimpl.X.MessageStringOf(x)
+}
+
+func (*NotifyPowerLine) ProtoMessage() {}
+
+func (x *NotifyPowerLine) ProtoReflect() protoreflect.Message {
+	mi := &file_protocol_activity_pushcoin_proto_msgTypes[7]
+	if protoimpl.UnsafeEnabled && x != nil {
+		ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
+		if ms.LoadMessageInfo() == nil {
+			ms.StoreMessageInfo(mi)
+		}
+		return ms
+	}
+	return mi.MessageOf(x)
+}
+
+// Deprecated: Use NotifyPowerLine.ProtoReflect.Descriptor instead.
+func (*NotifyPowerLine) Descriptor() ([]byte, []int) {
+	return file_protocol_activity_pushcoin_proto_rawDescGZIP(), []int{7}
+}
+
+func (x *NotifyPowerLine) GetPowerLine() int64 {
+	if x != nil {
+		return x.PowerLine
+	}
+	return 0
+}
+
+func (x *NotifyPowerLine) GetPowerLineMax() int64 {
+	if x != nil {
+		return x.PowerLineMax
+	}
+	return 0
 }
 
 var File_protocol_activity_pushcoin_proto protoreflect.FileDescriptor
@@ -682,7 +760,7 @@ var file_protocol_activity_pushcoin_proto_rawDesc = []byte{
 	0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18,
 	0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a,
 	0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
-	0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0x8e, 0x01, 0x0a, 0x0c, 0x45, 0x78, 0x63, 0x68,
+	0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0xc4, 0x01, 0x0a, 0x0c, 0x45, 0x78, 0x63, 0x68,
 	0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01,
 	0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x43, 0x6f, 0x73, 0x74,
 	0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
@@ -691,58 +769,69 @@ var file_protocol_activity_pushcoin_proto_rawDesc = []byte{
 	0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e,
 	0x66, 0x6f, 0x52, 0x04, 0x47, 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x68, 0x61, 0x6b,
 	0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x53, 0x68,
-	0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x22, 0x60, 0x0a, 0x08, 0x44, 0x72, 0x61, 0x77,
+	0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x69, 0x6d, 0x65,
-	0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
+	0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x1e,
-	0x52, 0x02, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x02,
+	0x0a, 0x0a, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01,
-	0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07,
+	0x28, 0x03, 0x52, 0x0a, 0x54, 0x6f, 0x74, 0x61, 0x6c, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x22, 0x60,
-	0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x49,
+	0x0a, 0x08, 0x44, 0x72, 0x61, 0x77, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64,
-	0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x12, 0x12, 0x0a, 0x04, 0x43, 0x6f, 0x69, 0x6e, 0x18, 0x04,
+	0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74,
-	0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x43, 0x6f, 0x69, 0x6e, 0x22, 0x59, 0x0a, 0x12, 0x43, 0x53,
+	0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d,
-	0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70,
+	0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20,
-	0x12, 0x29, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e,
+	0x01, 0x28, 0x05, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x12, 0x12, 0x0a, 0x04,
-	0x32, 0x11, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x43, 0x6f,
+	0x43, 0x6f, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x43, 0x6f, 0x69, 0x6e,
-	0x64, 0x65, 0x73, 0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x4f,
+	0x22, 0x85, 0x01, 0x0a, 0x12, 0x43, 0x53, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50,
-	0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x03, 0x28, 0x03, 0x52, 0x07, 0x4f, 0x70,
+	0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64,
-	0x50, 0x61, 0x72, 0x61, 0x6d, 0x22, 0xd9, 0x01, 0x0a, 0x12, 0x53, 0x43, 0x50, 0x75, 0x73, 0x68,
+	0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
-	0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x12, 0x3c, 0x0a, 0x09,
+	0x74, 0x79, 0x2e, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f,
-	0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32,
+	0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x02, 0x20,
-	0x1e, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73,
+	0x01, 0x28, 0x03, 0x52, 0x07, 0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x2a, 0x0a, 0x06,
-	0x75, 0x6c, 0x74, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x52,
+	0x4f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61,
-	0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x29, 0x0a, 0x06, 0x4f, 0x70,
+	0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f,
-	0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x61, 0x63, 0x74,
+	0x52, 0x06, 0x4f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x53, 0x43, 0x50,
-	0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x06, 0x4f,
+	0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x12,
-	0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67,
+	0x3c, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
-	0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
+	0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70,
-	0x74, 0x79, 0x2e, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52,
+	0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x43, 0x6f,
-	0x08, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x12, 0x26, 0x0a, 0x04, 0x44, 0x72, 0x61,
+	0x64, 0x65, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x29, 0x0a,
-	0x77, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
+	0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e,
-	0x74, 0x79, 0x2e, 0x44, 0x72, 0x61, 0x77, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x44, 0x72, 0x61,
+	0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x73,
-	0x77, 0x2a, 0xa4, 0x01, 0x0a, 0x10, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x61,
+	0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x45, 0x78, 0x63, 0x68,
+	0x61, 0x6e, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74,
+	0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e,
+	0x66, 0x6f, 0x52, 0x08, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x22, 0x53, 0x0a, 0x0f,
+	0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12,
+	0x1c, 0x0a, 0x09, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01,
+	0x28, 0x03, 0x52, 0x09, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x22, 0x0a,
+	0x0c, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x4d, 0x61, 0x78, 0x18, 0x02, 0x20,
+	0x01, 0x28, 0x03, 0x52, 0x0c, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x4d, 0x61,
+	0x78, 0x2a, 0xdd, 0x01, 0x0a, 0x10, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x61,
 	0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
 	0x5f, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00,
 	0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x75, 0x73,
-	0x68, 0x43, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xee, 0x14, 0x12, 0x1a, 0x0a, 0x15,
+	0x68, 0x43, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xf8, 0x14, 0x12, 0x1a, 0x0a, 0x15,
 	0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69,
-	0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xef, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
+	0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xf9, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
 	0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61,
-	0x79, 0x65, 0x72, 0x4f, 0x70, 0x10, 0xf0, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
+	0x79, 0x65, 0x72, 0x4f, 0x70, 0x10, 0xfa, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
 	0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61,
-	0x79, 0x65, 0x72, 0x4f, 0x70, 0x10, 0xf1, 0x14, 0x2a, 0x6b, 0x0a, 0x07, 0x4f, 0x70, 0x43, 0x6f,
+	0x79, 0x65, 0x72, 0x4f, 0x70, 0x10, 0xfb, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x41, 0x43, 0x4b,
-	0x64, 0x65, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x50, 0x5f, 0x5a, 0x65, 0x72, 0x6f, 0x10, 0x00,
+	0x45, 0x54, 0x5f, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69,
-	0x12, 0x0a, 0x0a, 0x06, 0x4f, 0x50, 0x5f, 0x42, 0x65, 0x74, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07,
+	0x6e, 0x65, 0x10, 0xfc, 0x14, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
-	0x4f, 0x50, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x5f,
+	0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x44, 0x72, 0x61, 0x77, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xfd,
-	0x53, 0x68, 0x61, 0x6b, 0x65, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x5f, 0x52, 0x65,
+	0x14, 0x2a, 0x5e, 0x0a, 0x07, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x0b, 0x0a, 0x07,
-	0x66, 0x72, 0x65, 0x73, 0x68, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50, 0x5f, 0x45, 0x78,
+	0x4f, 0x50, 0x5f, 0x5a, 0x65, 0x72, 0x6f, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4f, 0x50, 0x5f,
-	0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10, 0x05, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x50, 0x5f, 0x44,
+	0x42, 0x65, 0x74, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x50, 0x5f, 0x47, 0x61, 0x69, 0x6e,
-	0x72, 0x61, 0x77, 0x10, 0x06, 0x2a, 0x4a, 0x0a, 0x14, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c,
+	0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x5f, 0x53, 0x68, 0x61, 0x6b, 0x65, 0x10, 0x03,
-	0x74, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x19, 0x0a,
+	0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x5f, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x10, 0x04,
-	0x15, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x5f, 0x53,
+	0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50, 0x5f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10,
-	0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50, 0x52, 0x43,
+	0x05, 0x2a, 0x4a, 0x0a, 0x14, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x50, 0x75, 0x73,
-	0x5f, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10,
+	0x68, 0x43, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x52,
-	0x01, 0x42, 0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73,
+	0x43, 0x5f, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65,
-	0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63,
+	0x73, 0x73, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x50, 0x75, 0x73,
-	0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f,
+	0x68, 0x43, 0x6f, 0x69, 0x6e, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x42, 0x28, 0x5a,
-	0x74, 0x6f, 0x33,
+	0x26, 0x6d, 0x6f, 0x6e, 0x67, 0x6f, 0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d,
+	0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x61,
+	0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
 }
 
 var (
@@ -758,7 +847,7 @@ func file_protocol_activity_pushcoin_proto_rawDescGZIP() []byte {
 }
 
 var file_protocol_activity_pushcoin_proto_enumTypes = make([]protoimpl.EnumInfo, 3)
-var file_protocol_activity_pushcoin_proto_msgTypes = make([]protoimpl.MessageInfo, 7)
+var file_protocol_activity_pushcoin_proto_msgTypes = make([]protoimpl.MessageInfo, 8)
 var file_protocol_activity_pushcoin_proto_goTypes = []interface{}{
 	(PushCoinPacketID)(0),      // 0: activity.PushCoinPacketID
 	(OpCodes)(0),               // 1: activity.OpCodes
@@ -770,6 +859,7 @@ var file_protocol_activity_pushcoin_proto_goTypes = []interface{}{
 	(*DrawInfo)(nil),           // 7: activity.DrawInfo
 	(*CSPushCoinPlayerOp)(nil), // 8: activity.CSPushCoinPlayerOp
 	(*SCPushCoinPlayerOp)(nil), // 9: activity.SCPushCoinPlayerOp
+	(*NotifyPowerLine)(nil),    // 10: activity.NotifyPowerLine
 }
 var file_protocol_activity_pushcoin_proto_depIdxs = []int32{
 	6, // 0: activity.SCPushCoinInfo.ExchangeList:type_name -> activity.ExchangeInfo
@@ -777,10 +867,10 @@ var file_protocol_activity_pushcoin_proto_depIdxs = []int32{
 	5, // 2: activity.ExchangeInfo.Cost:type_name -> activity.ItemInfo
 	5, // 3: activity.ExchangeInfo.Gain:type_name -> activity.ItemInfo
 	1, // 4: activity.CSPushCoinPlayerOp.OpCode:type_name -> activity.OpCodes
-	2, // 5: activity.SCPushCoinPlayerOp.OpRetCode:type_name -> activity.OpResultPushCoinCode
+	5, // 5: activity.CSPushCoinPlayerOp.OpItem:type_name -> activity.ItemInfo
-	1, // 6: activity.SCPushCoinPlayerOp.OpCode:type_name -> activity.OpCodes
+	2, // 6: activity.SCPushCoinPlayerOp.OpRetCode:type_name -> activity.OpResultPushCoinCode
-	6, // 7: activity.SCPushCoinPlayerOp.Exchange:type_name -> activity.ExchangeInfo
+	1, // 7: activity.SCPushCoinPlayerOp.OpCode:type_name -> activity.OpCodes
-	7, // 8: activity.SCPushCoinPlayerOp.Draw:type_name -> activity.DrawInfo
+	6, // 8: activity.SCPushCoinPlayerOp.Exchange:type_name -> activity.ExchangeInfo
 	9, // [9:9] is the sub-list for method output_type
 	9, // [9:9] is the sub-list for method input_type
 	9, // [9:9] is the sub-list for extension type_name
@@ -878,6 +968,18 @@ func file_protocol_activity_pushcoin_proto_init() {
 				return nil
 			}
 		}
+		file_protocol_activity_pushcoin_proto_msgTypes[7].Exporter = func(v interface{}, i int) interface{} {
+			switch v := v.(*NotifyPowerLine); i {
+			case 0:
+				return &v.state
+			case 1:
+				return &v.sizeCache
+			case 2:
+				return &v.unknownFields
+			default:
+				return nil
+			}
+		}
 	}
 	type x struct{}
 	out := protoimpl.TypeBuilder{
@@ -885,7 +987,7 @@ func file_protocol_activity_pushcoin_proto_init() {
 			GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
 			RawDescriptor: file_protocol_activity_pushcoin_proto_rawDesc,
 			NumEnums:      3,
-			NumMessages:   7,
+			NumMessages:   8,
 			NumExtensions: 0,
 			NumServices:   0,
 		},

protocol/activity/pushcoin.proto

@@ -4,10 +4,12 @@ option go_package = "mongo.games.com/game/protocol/activity";
 
 enum PushCoinPacketID {
   PACKET_PushCoin_ZERO = 0;// 弃用消息号
-  PACKET_CSPushCoinInfo = 2670; // 信息
+  PACKET_CSPushCoinInfo = 2680; // 信息
-  PACKET_SCPushCoinInfo = 2671; // 信息返回
+  PACKET_SCPushCoinInfo = 2681; // 信息返回
-  PACKET_CSPushCoinPlayerOp = 2672; // 玩家操作
+  PACKET_CSPushCoinPlayerOp = 2682; // 玩家操作
-  PACKET_SCPushCoinPlayerOp = 2673; // 玩家操作返回
+  PACKET_SCPushCoinPlayerOp = 2683; // 玩家操作返回
+  PACKET_NotifyPowerLine = 2684; // 通知能量值
+  PACKET_NotifyDrawInfo = 2685; // 抽奖信息
 }
 
 //信息
@@ -36,8 +38,12 @@ message ExchangeInfo{
   repeated ItemInfo Cost = 2; //消耗道具
   repeated ItemInfo Gain = 3; //获得道具
   int32 ShakeTimes = 4; //获得震动次数
+  int64 Times = 5; //可兑换次数 -1无限
+  int64 TotalTimes = 6; //总共兑换次数 -1无限
 }
 
+//抽奖信息
+//PACKET_NotifyDrawInfo
 message DrawInfo{
   int32 Id = 1; //抽奖id
   int32 ItemId = 2; //道具id
@@ -49,17 +55,17 @@ message DrawInfo{
 //PACKET_CSPushCoinPlayerOp
 message CSPushCoinPlayerOp {
   OpCodes OpCode = 1;
-  repeated int64 OpParam = 2;
+  int64 OpParam = 2;
+  repeated ItemInfo OpItem = 3;
 }
 
 enum OpCodes {
   OP_Zero = 0;
-  OP_Bet = 1;  // 下注 [下注金额]
+  OP_Bet = 1;  // 下注 OpParam 下注金额
-  OP_Gain = 2; // 得分 [得分金额]
+  OP_Gain = 2; // 得分 OpItem 获得道具
-  OP_Shake = 3; // 震动 [消耗次数]
+  OP_Shake = 3; // 震动 OpParam 消耗次数
-  OP_Refresh = 4; // 刷新 [桌面金额]
+  OP_Refresh = 4; // 刷新 OpParam 桌面金额
-  OP_Exchange = 5; // 兑换 [兑换id]
+  OP_Exchange = 5; // 兑换 OpParam 兑换id
-  OP_Draw = 6; // 抽奖 [抽奖id]
 }
 
 enum OpResultPushCoinCode {
@@ -72,5 +78,11 @@ message SCPushCoinPlayerOp {
   OpResultPushCoinCode OpRetCode = 1;
   OpCodes OpCode = 2;
   ExchangeInfo Exchange = 3; // 兑换信息,加到背包
-  DrawInfo Draw = 4; // 抽奖信息，掉落到桌面
+}
+
+//通知能量值
+//PACKET_NotifyPowerLine
+message NotifyPowerLine {
+  int64 PowerLine = 1; // 当前能量值
+  int64 PowerLineMax = 2; // 能量值上限
 }

protocol/server/pbdata.proto

@@ -5,6 +5,22 @@ syntax = "proto3";
 package server;
 option go_package = "mongo.games.com/game/protocol/server";
 
+message DB_ACTPushCoin {
+
+	int32 Id = 1;
+
+	int32 Rate = 2;
+
+	map<int64, int64> Gain = 3;
+
+	int64 Value = 4;
+
+}
+
+message DB_ACTPushCoinArray {
+    repeated DB_ACTPushCoin Arr = 1;
+}
+
 message DB_ActSign {
 
 	int32 Id = 1;