Compare commits
No commits in common. "87a9a6564343b466cc8fdaa4cebaffc6e52a5bee" and "f5d7e366111d8d8ca2b80037d70b8ddd18153d31" have entirely different histories.
87a9a65643
...
f5d7e36611
|
|
@ -604,11 +604,7 @@ const (
|
||||||
ItemIDRoomCard = 40002 // 房卡
|
ItemIDRoomCard = 40002 // 房卡
|
||||||
ItemIDLittleGuaranteed = 50014 //小爆竹
|
ItemIDLittleGuaranteed = 50014 //小爆竹
|
||||||
ItemIDBigGuaranteed = 50015 //大爆竹
|
ItemIDBigGuaranteed = 50015 //大爆竹
|
||||||
ItemIDPlum = 50016 //梅花（推币机）
|
|
||||||
ItemIDBigCoin = 50017 //大金币
|
ItemIDBigCoin = 50017 //大金币
|
||||||
ItemIDCoin1 = 500018 //金币1
|
|
||||||
ItemIDCoin2 = 500019 //金币2
|
|
||||||
ItemIDCoin3 = 500020 //金币3
|
|
||||||
)
|
)
|
||||||
|
|
||||||
func ToItemId(id int32) int32 {
|
func ToItemId(id int32) int32 {
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,11 @@
|
||||||
|
|
||||||
в† ЁГ
|
ЎЌ ЁГ
|
||||||
ив†
|
иЎЌ
|
||||||
І
|
І
|
||||||
Вв† Ќ
|
ВЎЌ Ќ
|
||||||
Ü ±ê <20>N
|
Ü ±ê <20>N
|
||||||
î±ê І
|
î±ê І
|
||||||
ú¢<> <>
|
ú¢<> <>
|
||||||
èᆠІ
|
èᆠІ
|
||||||
¶à† °ê
|
¶à† °ê
|
||||||
d»к ЂВЧ/
|
d¶к ЂВЧ/
|
||||||
|
|
@ -4,7 +4,7 @@
|
||||||
"Id": 1,
|
"Id": 1,
|
||||||
"Rate": 4000,
|
"Rate": 4000,
|
||||||
"Gain": {
|
"Gain": {
|
||||||
"50018": 5
|
"100001": 5
|
||||||
},
|
},
|
||||||
"Value": 25000
|
"Value": 25000
|
||||||
},
|
},
|
||||||
|
|
@ -12,7 +12,7 @@
|
||||||
"Id": 2,
|
"Id": 2,
|
||||||
"Rate": 1000,
|
"Rate": 1000,
|
||||||
"Gain": {
|
"Gain": {
|
||||||
"50018": 10
|
"100001": 10
|
||||||
},
|
},
|
||||||
"Value": 50000
|
"Value": 50000
|
||||||
},
|
},
|
||||||
|
|
@ -20,7 +20,7 @@
|
||||||
"Id": 3,
|
"Id": 3,
|
||||||
"Rate": 450,
|
"Rate": 450,
|
||||||
"Gain": {
|
"Gain": {
|
||||||
"50018": 20
|
"100001": 20
|
||||||
},
|
},
|
||||||
"Value": 100000
|
"Value": 100000
|
||||||
},
|
},
|
||||||
|
|
@ -68,7 +68,7 @@
|
||||||
"Id": 9,
|
"Id": 9,
|
||||||
"Rate": 100,
|
"Rate": 100,
|
||||||
"Gain": {
|
"Gain": {
|
||||||
"30011": 1
|
"30006": 1
|
||||||
},
|
},
|
||||||
"Value": 100000000
|
"Value": 100000000
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -4574,7 +4574,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2110002,
|
"Id": 2110002,
|
||||||
"Name": "十三张四人",
|
"Name": "十三张四人",
|
||||||
"Title": "中级场",
|
"Title": "小康场",
|
||||||
"GameId": 211,
|
"GameId": 211,
|
||||||
"GameRule": 21100,
|
"GameRule": 21100,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -4628,7 +4628,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2110003,
|
"Id": 2110003,
|
||||||
"Name": "十三张四人",
|
"Name": "十三张四人",
|
||||||
"Title": "高级场",
|
"Title": "土豪场",
|
||||||
"GameId": 211,
|
"GameId": 211,
|
||||||
"GameRule": 21100,
|
"GameRule": 21100,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -4682,7 +4682,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2110004,
|
"Id": 2110004,
|
||||||
"Name": "十三张四人",
|
"Name": "十三张四人",
|
||||||
"Title": "富豪场",
|
"Title": "新手场",
|
||||||
"GameId": 211,
|
"GameId": 211,
|
||||||
"GameRule": 21100,
|
"GameRule": 21100,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -4736,7 +4736,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2110005,
|
"Id": 2110005,
|
||||||
"Name": "十三张四人",
|
"Name": "十三张四人",
|
||||||
"Title": "至尊场",
|
"Title": "小康场",
|
||||||
"GameId": 211,
|
"GameId": 211,
|
||||||
"GameRule": 21100,
|
"GameRule": 21100,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -4790,7 +4790,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2110006,
|
"Id": 2110006,
|
||||||
"Name": "十三张四人",
|
"Name": "十三张四人",
|
||||||
"Title": "大神场",
|
"Title": "土豪场",
|
||||||
"GameId": 211,
|
"GameId": 211,
|
||||||
"GameRule": 21100,
|
"GameRule": 21100,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -4897,7 +4897,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2120002,
|
"Id": 2120002,
|
||||||
"Name": "十三张八人",
|
"Name": "十三张八人",
|
||||||
"Title": "中级场",
|
"Title": "小康场",
|
||||||
"GameId": 212,
|
"GameId": 212,
|
||||||
"GameRule": 21200,
|
"GameRule": 21200,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -4951,7 +4951,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2120003,
|
"Id": 2120003,
|
||||||
"Name": "十三张八人",
|
"Name": "十三张八人",
|
||||||
"Title": "高级场",
|
"Title": "土豪场",
|
||||||
"GameId": 212,
|
"GameId": 212,
|
||||||
"GameRule": 21200,
|
"GameRule": 21200,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -5005,7 +5005,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2120004,
|
"Id": 2120004,
|
||||||
"Name": "十三张八人",
|
"Name": "十三张八人",
|
||||||
"Title": "富豪场",
|
"Title": "新手场",
|
||||||
"GameId": 212,
|
"GameId": 212,
|
||||||
"GameRule": 21200,
|
"GameRule": 21200,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -5059,7 +5059,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2120005,
|
"Id": 2120005,
|
||||||
"Name": "十三张八人",
|
"Name": "十三张八人",
|
||||||
"Title": "至尊场",
|
"Title": "小康场",
|
||||||
"GameId": 212,
|
"GameId": 212,
|
||||||
"GameRule": 21200,
|
"GameRule": 21200,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -5113,7 +5113,7 @@
|
||||||
{
|
{
|
||||||
"Id": 2120006,
|
"Id": 2120006,
|
||||||
"Name": "十三张八人",
|
"Name": "十三张八人",
|
||||||
"Title": "大神场",
|
"Title": "土豪场",
|
||||||
"GameId": 212,
|
"GameId": 212,
|
||||||
"GameRule": 21200,
|
"GameRule": 21200,
|
||||||
"GameType": 2,
|
"GameType": 2,
|
||||||
|
|
@ -7023,36 +7023,22 @@
|
||||||
{
|
{
|
||||||
"Id": 6090001,
|
"Id": 6090001,
|
||||||
"Name": "推币机",
|
"Name": "推币机",
|
||||||
"Title": "推币机",
|
|
||||||
"GameId": 609,
|
"GameId": 609,
|
||||||
"GameRule": 60900,
|
"GameRule": 60900,
|
||||||
"GameType": 5,
|
"GameType": 5,
|
||||||
"SceneType": 1,
|
"SceneType": 1,
|
||||||
"Desc": "0",
|
|
||||||
"ShowType": 3,
|
"ShowType": 3,
|
||||||
"ShowId": 60900,
|
"ShowId": 60900,
|
||||||
"Turn": 60900,
|
"Turn": 60900,
|
||||||
"BetDec": "0",
|
|
||||||
"Ai": [
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"OtherIntParams": [
|
"OtherIntParams": [
|
||||||
5000,
|
5000,
|
||||||
10000,
|
10000,
|
||||||
15000
|
15000
|
||||||
],
|
],
|
||||||
"RobotNumRng": [
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"SameIpLimit": 1,
|
"SameIpLimit": 1,
|
||||||
"GameDif": "609",
|
"GameDif": "609",
|
||||||
"GameClass": 2,
|
"GameClass": 2,
|
||||||
"PlatformName": "越南棋牌",
|
"PlatformName": "越南棋牌",
|
||||||
"MaxBetCoin": [
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"PlayerWaterRate": 100,
|
|
||||||
"BetWaterRate": 100,
|
|
||||||
"GameName": "推币机"
|
"GameName": "推币机"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
|
|
|
||||||
Binary file not shown.
|
|
@ -7373,122 +7373,8 @@
|
||||||
"Composition": 1,
|
"Composition": 1,
|
||||||
"CompositionMax": 9999,
|
"CompositionMax": 9999,
|
||||||
"Location": "0",
|
"Location": "0",
|
||||||
"Describe": "推币机活动中掉落的3D道具",
|
"Describe": "可在推币机活动兑换道具",
|
||||||
"Num": 50000
|
"Num": 10
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 50018,
|
|
||||||
"Name": "3D金币5K",
|
|
||||||
"ShowLocation": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"Classify": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"Type": 29,
|
|
||||||
"Effect0": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"Effect": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"SaleType": 1,
|
|
||||||
"SaleGold": 5000,
|
|
||||||
"Composition": 1,
|
|
||||||
"CompositionMax": 9999,
|
|
||||||
"Location": "0",
|
|
||||||
"Describe": "推币机活动中掉落的3D道具",
|
|
||||||
"Num": 5000
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 50019,
|
|
||||||
"Name": "3D金币10K",
|
|
||||||
"ShowLocation": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"Classify": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"Type": 29,
|
|
||||||
"Effect0": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"Effect": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"SaleType": 1,
|
|
||||||
"SaleGold": 5000,
|
|
||||||
"Composition": 1,
|
|
||||||
"CompositionMax": 9999,
|
|
||||||
"Location": "0",
|
|
||||||
"Describe": "推币机活动中掉落的3D道具",
|
|
||||||
"Num": 10000
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"Id": 50020,
|
|
||||||
"Name": "3D金币15K",
|
|
||||||
"ShowLocation": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"Classify": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"Type": 29,
|
|
||||||
"Effect0": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"Effect": [
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0,
|
|
||||||
0
|
|
||||||
],
|
|
||||||
"SaleType": 1,
|
|
||||||
"SaleGold": 5000,
|
|
||||||
"Composition": 1,
|
|
||||||
"CompositionMax": 9999,
|
|
||||||
"Location": "0",
|
|
||||||
"Describe": "推币机活动中掉落的3D道具",
|
|
||||||
"Num": 15000
|
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|
@ -1,8 +1,8 @@
|
||||||
|
|
||||||
6с├т├у├ж├в├"║█ю└=
|
6в├с├т├у├ж├"║█ю└=
|
||||||
.ш├ь├ы├з├"║█ю└=
|
.ь├ы├з├ш├"║█ю└=
|
||||||
Wж├ь├с├т├ы├з├ш├у├в├" ║█─╜Б
|
Wу├ж├ы├з├т├в├ь├ш├с├" ║█─╜Б
|
||||||
]в├ы├ш├с├у├ь├з├э├т├ж├"╒█Т
|
]ь├з├ш├э├с├у├ж├т├в├ы├"╒█Т
|
||||||
à† "¸0
|
à† "¸0
|
||||||
à†
|
à†
|
||||||
"¢<>0
|
"¢<>0
|
||||||
|
|
|
||||||
BIN
data/DB_Task.dat
BIN
data/DB_Task.dat
Binary file not shown.
|
|
@ -561,9 +561,10 @@ type PushCoinData struct {
|
||||||
Shake int32 // 震动次数
|
Shake int32 // 震动次数
|
||||||
Refresh int64 // 刷新次数
|
Refresh int64 // 刷新次数
|
||||||
Power int64 // 能量值
|
Power int64 // 能量值
|
||||||
|
Base int64 // 底注
|
||||||
|
Value int64 // 价值
|
||||||
Exchange map[int32]int32 // 兑换次数 兑换id:兑换次数
|
Exchange map[int32]int32 // 兑换次数 兑换id:兑换次数
|
||||||
Dram int // 抽奖次数
|
Dram int // 抽奖次数
|
||||||
Items map[int32]int64 // 道具
|
|
||||||
}
|
}
|
||||||
|
|
||||||
type WelfareData struct {
|
type WelfareData struct {
|
||||||
|
|
|
||||||
|
|
@ -85,8 +85,8 @@ type OpCodes int32
|
||||||
|
|
||||||
const (
|
const (
|
||||||
OpCodes_OP_Zero OpCodes = 0
|
OpCodes_OP_Zero OpCodes = 0
|
||||||
OpCodes_OP_Bet OpCodes = 1 // 下注 OpParam 道具id
|
OpCodes_OP_Bet OpCodes = 1 // 下注 OpParam 下注金额
|
||||||
OpCodes_OP_Gain OpCodes = 2 // 得分 OpParam 1有效区 2无效区 OpItem 获得道具
|
OpCodes_OP_Gain OpCodes = 2 // 得分 OpItem 获得道具
|
||||||
OpCodes_OP_Shake OpCodes = 3 // 震动 OpParam 消耗次数
|
OpCodes_OP_Shake OpCodes = 3 // 震动 OpParam 消耗次数
|
||||||
OpCodes_OP_Refresh OpCodes = 4 // 刷新 OpParam 桌面金额
|
OpCodes_OP_Refresh OpCodes = 4 // 刷新 OpParam 桌面金额
|
||||||
OpCodes_OP_Exchange OpCodes = 5 // 兑换 OpParam 兑换id
|
OpCodes_OP_Exchange OpCodes = 5 // 兑换 OpParam 兑换id
|
||||||
|
|
@ -233,10 +233,12 @@ type SCPushCoinInfo struct {
|
||||||
|
|
||||||
ExchangeList []*ExchangeInfo `protobuf:"bytes,1,rep,name=ExchangeList,proto3" json:"ExchangeList,omitempty"` //兑换信息
|
ExchangeList []*ExchangeInfo `protobuf:"bytes,1,rep,name=ExchangeList,proto3" json:"ExchangeList,omitempty"` //兑换信息
|
||||||
DrawList []*DrawInfo `protobuf:"bytes,2,rep,name=DrawList,proto3" json:"DrawList,omitempty"` //抽奖信息
|
DrawList []*DrawInfo `protobuf:"bytes,2,rep,name=DrawList,proto3" json:"DrawList,omitempty"` //抽奖信息
|
||||||
ShakeTimes int32 `protobuf:"varint,3,opt,name=ShakeTimes,proto3" json:"ShakeTimes,omitempty"` //可震动次数
|
BetList []int64 `protobuf:"varint,3,rep,packed,name=BetList,proto3" json:"BetList,omitempty"` //下注金额列表
|
||||||
PowerLine int64 `protobuf:"varint,4,opt,name=PowerLine,proto3" json:"PowerLine,omitempty"` // 当前能量值
|
ShakeTimes int32 `protobuf:"varint,4,opt,name=ShakeTimes,proto3" json:"ShakeTimes,omitempty"` //可震动次数
|
||||||
PowerLineMax int64 `protobuf:"varint,5,opt,name=PowerLineMax,proto3" json:"PowerLineMax,omitempty"` // 能量值上限
|
BaseCoin int64 `protobuf:"varint,5,opt,name=BaseCoin,proto3" json:"BaseCoin,omitempty"` //当前底分(单次投币金额)
|
||||||
RefreshTimes int64 `protobuf:"varint,6,opt,name=RefreshTimes,proto3" json:"RefreshTimes,omitempty"` // 刷新次数
|
PowerLine int64 `protobuf:"varint,6,opt,name=PowerLine,proto3" json:"PowerLine,omitempty"` // 当前能量值
|
||||||
|
PowerLineMax int64 `protobuf:"varint,7,opt,name=PowerLineMax,proto3" json:"PowerLineMax,omitempty"` // 能量值上限
|
||||||
|
RefreshTimes int64 `protobuf:"varint,8,opt,name=RefreshTimes,proto3" json:"RefreshTimes,omitempty"` // 刷新次数
|
||||||
}
|
}
|
||||||
|
|
||||||
func (x *SCPushCoinInfo) Reset() {
|
func (x *SCPushCoinInfo) Reset() {
|
||||||
|
|
@ -285,6 +287,13 @@ func (x *SCPushCoinInfo) GetDrawList() []*DrawInfo {
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *SCPushCoinInfo) GetBetList() []int64 {
|
||||||
|
if x != nil {
|
||||||
|
return x.BetList
|
||||||
|
}
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
||||||
func (x *SCPushCoinInfo) GetShakeTimes() int32 {
|
func (x *SCPushCoinInfo) GetShakeTimes() int32 {
|
||||||
if x != nil {
|
if x != nil {
|
||||||
return x.ShakeTimes
|
return x.ShakeTimes
|
||||||
|
|
@ -292,6 +301,13 @@ func (x *SCPushCoinInfo) GetShakeTimes() int32 {
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (x *SCPushCoinInfo) GetBaseCoin() int64 {
|
||||||
|
if x != nil {
|
||||||
|
return x.BaseCoin
|
||||||
|
}
|
||||||
|
return 0
|
||||||
|
}
|
||||||
|
|
||||||
func (x *SCPushCoinInfo) GetPowerLine() int64 {
|
func (x *SCPushCoinInfo) GetPowerLine() int64 {
|
||||||
if x != nil {
|
if x != nil {
|
||||||
return x.PowerLine
|
return x.PowerLine
|
||||||
|
|
@ -720,7 +736,7 @@ var file_protocol_activity_pushcoin_proto_rawDesc = []byte{
|
||||||
0x0a, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76,
|
0x0a, 0x20, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76,
|
||||||
0x69, 0x74, 0x79, 0x2f, 0x70, 0x75, 0x73, 0x68, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
|
0x69, 0x74, 0x79, 0x2f, 0x70, 0x75, 0x73, 0x68, 0x63, 0x6f, 0x69, 0x6e, 0x2e, 0x70, 0x72, 0x6f,
|
||||||
0x74, 0x6f, 0x12, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 0x10, 0x0a, 0x0e,
|
0x74, 0x6f, 0x12, 0x08, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x22, 0x10, 0x0a, 0x0e,
|
||||||
0x43, 0x53, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x82,
|
0x43, 0x53, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xb8,
|
||||||
0x02, 0x0a, 0x0e, 0x53, 0x43, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x66,
|
0x02, 0x0a, 0x0e, 0x53, 0x43, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x66,
|
||||||
0x6f, 0x12, 0x3a, 0x0a, 0x0c, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x73,
|
0x6f, 0x12, 0x3a, 0x0a, 0x0c, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x73,
|
||||||
0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
|
0x74, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
|
||||||
|
|
@ -728,91 +744,94 @@ var file_protocol_activity_pushcoin_proto_rawDesc = []byte{
|
||||||
0x0c, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2e, 0x0a,
|
0x0c, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x2e, 0x0a,
|
||||||
0x08, 0x44, 0x72, 0x61, 0x77, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
0x08, 0x44, 0x72, 0x61, 0x77, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32,
|
||||||
0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x44, 0x72, 0x61, 0x77, 0x49,
|
0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x44, 0x72, 0x61, 0x77, 0x49,
|
||||||
0x6e, 0x66, 0x6f, 0x52, 0x08, 0x44, 0x72, 0x61, 0x77, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a,
|
0x6e, 0x66, 0x6f, 0x52, 0x08, 0x44, 0x72, 0x61, 0x77, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x18, 0x0a,
|
||||||
0x0a, 0x53, 0x68, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28,
|
0x07, 0x42, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x18, 0x03, 0x20, 0x03, 0x28, 0x03, 0x52, 0x07,
|
||||||
0x05, 0x52, 0x0a, 0x53, 0x68, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x1c, 0x0a,
|
0x42, 0x65, 0x74, 0x4c, 0x69, 0x73, 0x74, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x68, 0x61, 0x6b, 0x65,
|
||||||
0x09, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03,
|
0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x53, 0x68, 0x61,
|
||||||
0x52, 0x09, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x50,
|
0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x1a, 0x0a, 0x08, 0x42, 0x61, 0x73, 0x65, 0x43,
|
||||||
0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x4d, 0x61, 0x78, 0x18, 0x05, 0x20, 0x01, 0x28,
|
0x6f, 0x69, 0x6e, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x42, 0x61, 0x73, 0x65, 0x43,
|
||||||
0x03, 0x52, 0x0c, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x4d, 0x61, 0x78, 0x12,
|
0x6f, 0x69, 0x6e, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65,
|
||||||
0x22, 0x0a, 0x0c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18,
|
0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e,
|
||||||
0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x54, 0x69,
|
0x65, 0x12, 0x22, 0x0a, 0x0c, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x4d, 0x61,
|
||||||
0x6d, 0x65, 0x73, 0x22, 0x3c, 0x0a, 0x08, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12,
|
0x78, 0x18, 0x07, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69,
|
||||||
0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
|
0x6e, 0x65, 0x4d, 0x61, 0x78, 0x12, 0x22, 0x0a, 0x0c, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
|
||||||
0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e,
|
0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x52, 0x65, 0x66,
|
||||||
0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75,
|
0x72, 0x65, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x22, 0x3c, 0x0a, 0x08, 0x49, 0x74, 0x65,
|
||||||
0x6d, 0x22, 0xc4, 0x01, 0x0a, 0x0c, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e,
|
0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x16, 0x0a, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x18,
|
||||||
0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
|
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x64, 0x12, 0x18, 0x0a,
|
||||||
0x49, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x43, 0x6f, 0x73, 0x74, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b,
|
0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07,
|
||||||
0x32, 0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d,
|
0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x22, 0xc4, 0x01, 0x0a, 0x0c, 0x45, 0x78, 0x63, 0x68,
|
||||||
0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x43, 0x6f, 0x73, 0x74, 0x12, 0x26, 0x0a, 0x04, 0x47, 0x61,
|
0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01,
|
||||||
0x69, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76,
|
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x26, 0x0a, 0x04, 0x43, 0x6f, 0x73, 0x74,
|
||||||
0x69, 0x74, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x47, 0x61,
|
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
|
||||||
0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x68, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73,
|
0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x43, 0x6f, 0x73, 0x74,
|
||||||
0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x53, 0x68, 0x61, 0x6b, 0x65, 0x54, 0x69, 0x6d,
|
0x12, 0x26, 0x0a, 0x04, 0x47, 0x61, 0x69, 0x6e, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12,
|
||||||
0x65, 0x73, 0x12, 0x14, 0x0a, 0x05, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28,
|
0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e,
|
||||||
0x03, 0x52, 0x05, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x54, 0x6f, 0x74, 0x61,
|
0x66, 0x6f, 0x52, 0x04, 0x47, 0x61, 0x69, 0x6e, 0x12, 0x1e, 0x0a, 0x0a, 0x53, 0x68, 0x61, 0x6b,
|
||||||
0x6c, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x54, 0x6f,
|
0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x53, 0x68,
|
||||||
0x74, 0x61, 0x6c, 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, 0x85, 0x01, 0x0a, 0x12, 0x43,
|
0x65, 0x6d, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x49, 0x74, 0x65, 0x6d,
|
||||||
0x53, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f,
|
0x49, 0x64, 0x12, 0x18, 0x0a, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x18, 0x03, 0x20,
|
||||||
0x70, 0x12, 0x29, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28,
|
0x01, 0x28, 0x05, 0x52, 0x07, 0x49, 0x74, 0x65, 0x6d, 0x4e, 0x75, 0x6d, 0x12, 0x12, 0x0a, 0x04,
|
||||||
0x0e, 0x32, 0x11, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x43,
|
0x43, 0x6f, 0x69, 0x6e, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x04, 0x43, 0x6f, 0x69, 0x6e,
|
||||||
0x6f, 0x64, 0x65, 0x73, 0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x18, 0x0a, 0x07,
|
0x22, 0x85, 0x01, 0x0a, 0x12, 0x43, 0x53, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50,
|
||||||
0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x4f,
|
0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x12, 0x29, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64,
|
||||||
0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x2a, 0x0a, 0x06, 0x4f, 0x70, 0x49, 0x74, 0x65, 0x6d,
|
0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
|
||||||
0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
|
|
||||||
0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x06, 0x4f, 0x70, 0x49, 0x74,
|
|
||||||
0x65, 0x6d, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x53, 0x43, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69,
|
|
||||||
0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x12, 0x3c, 0x0a, 0x09, 0x4f, 0x70, 0x52,
|
|
||||||
0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x61,
|
|
||||||
0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74,
|
|
||||||
0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x52, 0x09, 0x4f, 0x70,
|
|
||||||
0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x29, 0x0a, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64,
|
|
||||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69,
|
|
||||||
0x74, 0x79, 0x2e, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f,
|
0x74, 0x79, 0x2e, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f,
|
||||||
0x64, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x18, 0x03,
|
0x64, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x02, 0x20,
|
||||||
0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e,
|
0x01, 0x28, 0x03, 0x52, 0x07, 0x4f, 0x70, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x2a, 0x0a, 0x06,
|
||||||
0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x08, 0x45, 0x78,
|
0x4f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x61,
|
||||||
0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x22, 0x53, 0x0a, 0x0f, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79,
|
0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x49, 0x6e, 0x66, 0x6f,
|
||||||
0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x6f, 0x77,
|
0x52, 0x06, 0x4f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x22, 0xb1, 0x01, 0x0a, 0x12, 0x53, 0x43, 0x50,
|
||||||
0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x50, 0x6f,
|
0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x12,
|
||||||
0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x22, 0x0a, 0x0c, 0x50, 0x6f, 0x77, 0x65, 0x72,
|
0x3c, 0x0a, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x4c, 0x69, 0x6e, 0x65, 0x4d, 0x61, 0x78, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0c, 0x50,
|
0x28, 0x0e, 0x32, 0x1e, 0x2e, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70,
|
||||||
0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x4d, 0x61, 0x78, 0x2a, 0xdd, 0x01, 0x0a, 0x10,
|
0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x43, 0x6f,
|
||||||
0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x61, 0x63, 0x6b, 0x65, 0x74, 0x49, 0x44,
|
0x64, 0x65, 0x52, 0x09, 0x4f, 0x70, 0x52, 0x65, 0x74, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x29, 0x0a,
|
||||||
0x12, 0x18, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x50, 0x75, 0x73, 0x68, 0x43,
|
0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x11, 0x2e,
|
||||||
0x6f, 0x69, 0x6e, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41,
|
0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x73,
|
||||||
0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x49,
|
0x52, 0x06, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x32, 0x0a, 0x08, 0x45, 0x78, 0x63, 0x68,
|
||||||
0x6e, 0x66, 0x6f, 0x10, 0xf8, 0x14, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
|
0x61, 0x6e, 0x67, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x61, 0x63, 0x74,
|
||||||
0x5f, 0x53, 0x43, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10,
|
0x69, 0x76, 0x69, 0x74, 0x79, 0x2e, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x49, 0x6e,
|
||||||
0xf9, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50,
|
0x66, 0x6f, 0x52, 0x08, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x22, 0x53, 0x0a, 0x0f,
|
||||||
0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x10,
|
0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12,
|
||||||
0xfa, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50,
|
0x1c, 0x0a, 0x09, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x18, 0x01, 0x20, 0x01,
|
||||||
0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4f, 0x70, 0x10,
|
0x28, 0x03, 0x52, 0x09, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x12, 0x22, 0x0a,
|
||||||
0xfb, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4e, 0x6f, 0x74,
|
0x0c, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x4d, 0x61, 0x78, 0x18, 0x02, 0x20,
|
||||||
0x69, 0x66, 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x10, 0xfc, 0x14, 0x12,
|
0x01, 0x28, 0x03, 0x52, 0x0c, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69, 0x6e, 0x65, 0x4d, 0x61,
|
||||||
0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79,
|
0x78, 0x2a, 0xdd, 0x01, 0x0a, 0x10, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x61,
|
||||||
0x44, 0x72, 0x61, 0x77, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xfd, 0x14, 0x2a, 0x5e, 0x0a, 0x07, 0x4f,
|
0x63, 0x6b, 0x65, 0x74, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x14, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54,
|
||||||
0x70, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x50, 0x5f, 0x5a, 0x65, 0x72,
|
0x5f, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x5f, 0x5a, 0x45, 0x52, 0x4f, 0x10, 0x00,
|
||||||
0x6f, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4f, 0x50, 0x5f, 0x42, 0x65, 0x74, 0x10, 0x01, 0x12,
|
0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x75, 0x73,
|
||||||
0x0b, 0x0a, 0x07, 0x4f, 0x50, 0x5f, 0x47, 0x61, 0x69, 0x6e, 0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08,
|
0x68, 0x43, 0x6f, 0x69, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xf8, 0x14, 0x12, 0x1a, 0x0a, 0x15,
|
||||||
0x4f, 0x50, 0x5f, 0x53, 0x68, 0x61, 0x6b, 0x65, 0x10, 0x03, 0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50,
|
0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69,
|
||||||
0x5f, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x10, 0x04, 0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50,
|
0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xf9, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
|
||||||
0x5f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10, 0x05, 0x2a, 0x4a, 0x0a, 0x14, 0x4f,
|
0x45, 0x54, 0x5f, 0x43, 0x53, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61,
|
||||||
0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x43,
|
0x79, 0x65, 0x72, 0x4f, 0x70, 0x10, 0xfa, 0x14, 0x12, 0x1e, 0x0a, 0x19, 0x50, 0x41, 0x43, 0x4b,
|
||||||
0x6f, 0x64, 0x65, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x50, 0x75, 0x73, 0x68,
|
0x45, 0x54, 0x5f, 0x53, 0x43, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x50, 0x6c, 0x61,
|
||||||
0x43, 0x6f, 0x69, 0x6e, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65, 0x73, 0x73, 0x10, 0x00, 0x12, 0x17,
|
0x79, 0x65, 0x72, 0x4f, 0x70, 0x10, 0xfb, 0x14, 0x12, 0x1b, 0x0a, 0x16, 0x50, 0x41, 0x43, 0x4b,
|
||||||
0x0a, 0x13, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x5f,
|
0x45, 0x54, 0x5f, 0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x50, 0x6f, 0x77, 0x65, 0x72, 0x4c, 0x69,
|
||||||
0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x42, 0x28, 0x5a, 0x26, 0x6d, 0x6f, 0x6e, 0x67, 0x6f,
|
0x6e, 0x65, 0x10, 0xfc, 0x14, 0x12, 0x1a, 0x0a, 0x15, 0x50, 0x41, 0x43, 0x4b, 0x45, 0x54, 0x5f,
|
||||||
0x2e, 0x67, 0x61, 0x6d, 0x65, 0x73, 0x2e, 0x63, 0x6f, 0x6d, 0x2f, 0x67, 0x61, 0x6d, 0x65, 0x2f,
|
0x4e, 0x6f, 0x74, 0x69, 0x66, 0x79, 0x44, 0x72, 0x61, 0x77, 0x49, 0x6e, 0x66, 0x6f, 0x10, 0xfd,
|
||||||
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x63, 0x6f, 0x6c, 0x2f, 0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74,
|
0x14, 0x2a, 0x5e, 0x0a, 0x07, 0x4f, 0x70, 0x43, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x0b, 0x0a, 0x07,
|
||||||
0x79, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
0x4f, 0x50, 0x5f, 0x5a, 0x65, 0x72, 0x6f, 0x10, 0x00, 0x12, 0x0a, 0x0a, 0x06, 0x4f, 0x50, 0x5f,
|
||||||
|
0x42, 0x65, 0x74, 0x10, 0x01, 0x12, 0x0b, 0x0a, 0x07, 0x4f, 0x50, 0x5f, 0x47, 0x61, 0x69, 0x6e,
|
||||||
|
0x10, 0x02, 0x12, 0x0c, 0x0a, 0x08, 0x4f, 0x50, 0x5f, 0x53, 0x68, 0x61, 0x6b, 0x65, 0x10, 0x03,
|
||||||
|
0x12, 0x0e, 0x0a, 0x0a, 0x4f, 0x50, 0x5f, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x10, 0x04,
|
||||||
|
0x12, 0x0f, 0x0a, 0x0b, 0x4f, 0x50, 0x5f, 0x45, 0x78, 0x63, 0x68, 0x61, 0x6e, 0x67, 0x65, 0x10,
|
||||||
|
0x05, 0x2a, 0x4a, 0x0a, 0x14, 0x4f, 0x70, 0x52, 0x65, 0x73, 0x75, 0x6c, 0x74, 0x50, 0x75, 0x73,
|
||||||
|
0x68, 0x43, 0x6f, 0x69, 0x6e, 0x43, 0x6f, 0x64, 0x65, 0x12, 0x19, 0x0a, 0x15, 0x4f, 0x50, 0x52,
|
||||||
|
0x43, 0x5f, 0x50, 0x75, 0x73, 0x68, 0x43, 0x6f, 0x69, 0x6e, 0x5f, 0x53, 0x75, 0x63, 0x63, 0x65,
|
||||||
|
0x73, 0x73, 0x10, 0x00, 0x12, 0x17, 0x0a, 0x13, 0x4f, 0x50, 0x52, 0x43, 0x5f, 0x50, 0x75, 0x73,
|
||||||
|
0x68, 0x43, 0x6f, 0x69, 0x6e, 0x5f, 0x45, 0x72, 0x72, 0x6f, 0x72, 0x10, 0x01, 0x42, 0x28, 0x5a,
|
||||||
|
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 (
|
var (
|
||||||
|
|
|
||||||
|
|
@ -20,10 +20,12 @@ message CSPushCoinInfo {
|
||||||
message SCPushCoinInfo {
|
message SCPushCoinInfo {
|
||||||
repeated ExchangeInfo ExchangeList = 1; //兑换信息
|
repeated ExchangeInfo ExchangeList = 1; //兑换信息
|
||||||
repeated DrawInfo DrawList = 2; //抽奖信息
|
repeated DrawInfo DrawList = 2; //抽奖信息
|
||||||
int32 ShakeTimes = 3; //可震动次数
|
repeated int64 BetList = 3; //下注金额列表
|
||||||
int64 PowerLine = 4; // 当前能量值
|
int32 ShakeTimes = 4; //可震动次数
|
||||||
int64 PowerLineMax = 5; // 能量值上限
|
int64 BaseCoin = 5; //当前底分(单次投币金额)
|
||||||
int64 RefreshTimes = 6; // 刷新次数
|
int64 PowerLine = 6; // 当前能量值
|
||||||
|
int64 PowerLineMax = 7; // 能量值上限
|
||||||
|
int64 RefreshTimes = 8; // 刷新次数
|
||||||
}
|
}
|
||||||
|
|
||||||
message ItemInfo{
|
message ItemInfo{
|
||||||
|
|
@ -59,8 +61,8 @@ message CSPushCoinPlayerOp {
|
||||||
|
|
||||||
enum OpCodes {
|
enum OpCodes {
|
||||||
OP_Zero = 0;
|
OP_Zero = 0;
|
||||||
OP_Bet = 1; // 下注 OpParam 道具id
|
OP_Bet = 1; // 下注 OpParam 下注金额
|
||||||
OP_Gain = 2; // 得分 OpParam 1有效区 2无效区 OpItem 获得道具
|
OP_Gain = 2; // 得分 OpItem 获得道具
|
||||||
OP_Shake = 3; // 震动 OpParam 消耗次数
|
OP_Shake = 3; // 震动 OpParam 消耗次数
|
||||||
OP_Refresh = 4; // 刷新 OpParam 桌面金额
|
OP_Refresh = 4; // 刷新 OpParam 桌面金额
|
||||||
OP_Exchange = 5; // 兑换 OpParam 兑换id
|
OP_Exchange = 5; // 兑换 OpParam 兑换id
|
||||||
|
|
|
||||||
|
|
@ -1,32 +1,24 @@
|
||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"sort"
|
|
||||||
|
|
||||||
"mongo.games.com/goserver/core/logger"
|
|
||||||
"mongo.games.com/goserver/core/netlib"
|
|
||||||
|
|
||||||
"mongo.games.com/game/common"
|
"mongo.games.com/game/common"
|
||||||
"mongo.games.com/game/gamesrv/base"
|
"mongo.games.com/game/gamesrv/base"
|
||||||
"mongo.games.com/game/model"
|
"mongo.games.com/game/model"
|
||||||
"mongo.games.com/game/protocol/activity"
|
"mongo.games.com/game/protocol/activity"
|
||||||
|
"mongo.games.com/game/protocol/pushcoin"
|
||||||
"mongo.games.com/game/srvdata"
|
"mongo.games.com/game/srvdata"
|
||||||
|
"mongo.games.com/goserver/core/logger"
|
||||||
|
"mongo.games.com/goserver/core/netlib"
|
||||||
|
"sort"
|
||||||
)
|
)
|
||||||
|
|
||||||
const (
|
const (
|
||||||
PowerMax = 700000
|
PowerMax = 700000
|
||||||
PowerInit = 400000
|
PowerInit = 400000
|
||||||
|
ValueInit = 50 * 5000
|
||||||
)
|
)
|
||||||
|
|
||||||
var PushCoinItemValue = map[int32]int64{
|
var BaseCoins = []int64{5000, 10000, 15000}
|
||||||
common.ItemIDBigCoin: 50000,
|
|
||||||
common.ItemIDVCard: 10000,
|
|
||||||
common.ItemIDPlum: 30000,
|
|
||||||
30011: 100000000, // 话费卡
|
|
||||||
common.ItemIDCoin1: 5000,
|
|
||||||
common.ItemIDCoin2: 10000,
|
|
||||||
common.ItemIDCoin3: 15000,
|
|
||||||
}
|
|
||||||
|
|
||||||
func init() {
|
func init() {
|
||||||
// 推币机活动信息
|
// 推币机活动信息
|
||||||
|
|
@ -55,16 +47,19 @@ func CSPushCoinInfo(s *netlib.Session, packetid int, data interface{}, sid int64
|
||||||
if p.WelfData.PushCoin == nil {
|
if p.WelfData.PushCoin == nil {
|
||||||
p.WelfData.PushCoin = &model.PushCoinData{
|
p.WelfData.PushCoin = &model.PushCoinData{
|
||||||
Power: PowerInit,
|
Power: PowerInit,
|
||||||
|
Base: BaseCoins[0],
|
||||||
|
Value: ValueInit,
|
||||||
Exchange: make(map[int32]int32),
|
Exchange: make(map[int32]int32),
|
||||||
Items: make(map[int32]int64),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pack := &activity.SCPushCoinInfo{
|
pack := &activity.SCPushCoinInfo{
|
||||||
ShakeTimes: p.WelfData.PushCoin.Shake,
|
ShakeTimes: p.WelfData.PushCoin.Shake,
|
||||||
|
BaseCoin: p.WelfData.PushCoin.Base,
|
||||||
PowerLine: p.WelfData.PushCoin.Power,
|
PowerLine: p.WelfData.PushCoin.Power,
|
||||||
PowerLineMax: PowerMax,
|
PowerLineMax: PowerMax,
|
||||||
RefreshTimes: p.WelfData.PushCoin.Refresh,
|
RefreshTimes: p.WelfData.PushCoin.Refresh,
|
||||||
|
BetList: BaseCoins,
|
||||||
}
|
}
|
||||||
|
|
||||||
for _, v := range srvdata.PBDB_PropExchangeMgr.Datas.Arr {
|
for _, v := range srvdata.PBDB_PropExchangeMgr.Datas.Arr {
|
||||||
|
|
@ -154,59 +149,25 @@ func CSPushCoinPlayerOp(s *netlib.Session, packetid int, data interface{}, sid i
|
||||||
|
|
||||||
switch msg.GetOpCode() {
|
switch msg.GetOpCode() {
|
||||||
case activity.OpCodes_OP_Bet:
|
case activity.OpCodes_OP_Bet:
|
||||||
if msg.GetOpParam() != common.ItemIDCoin1 && msg.GetOpParam() != common.ItemIDCoin2 && msg.GetOpParam() != common.ItemIDCoin3 {
|
if p.GetCoin() < msg.GetOpParam() {
|
||||||
goto here
|
goto here
|
||||||
}
|
}
|
||||||
|
p.AddCoin(-msg.GetOpParam(), common.GainWayPushCoinCost, base.SyncFlag_ToClient, "system", "推币机下注")
|
||||||
item := srvdata.GameItemMgr.Get(p.Platform, int32(msg.GetOpParam()))
|
// 增加能量条
|
||||||
if item == nil {
|
AddPower(p, msg.GetOpParam())
|
||||||
goto here
|
|
||||||
}
|
|
||||||
|
|
||||||
if p.GetCoin() < item.GetNum() {
|
|
||||||
goto here
|
|
||||||
}
|
|
||||||
p.AddCoin(-item.GetNum(), common.GainWayPushCoinCost, base.SyncFlag_ToClient, "system", "推币机下注")
|
|
||||||
// 增加桌面道具
|
|
||||||
AddValue(p, map[int32]int64{common.ItemIDCoin: item.GetNum()})
|
|
||||||
|
|
||||||
case activity.OpCodes_OP_Gain:
|
case activity.OpCodes_OP_Gain:
|
||||||
|
// todo校验
|
||||||
if msg.GetOpParam() == 1 {
|
|
||||||
// 有效区
|
|
||||||
for _, v := range msg.GetOpItem() {
|
|
||||||
id := v.GetItemId()
|
|
||||||
val := int64(v.GetItemNum())
|
|
||||||
switch v.GetItemId() {
|
|
||||||
case common.ItemIDBigCoin, common.ItemIDCoin1, common.ItemIDCoin2, common.ItemIDCoin3:
|
|
||||||
val *= srvdata.GameItemMgr.Get(p.Platform, id).GetNum()
|
|
||||||
id = common.ItemIDCoin
|
|
||||||
}
|
|
||||||
|
|
||||||
if p.WelfData.PushCoin.Items[id] < val {
|
|
||||||
logger.Logger.Errorf("获得道具太多: %d, %d", p.WelfData.PushCoin.Items[id], val)
|
|
||||||
goto here
|
|
||||||
}
|
|
||||||
|
|
||||||
BagMgrSingleton.AddItems(&model.AddItemParam{
|
|
||||||
Platform: p.Platform,
|
|
||||||
SnId: p.SnId,
|
|
||||||
Change: []*model.Item{{ItemId: id, ItemNum: val}},
|
|
||||||
GainWay: common.GainWayPushCoinGain,
|
|
||||||
Operator: "system",
|
|
||||||
Remark: "推币机掉落获得",
|
|
||||||
})
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
// 无效区
|
|
||||||
|
|
||||||
}
|
|
||||||
|
|
||||||
for _, v := range msg.GetOpItem() {
|
for _, v := range msg.GetOpItem() {
|
||||||
// 增加能量条
|
BagMgrSingleton.AddItems(&model.AddItemParam{
|
||||||
AddPower(p, PushCoinItemValue[v.GetItemId()]*int64(v.GetItemNum()))
|
Platform: p.Platform,
|
||||||
// 减少桌面道具
|
SnId: p.SnId,
|
||||||
AddValue(p, map[int32]int64{v.GetItemId(): -int64(v.GetItemNum())})
|
Change: []*model.Item{{ItemId: v.GetItemId(), ItemNum: int64(v.GetItemNum())}},
|
||||||
|
GainWay: common.GainWayPushCoinGain,
|
||||||
|
Operator: "system",
|
||||||
|
Remark: "推币机掉落获得",
|
||||||
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
case activity.OpCodes_OP_Shake:
|
case activity.OpCodes_OP_Shake:
|
||||||
|
|
@ -217,12 +178,7 @@ func CSPushCoinPlayerOp(s *netlib.Session, packetid int, data interface{}, sid i
|
||||||
|
|
||||||
case activity.OpCodes_OP_Refresh:
|
case activity.OpCodes_OP_Refresh:
|
||||||
p.WelfData.PushCoin.Refresh++
|
p.WelfData.PushCoin.Refresh++
|
||||||
// 1个v卡，50个金币，大梅花1个
|
p.WelfData.PushCoin.Value = ValueInit
|
||||||
p.WelfData.PushCoin.Items = map[int32]int64{
|
|
||||||
common.ItemIDVCard: 1,
|
|
||||||
common.ItemIDCoin: 50 * 5000,
|
|
||||||
common.ItemIDPlum: 1,
|
|
||||||
}
|
|
||||||
|
|
||||||
case activity.OpCodes_OP_Exchange:
|
case activity.OpCodes_OP_Exchange:
|
||||||
d := srvdata.PBDB_PropExchangeMgr.GetData(int32(msg.GetOpParam()))
|
d := srvdata.PBDB_PropExchangeMgr.GetData(int32(msg.GetOpParam()))
|
||||||
|
|
@ -243,7 +199,7 @@ func CSPushCoinPlayerOp(s *netlib.Session, packetid int, data interface{}, sid i
|
||||||
ItemId: int32(k),
|
ItemId: int32(k),
|
||||||
ItemNum: int32(v),
|
ItemNum: int32(v),
|
||||||
})
|
})
|
||||||
if k == common.ItemIDCoin && p.GetCoin() < v {
|
if k == 10001 && p.GetCoin() < v {
|
||||||
goto here
|
goto here
|
||||||
}
|
}
|
||||||
cost = append(cost, &model.Item{
|
cost = append(cost, &model.Item{
|
||||||
|
|
@ -288,7 +244,6 @@ func CSPushCoinPlayerOp(s *netlib.Session, packetid int, data interface{}, sid i
|
||||||
for k, v := range d.GetCustom() {
|
for k, v := range d.GetCustom() {
|
||||||
if k == 1 {
|
if k == 1 {
|
||||||
pack.Exchange.ShakeTimes = int32(v)
|
pack.Exchange.ShakeTimes = int32(v)
|
||||||
p.WelfData.PushCoin.Shake += int32(v)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -304,7 +259,7 @@ func CSPushCoinPlayerOp(s *netlib.Session, packetid int, data interface{}, sid i
|
||||||
pack.OpRetCode = activity.OpResultPushCoinCode_OPRC_PushCoin_Success
|
pack.OpRetCode = activity.OpResultPushCoinCode_OPRC_PushCoin_Success
|
||||||
|
|
||||||
here:
|
here:
|
||||||
p.SendToClient(int(activity.PushCoinPacketID_PACKET_SCPushCoinPlayerOp), pack)
|
p.SendToClient(int(pushcoin.PushCoinPacketID_PACKET_SCPushCoinPlayerOp), pack)
|
||||||
logger.Logger.Trace("SCPushCoinPlayerOp: ", pack)
|
logger.Logger.Trace("SCPushCoinPlayerOp: ", pack)
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
|
@ -385,28 +340,7 @@ func Draw(p *Player) {
|
||||||
if pack.Coin > 0 || pack.ItemId > 0 {
|
if pack.Coin > 0 || pack.ItemId > 0 {
|
||||||
p.SendToClient(int(activity.PushCoinPacketID_PACKET_NotifyDrawInfo), pack)
|
p.SendToClient(int(activity.PushCoinPacketID_PACKET_NotifyDrawInfo), pack)
|
||||||
// 增加能量条
|
// 增加能量条
|
||||||
AddPower(p, 0)
|
AddPower(p, d.GetValue())
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func AddValue(p *Player, item map[int32]int64) {
|
|
||||||
if item == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if p.WelfData != nil && p.WelfData.PushCoin != nil {
|
|
||||||
if p.WelfData.PushCoin.Items == nil {
|
|
||||||
p.WelfData.PushCoin.Items = make(map[int32]int64)
|
|
||||||
}
|
|
||||||
for k, v := range item {
|
|
||||||
if v > 0 {
|
|
||||||
switch k {
|
|
||||||
case common.ItemIDCoin1, common.ItemIDCoin2, common.ItemIDCoin3, common.ItemIDBigCoin:
|
|
||||||
p.WelfData.PushCoin.Items[common.ItemIDCoin] += v * srvdata.GameItemMgr.Get(p.Platform, k).GetNum()
|
|
||||||
default:
|
|
||||||
p.WelfData.PushCoin.Items[k] += v
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue