Compare commits
No commits in common. "28622d6ffcc9b99fe94550bd2a9ccd7c7af44ebc" and "16bcd9a8589e3aa56a1046e2055a8088f79ed933" have entirely different histories.
28622d6ffc
...
16bcd9a858
Binary file not shown.
Binary file not shown.
BIN
data/DB_Task.dat
BIN
data/DB_Task.dat
Binary file not shown.
BIN
data/DB_VIP.dat
BIN
data/DB_VIP.dat
Binary file not shown.
|
|
@ -32,8 +32,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 1000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 1,
|
||||
|
|
@ -72,8 +71,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 2000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 2,
|
||||
|
|
@ -112,8 +110,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 3000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 3,
|
||||
|
|
@ -152,8 +149,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 4000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 4,
|
||||
|
|
@ -192,8 +188,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 5000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 5,
|
||||
|
|
@ -232,8 +227,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 6000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 6,
|
||||
|
|
@ -272,8 +266,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 7000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 7,
|
||||
|
|
@ -312,8 +305,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 8000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 8,
|
||||
|
|
@ -352,8 +344,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 9000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 9,
|
||||
|
|
@ -392,8 +383,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 10000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 10,
|
||||
|
|
@ -432,8 +422,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 11000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 11,
|
||||
|
|
@ -472,8 +461,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 12000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 12,
|
||||
|
|
@ -512,8 +500,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 13000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 13,
|
||||
|
|
@ -552,8 +539,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 14000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 14,
|
||||
|
|
@ -592,8 +578,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 15000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 15,
|
||||
|
|
@ -632,8 +617,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 16000
|
||||
]
|
||||
},
|
||||
{
|
||||
"Id": 16,
|
||||
|
|
@ -672,8 +656,7 @@
|
|||
"Privilege9": [
|
||||
0,
|
||||
0
|
||||
],
|
||||
"PrivilegeShow": 17000
|
||||
]
|
||||
},
|
||||
{
|
||||
"ParamName": [
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -1024,7 +1024,6 @@ message VIPcfg {
|
|||
repeated int32 BagStatus = 17;//每日礼包|每日金币礼包|固定VIP礼包|等级礼包 0可领取 1不可领取
|
||||
int32 MatchFreeTimes = 18;// 比赛免费次数
|
||||
map<int64,int64> Privilege9 = 19; // vip免费礼包，每个vip等级领取一次
|
||||
int32 PrivilegeShow = 20;// Privilege9 原价
|
||||
}
|
||||
|
||||
//VIP信息
|
||||
|
|
|
|||
|
|
@ -10497,7 +10497,6 @@ type DB_VIP struct {
|
|||
ParamName []string `protobuf:"bytes,19,rep,name=ParamName,proto3" json:"ParamName,omitempty"`
|
||||
MatchFreeTimes int32 `protobuf:"varint,20,opt,name=MatchFreeTimes,proto3" json:"MatchFreeTimes,omitempty"`
|
||||
Privilege9 []int32 `protobuf:"varint,21,rep,packed,name=Privilege9,proto3" json:"Privilege9,omitempty"`
|
||||
PrivilegeShow int32 `protobuf:"varint,22,opt,name=PrivilegeShow,proto3" json:"PrivilegeShow,omitempty"`
|
||||
}
|
||||
|
||||
func (x *DB_VIP) Reset() {
|
||||
|
|
@ -10679,13 +10678,6 @@ func (x *DB_VIP) GetPrivilege9() []int32 {
|
|||
return nil
|
||||
}
|
||||
|
||||
func (x *DB_VIP) GetPrivilegeShow() int32 {
|
||||
if x != nil {
|
||||
return x.PrivilegeShow
|
||||
}
|
||||
return 0
|
||||
}
|
||||
|
||||
type DB_VIPArray struct {
|
||||
state protoimpl.MessageState
|
||||
sizeCache protoimpl.SizeCache
|
||||
|
|
@ -12225,7 +12217,7 @@ var file_pbdata_proto_rawDesc = []byte{
|
|||
0x03, 0x44, 0x65, 0x73, 0x22, 0x31, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x54, 0x69, 0x70, 0x73, 0x41,
|
||||
0x72, 0x72, 0x61, 0x79, 0x12, 0x21, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28,
|
||||
0x0b, 0x32, 0x0f, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54, 0x69,
|
||||
0x70, 0x73, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xce, 0x06, 0x0a, 0x06, 0x44, 0x42, 0x5f, 0x56,
|
||||
0x70, 0x73, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xa8, 0x06, 0x0a, 0x06, 0x44, 0x42, 0x5f, 0x56,
|
||||
0x49, 0x50, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,
|
||||
0x49, 0x64, 0x12, 0x12, 0x0a, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09,
|
||||
0x52, 0x04, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x14, 0x0a, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x18,
|
||||
|
|
@ -12268,32 +12260,29 @@ var file_pbdata_proto_rawDesc = []byte{
|
|||
0x6d, 0x65, 0x73, 0x18, 0x14, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0e, 0x4d, 0x61, 0x74, 0x63, 0x68,
|
||||
0x46, 0x72, 0x65, 0x65, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69,
|
||||
0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x39, 0x18, 0x15, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50,
|
||||
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x39, 0x12, 0x24, 0x0a, 0x0d, 0x50, 0x72, 0x69,
|
||||
0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x53, 0x68, 0x6f, 0x77, 0x18, 0x16, 0x20, 0x01, 0x28, 0x05,
|
||||
0x52, 0x0d, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x53, 0x68, 0x6f, 0x77, 0x1a,
|
||||
0x3d, 0x0a, 0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74,
|
||||
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52,
|
||||
0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20,
|
||||
0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38,
|
||||
0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x39, 0x1a, 0x3d, 0x0a, 0x0f, 0x50, 0x72, 0x69,
|
||||
0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
|
||||
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
|
||||
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x2f, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x56,
|
||||
0x49, 0x50, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x20, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01,
|
||||
0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42,
|
||||
0x5f, 0x56, 0x49, 0x50, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0x50, 0x0a, 0x0a, 0x44, 0x42, 0x5f,
|
||||
0x56, 0x49, 0x50, 0x53, 0x68, 0x6f, 0x77, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x6b, 0x69, 0x6e, 0x49,
|
||||
0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x53, 0x6b, 0x69, 0x6e, 0x49, 0x64, 0x12,
|
||||
0x1a, 0x0a, 0x08, 0x56, 0x49, 0x50, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x08, 0x56, 0x49, 0x50, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x37, 0x0a, 0x0f, 0x44,
|
||||
0x42, 0x5f, 0x56, 0x49, 0x50, 0x53, 0x68, 0x6f, 0x77, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x24,
|
||||
0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x65,
|
||||
0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x53, 0x68, 0x6f, 0x77, 0x52,
|
||||
0x03, 0x41, 0x72, 0x72, 0x42, 0x26, 0x5a, 0x24, 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, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72,
|
||||
0x6f, 0x74, 0x6f, 0x33,
|
||||
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x41, 0x77, 0x61, 0x72,
|
||||
0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20,
|
||||
0x01, 0x28, 0x03, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75,
|
||||
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02,
|
||||
0x38, 0x01, 0x22, 0x2f, 0x0a, 0x0b, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x41, 0x72, 0x72, 0x61,
|
||||
0x79, 0x12, 0x20, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e,
|
||||
0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x52, 0x03,
|
||||
0x41, 0x72, 0x72, 0x22, 0x50, 0x0a, 0x0a, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x53, 0x68, 0x6f,
|
||||
0x77, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49,
|
||||
0x64, 0x12, 0x16, 0x0a, 0x06, 0x53, 0x6b, 0x69, 0x6e, 0x49, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
|
||||
0x05, 0x52, 0x06, 0x53, 0x6b, 0x69, 0x6e, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x56, 0x49, 0x50,
|
||||
0x4c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x56, 0x49, 0x50,
|
||||
0x4c, 0x65, 0x76, 0x65, 0x6c, 0x22, 0x37, 0x0a, 0x0f, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x53,
|
||||
0x68, 0x6f, 0x77, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x24, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18,
|
||||
0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x12, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44,
|
||||
0x42, 0x5f, 0x56, 0x49, 0x50, 0x53, 0x68, 0x6f, 0x77, 0x52, 0x03, 0x41, 0x72, 0x72, 0x42, 0x26,
|
||||
0x5a, 0x24, 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,
|
||||
0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
|
||||
}
|
||||
|
||||
var (
|
||||
|
|
|
|||
|
|
@ -1743,8 +1743,6 @@ message DB_VIP {
|
|||
|
||||
repeated int32 Privilege9 = 21;
|
||||
|
||||
int32 PrivilegeShow = 22;
|
||||
|
||||
}
|
||||
|
||||
message DB_VIPArray {
|
||||
|
|
|
|||
|
|
@ -3772,10 +3772,6 @@ func (this *Player) SCVIPInfo() {
|
|||
MatchFreeTimes: cfg.MatchFreeTimes + this.GetSkillAdd(common.SkillIdVipTimes),
|
||||
Privilege9: cfg.Privilege9,
|
||||
}
|
||||
d := srvdata.PBDB_VIPMgr.GetData(cfg.VipId)
|
||||
if d != nil {
|
||||
data.PrivilegeShow = d.GetPrivilegeShow()
|
||||
}
|
||||
data.Privilege1 = make(map[int64]int64)
|
||||
for k, v := range cfg.Privilege1 {
|
||||
if k == common.ItemIDCoin {
|
||||
|
|
@ -3835,7 +3831,6 @@ func (this *Player) VIPDraw(id, vip int32) {
|
|||
OpRetCode: playerproto.OpResultCode_OPRC_Error,
|
||||
}
|
||||
send := func() {
|
||||
pack.Vip = vip
|
||||
this.SendToClient(int(playerproto.PlayerPacketID_PACKET_SC_DRAWVIPGIFT), pack)
|
||||
logger.Logger.Tracef("send vipdraw to client:%v", pack)
|
||||
return
|
||||
|
|
|
|||
BIN
xlsx/DB_VIP.xlsx
BIN
xlsx/DB_VIP.xlsx
Binary file not shown.
Loading…
Reference in New Issue