tl_server_2
/
game_sync
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

任务系统优化

This commit is contained in:
sk 2024-04-26 09:23:47 +08:00
parent 2e0e6c72d0
commit b6aa7bec3c
97 changed files with 931 additions and 477 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
data/DB_GiftCard.dat
View File

@ -1,3 +1,3 @@
6‘š; 7日礼å“<C3A5>å<EFBFBD>¡" ¡<>À–±"ц
*¡<>À„=08
6‘š; 7日礼å“<C3A5>å<EFBFBD>¡"ц
" ¡<>À–±*¡<>À„=08

8
data/DB_PropExchange.dat
View File

@ -1,5 +1,5 @@
6с├т├у├ж├в├"║█ю└=
.ь├ы├з├ш├"║█ю└=
Wт├в├ь├ы├ш├с├у├ж├з├" ║█─╜Б
]в├ь├ы├ш├т├у├ж├з├э├с├"╒█Т
6в├с├т├у├ж├"║█ю└=
.з├ш├ь├ы├"║█ю└=
Wу├ь├з├с├т├ж├в├ы├ш├" ║█─╜Б
]с├ж├в├ь├т├у├ы├з├ш├э├"╒█Т

BIN
data/DB_Task.dat
View File

Binary file not shown.

508
data/DB_Task.json
View File

@ -2,6 +2,7 @@
"Arr": [
{
"Id": 1,
"Order": 1,
"ActivityType": 1,
"TaskType": 1,
"TargetTimes": 1,
@ -17,6 +18,7 @@
},
{
"Id": 2,
"Order": 2,
"ActivityType": 1,
"TaskType": 2,
"TargetTimes": 1,
@ -32,6 +34,7 @@
},
{
"Id": 3,
"Order": 3,
"ActivityType": 1,
"TaskType": 3,
"TargetTimes": 1,
@ -43,6 +46,7 @@
},
{
"Id": 4,
"Order": 4,
"ActivityType": 1,
"TaskType": 4,
"TargetTimes": 1,
@ -55,6 +59,7 @@
},
{
"Id": 5,
"Order": 5,
"ActivityType": 1,
"TaskType": 5,
"TargetTimes": 10,
@ -67,6 +72,7 @@
},
{
"Id": 6,
"Order": 6,
"ActivityType": 1,
"TaskType": 6,
"TargetTimes": 1,
@ -79,6 +85,7 @@
},
{
"Id": 7,
"Order": 1,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 200,
@ -89,6 +96,7 @@
},
{
"Id": 8,
"Order": 2,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 300,
@ -99,6 +107,7 @@
},
{
"Id": 9,
"Order": 3,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 400,
@ -109,6 +118,7 @@
},
{
"Id": 10,
"Order": 4,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 500,
@ -119,6 +129,7 @@
},
{
"Id": 11,
"Order": 5,
"ActivityType": 2,
"TaskType": 14,
"TargetTimes": 600,
@ -129,6 +140,7 @@
},
{
"Id": 12,
"Order": 1,
"ActivityType": 3,
"TaskType": 10,
"TargetTimes": 1,
@ -140,6 +152,7 @@
},
{
"Id": 13,
"Order": 2,
"ActivityType": 3,
"TaskType": 5,
"TargetTimes": 10,
@ -152,6 +165,7 @@
},
{
"Id": 14,
"Order": 3,
"ActivityType": 3,
"TaskType": 11,
"TargetTimes": 10000000,
@ -162,6 +176,7 @@
},
{
"Id": 15,
"Order": 4,
"ActivityType": 3,
"TaskType": 4,
"TargetTimes": 10,
@ -174,6 +189,7 @@
},
{
"Id": 16,
"Order": 5,
"ActivityType": 3,
"TaskType": 16,
"TargetTimes": 3,
@ -185,9 +201,10 @@
},
{
"Id": 17,
"Order": 1,
"ActivityType": 4,
"TaskType": 13,
"TargetTimes": 1000,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
@ -196,9 +213,10 @@
},
{
"Id": 18,
"Order": 2,
"ActivityType": 4,
"TaskType": 13,
"TargetTimes": 10000,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
@ -207,9 +225,10 @@
},
{
"Id": 19,
"Order": 3,
"ActivityType": 4,
"TaskType": 13,
"TargetTimes": 20000,
"TargetTimes": 200000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
@ -218,14 +237,495 @@
},
{
"Id": 20,
"Order": 4,
"ActivityType": 4,
"TaskType": 13,
"TargetTimes": 50000,
"TargetTimes": 1000000,
"FinishTimes": 1,
"Award": {
"100001": 50000000,
"100002": 100
}
},
{
"Id": 10001,
"Order": 1,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 100000000,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"GameType": 1
},
{
"Id": 10002,
"Order": 7,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 1000000000,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"GameType": 1
},
{
"Id": 10003,
"Order": 13,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 10000000000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"GameType": 1
},
{
"Id": 10004,
"Order": 19,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 100000000000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"GameType": 1
},
{
"Id": 10005,
"Order": 25,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 500000000000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"GameType": 1
},
{
"Id": 10006,
"Order": 31,
"ActivityType": 5,
"TaskType": 11,
"TargetTimes": 1000000000000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"GameType": 1
},
{
"Id": 20001,
"Order": 2,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"GameType": 1
},
{
"Id": 20002,
"Order": 8,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"GameType": 1
},
{
"Id": 20003,
"Order": 14,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 5000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"GameType": 1
},
{
"Id": 20004,
"Order": 20,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"GameType": 1
},
{
"Id": 20005,
"Order": 26,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"GameType": 1
},
{
"Id": 20006,
"Order": 32,
"ActivityType": 5,
"TaskType": 5,
"TargetTimes": 100000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"GameType": 1
},
{
"Id": 30001,
"Order": 3,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"GameType": 1
},
{
"Id": 30002,
"Order": 9,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"GameType": 1
},
{
"Id": 30003,
"Order": 15,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 5000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"GameType": 1
},
{
"Id": 30004,
"Order": 21,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"GameType": 1
},
{
"Id": 30005,
"Order": 27,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"GameType": 1
},
{
"Id": 30006,
"Order": 33,
"ActivityType": 5,
"TaskType": 4,
"TargetTimes": 100000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"GameType": 1
},
{
"Id": 40001,
"Order": 4,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"GameType": 1
},
{
"Id": 40002,
"Order": 10,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"GameType": 1
},
{
"Id": 40003,
"Order": 16,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 5000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"GameType": 1
},
{
"Id": 40004,
"Order": 22,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"GameType": 1
},
{
"Id": 40005,
"Order": 28,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"GameType": 1
},
{
"Id": 40006,
"Order": 34,
"ActivityType": 5,
"TaskType": 6,
"TargetTimes": 100000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"GameType": 1
},
{
"Id": 50001,
"Order": 5,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 10,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
},
"Position": [
1,
1
]
},
{
"Id": 50002,
"Order": 11,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
},
"Position": [
1,
1
]
},
{
"Id": 50003,
"Order": 17,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
},
"Position": [
1,
1
]
},
{
"Id": 50004,
"Order": 23,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 10000,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
},
"Position": [
1,
1
]
},
{
"Id": 50005,
"Order": 29,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 50000,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
},
"Position": [
1,
1
]
},
{
"Id": 50006,
"Order": 35,
"ActivityType": 5,
"TaskType": 7,
"TargetTimes": 100000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
},
"Position": [
1,
1
]
},
{
"Id": 60001,
"Order": 6,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 10,
"FinishTimes": 1,
"Award": {
"100001": 1000000,
"100002": 10
}
},
{
"Id": 60002,
"Order": 12,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 20,
"FinishTimes": 1,
"Award": {
"100001": 2000000,
"100002": 20
}
},
{
"Id": 60003,
"Order": 18,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 50,
"FinishTimes": 1,
"Award": {
"100001": 3000000,
"100002": 30
}
},
{
"Id": 60004,
"Order": 24,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 100,
"FinishTimes": 1,
"Award": {
"100001": 5000000,
"100002": 50
}
},
{
"Id": 60005,
"Order": 30,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 500,
"FinishTimes": 1,
"Award": {
"100001": 10000000,
"100002": 100
}
},
{
"Id": 60006,
"Order": 36,
"ActivityType": 5,
"TaskType": 15,
"TargetTimes": 1000,
"FinishTimes": 1,
"Award": {
"100001": 20000000,
"100002": 200
}
}
]
}

231
protocol/server/pbdata.pb.go
View File

@ -9253,13 +9253,14 @@ type DB_Task struct {
unknownFields protoimpl.UnknownFields
Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"`
ActivityType int32 `protobuf:"varint,2,opt,name=ActivityType,proto3" json:"ActivityType,omitempty"`
TaskType int32 `protobuf:"varint,3,opt,name=TaskType,proto3" json:"TaskType,omitempty"`
TargetTimes int64 `protobuf:"varint,4,opt,name=TargetTimes,proto3" json:"TargetTimes,omitempty"`
FinishTimes int64 `protobuf:"varint,5,opt,name=FinishTimes,proto3" json:"FinishTimes,omitempty"`
Award map[int64]int64 `protobuf:"bytes,6,rep,name=Award,proto3" json:"Award,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
GameType int32 `protobuf:"varint,7,opt,name=GameType,proto3" json:"GameType,omitempty"`
Position []int32 `protobuf:"varint,8,rep,packed,name=Position,proto3" json:"Position,omitempty"`
Order int32 `protobuf:"varint,2,opt,name=Order,proto3" json:"Order,omitempty"`
ActivityType int32 `protobuf:"varint,3,opt,name=ActivityType,proto3" json:"ActivityType,omitempty"`
TaskType int32 `protobuf:"varint,4,opt,name=TaskType,proto3" json:"TaskType,omitempty"`
TargetTimes int64 `protobuf:"varint,5,opt,name=TargetTimes,proto3" json:"TargetTimes,omitempty"`
FinishTimes int64 `protobuf:"varint,6,opt,name=FinishTimes,proto3" json:"FinishTimes,omitempty"`
Award map[int64]int64 `protobuf:"bytes,7,rep,name=Award,proto3" json:"Award,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"`
GameType int32 `protobuf:"varint,8,opt,name=GameType,proto3" json:"GameType,omitempty"`
Position []int32 `protobuf:"varint,9,rep,packed,name=Position,proto3" json:"Position,omitempty"`
}
func (x *DB_Task) Reset() {
@ -9301,6 +9302,13 @@ func (x *DB_Task) GetId() int32 {
return 0
}
func (x *DB_Task) GetOrder() int32 {
if x != nil {
return x.Order
}
return 0
}
func (x *DB_Task) GetActivityType() int32 {
if x != nil {
return x.ActivityType
@ -11079,113 +11087,114 @@ var file_pbdata_proto_rawDesc = []byte{
0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x43, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x41, 0x72, 0x72, 0x61,
0x79, 0x12, 0x29, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x17,
0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x53, 0x79, 0x73, 0x74, 0x65,
0x6d, 0x43, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xc1, 0x02, 0x0a,
0x6d, 0x43, 0x68, 0x61, 0x6e, 0x63, 0x65, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0xd7, 0x02, 0x0a,
0x07, 0x44, 0x42, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01,
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x41, 0x63, 0x74, 0x69,
0x76, 0x69, 0x74, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c,
0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08,
0x54, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
0x54, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x54, 0x61, 0x72, 0x67,
0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x04, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x54,
0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x46, 0x69,
0x6e, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x05, 0x20, 0x01, 0x28, 0x03, 0x52,
0x0b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x12, 0x30, 0x0a, 0x05,
0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65,
0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54, 0x61, 0x73, 0x6b, 0x2e, 0x41, 0x77, 0x61,
0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1a,
0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05,
0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6f,
0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x08, 0x50, 0x6f,
0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 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, 0x31, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x54, 0x61, 0x73, 0x6b, 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, 0x61, 0x73, 0x6b, 0x52, 0x03,
0x41, 0x72, 0x72, 0x22, 0x85, 0x02, 0x0a, 0x1b, 0x44, 0x42, 0x5f, 0x54, 0x68, 0x69, 0x72, 0x64,
0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x70,
0x69, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52,
0x02, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x47, 0x61, 0x6d,
0x65, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x53, 0x79, 0x73, 0x74, 0x65,
0x6d, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x12, 0x2c, 0x0a, 0x11, 0x54, 0x68, 0x69, 0x72, 0x64,
0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01,
0x28, 0x09, 0x52, 0x11, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72,
0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x54, 0x68, 0x69, 0x72, 0x64, 0x47, 0x61,
0x6d, 0x65, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09, 0x52, 0x0b, 0x54, 0x68, 0x69, 0x72,
0x64, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x65, 0x73, 0x63, 0x18,
0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x44, 0x65, 0x73, 0x63, 0x12, 0x34, 0x0a, 0x15, 0x53,
0x63, 0x72, 0x65, 0x65, 0x6e, 0x4f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e,
0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x15, 0x53, 0x63, 0x72, 0x65,
0x65, 0x6e, 0x4f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70,
0x65, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x68, 0x69, 0x72, 0x64, 0x49, 0x44, 0x18, 0x07, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x54, 0x68, 0x69, 0x72, 0x64, 0x49, 0x44, 0x22, 0x59, 0x0a, 0x20, 0x44,
0x42, 0x5f, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47,
0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x41, 0x72, 0x72, 0x61, 0x79, 0x12,
0x35, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x23, 0x2e, 0x73,
0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c,
0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e,
0x67, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0x43, 0x0a, 0x07, 0x44, 0x42, 0x5f, 0x54, 0x69, 0x70,
0x73, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49,
0x64, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x18, 0x02, 0x20, 0x03, 0x28,
0x05, 0x52, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x44, 0x65, 0x73,
0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 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, 0xe0,
0x05, 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, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x43, 0x6f,
0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x56, 0x69, 0x70, 0x45, 0x78, 0x70, 0x18, 0x04, 0x20,
0x01, 0x28, 0x05, 0x52, 0x06, 0x56, 0x69, 0x70, 0x45, 0x78, 0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x50,
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x31, 0x18, 0x05, 0x20, 0x03, 0x28, 0x05, 0x52,
0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x31, 0x12, 0x1e, 0x0a, 0x0a, 0x50,
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x32, 0x18, 0x06, 0x20, 0x03, 0x28, 0x05, 0x52,
0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x32, 0x12, 0x18, 0x0a, 0x07, 0x53,
0x68, 0x6f, 0x70, 0x49, 0x64, 0x32, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x68,
0x6f, 0x70, 0x49, 0x64, 0x32, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
0x67, 0x65, 0x33, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69,
0x6c, 0x65, 0x67, 0x65, 0x33, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
0x67, 0x65, 0x34, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69,
0x6c, 0x65, 0x67, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
0x67, 0x65, 0x35, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69,
0x6c, 0x65, 0x67, 0x65, 0x35, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
0x67, 0x65, 0x36, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69,
0x6c, 0x65, 0x67, 0x65, 0x36, 0x12, 0x3e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
0x67, 0x65, 0x37, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x1e, 0x2e, 0x73, 0x65, 0x72, 0x76,
0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x2e, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c,
0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69,
0x6c, 0x65, 0x67, 0x65, 0x37, 0x12, 0x28, 0x0a, 0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65,
0x67, 0x65, 0x37, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0d, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0f,
0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x50, 0x72, 0x69, 0x63, 0x65, 0x12,
0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37, 0x18, 0x0e, 0x20, 0x01, 0x28, 0x05,
0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69,
0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x18, 0x0f, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x50,
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x12, 0x14, 0x0a, 0x05, 0x50, 0x61, 0x72,
0x61, 0x6d, 0x18, 0x10, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x12,
0x28, 0x0a, 0x0f, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65,
0x49, 0x44, 0x18, 0x11, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64,
0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x12, 0x2f, 0x0a, 0x05, 0x41, 0x77, 0x61,
0x72, 0x64, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65,
0x72, 0x2e, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61,
0x72, 0x61, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x13, 0x20, 0x03, 0x28, 0x09, 0x52, 0x09, 0x50,
0x61, 0x72, 0x61, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x1a, 0x3d, 0x0a, 0x0f, 0x50, 0x72, 0x69, 0x76,
0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b,
0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x4f, 0x72, 0x64, 0x65,
0x72, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x4f, 0x72, 0x64, 0x65, 0x72, 0x12, 0x22,
0x0a, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x54, 0x79, 0x70, 0x65, 0x18, 0x03,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x41, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x54, 0x79,
0x70, 0x65, 0x12, 0x1a, 0x0a, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x18, 0x04,
0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x54, 0x61, 0x73, 0x6b, 0x54, 0x79, 0x70, 0x65, 0x12, 0x20,
0x0a, 0x0b, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18, 0x05, 0x20,
0x01, 0x28, 0x03, 0x52, 0x0b, 0x54, 0x61, 0x72, 0x67, 0x65, 0x74, 0x54, 0x69, 0x6d, 0x65, 0x73,
0x12, 0x20, 0x0a, 0x0b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d, 0x65, 0x73, 0x18,
0x06, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0b, 0x46, 0x69, 0x6e, 0x69, 0x73, 0x68, 0x54, 0x69, 0x6d,
0x65, 0x73, 0x12, 0x30, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x07, 0x20, 0x03, 0x28,
0x0b, 0x32, 0x1a, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54, 0x61,
0x73, 0x6b, 0x2e, 0x41, 0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x41,
0x77, 0x61, 0x72, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65,
0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x54, 0x79, 0x70, 0x65,
0x12, 0x1a, 0x0a, 0x08, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x09, 0x20, 0x03,
0x28, 0x05, 0x52, 0x08, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 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, 0x31, 0x0a, 0x0c, 0x44, 0x42, 0x5f, 0x54, 0x61, 0x73,
0x6b, 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, 0x61, 0x73, 0x6b, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0x85, 0x02, 0x0a, 0x1b, 0x44, 0x42,
0x5f, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47, 0x61,
0x6d, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x22, 0x0a, 0x0c, 0x53, 0x79, 0x73,
0x74, 0x65, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0c, 0x53, 0x79, 0x73, 0x74, 0x65, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x12, 0x2c, 0x0a,
0x11, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x4e, 0x61,
0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x11, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50,
0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x20, 0x0a, 0x0b, 0x54,
0x68, 0x69, 0x72, 0x64, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x18, 0x04, 0x20, 0x01, 0x28, 0x09,
0x52, 0x0b, 0x54, 0x68, 0x69, 0x72, 0x64, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x44, 0x12, 0x12, 0x0a,
0x04, 0x44, 0x65, 0x73, 0x63, 0x18, 0x05, 0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x44, 0x65, 0x73,
0x63, 0x12, 0x34, 0x0a, 0x15, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x4f, 0x72, 0x69, 0x65, 0x6e,
0x74, 0x61, 0x74, 0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05,
0x52, 0x15, 0x53, 0x63, 0x72, 0x65, 0x65, 0x6e, 0x4f, 0x72, 0x69, 0x65, 0x6e, 0x74, 0x61, 0x74,
0x69, 0x6f, 0x6e, 0x54, 0x79, 0x70, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x54, 0x68, 0x69, 0x72, 0x64,
0x49, 0x44, 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x54, 0x68, 0x69, 0x72, 0x64, 0x49,
0x44, 0x22, 0x59, 0x0a, 0x20, 0x44, 0x42, 0x5f, 0x54, 0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61,
0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67,
0x41, 0x72, 0x72, 0x61, 0x79, 0x12, 0x35, 0x0a, 0x03, 0x41, 0x72, 0x72, 0x18, 0x01, 0x20, 0x03,
0x28, 0x0b, 0x32, 0x23, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x54,
0x68, 0x69, 0x72, 0x64, 0x50, 0x6c, 0x61, 0x74, 0x66, 0x6f, 0x72, 0x6d, 0x47, 0x61, 0x6d, 0x65,
0x4d, 0x61, 0x70, 0x70, 0x69, 0x6e, 0x67, 0x52, 0x03, 0x41, 0x72, 0x72, 0x22, 0x43, 0x0a, 0x07,
0x44, 0x42, 0x5f, 0x54, 0x69, 0x70, 0x73, 0x12, 0x0e, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20,
0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49,
0x64, 0x18, 0x02, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12,
0x10, 0x0a, 0x03, 0x44, 0x65, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 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, 0xe0, 0x05, 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, 0x03, 0x20, 0x01,
0x28, 0x05, 0x52, 0x05, 0x43, 0x6f, 0x75, 0x6e, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x56, 0x69, 0x70,
0x45, 0x78, 0x70, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x56, 0x69, 0x70, 0x45, 0x78,
0x70, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x31, 0x18,
0x05, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
0x31, 0x12, 0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x32, 0x18,
0x06, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65,
0x32, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x32, 0x18, 0x07, 0x20, 0x01,
0x28, 0x05, 0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x32, 0x12, 0x1e, 0x0a, 0x0a, 0x50,
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x33, 0x18, 0x08, 0x20, 0x03, 0x28, 0x05, 0x52,
0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x33, 0x12, 0x1e, 0x0a, 0x0a, 0x50,
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x34, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x34, 0x12, 0x1e, 0x0a, 0x0a, 0x50,
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x35, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x35, 0x12, 0x1e, 0x0a, 0x0a, 0x50,
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x36, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52,
0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x36, 0x12, 0x3e, 0x0a, 0x0a, 0x50,
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x18, 0x0c, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x1e, 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x2e,
0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x12, 0x28, 0x0a, 0x0f, 0x50,
0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37, 0x50, 0x72, 0x69, 0x63, 0x65, 0x18, 0x0d,
0x20, 0x01, 0x28, 0x05, 0x52, 0x0f, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x37,
0x50, 0x72, 0x69, 0x63, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37,
0x18, 0x0e, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x64, 0x37, 0x12,
0x1e, 0x0a, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x18, 0x0f, 0x20,
0x01, 0x28, 0x05, 0x52, 0x0a, 0x50, 0x72, 0x69, 0x76, 0x69, 0x6c, 0x65, 0x67, 0x65, 0x38, 0x12,
0x14, 0x0a, 0x05, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x18, 0x10, 0x20, 0x03, 0x28, 0x05, 0x52, 0x05,
0x50, 0x61, 0x72, 0x61, 0x6d, 0x12, 0x28, 0x0a, 0x0f, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x4f,
0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x18, 0x11, 0x20, 0x03, 0x28, 0x05, 0x52, 0x0f,
0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x4f, 0x75, 0x74, 0x6c, 0x69, 0x6e, 0x65, 0x49, 0x44, 0x12,
0x2f, 0x0a, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64, 0x18, 0x12, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x19,
0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x44, 0x42, 0x5f, 0x56, 0x49, 0x50, 0x2e, 0x41,
0x77, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x41, 0x77, 0x61, 0x72, 0x64,
0x12, 0x1c, 0x0a, 0x09, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x13, 0x20,
0x03, 0x28, 0x09, 0x52, 0x09, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x4e, 0x61, 0x6d, 0x65, 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, 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, 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, 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,
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, 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 (

16
protocol/server/pbdata.proto
View File

@ -1505,19 +1505,21 @@ message DB_Task {
int32 Id = 1;
int32 ActivityType = 2;
int32 Order = 2;
int32 TaskType = 3;
int32 ActivityType = 3;
int64 TargetTimes = 4;
int32 TaskType = 4;
int64 FinishTimes = 5;
int64 TargetTimes = 5;
map<int64, int64> Award = 6;
int64 FinishTimes = 6;
int32 GameType = 7;
map<int64, int64> Award = 7;
repeated int32 Position = 8;
int32 GameType = 8;
repeated int32 Position = 9;
}

4
protocol/server/server.pb.go
View File

@ -4807,8 +4807,8 @@ type PlayerData struct {
Tax int64 `protobuf:"varint,4,opt,name=Tax,proto3" json:"Tax,omitempty"` // Gain的税收
Coin int64 `protobuf:"varint,5,opt,name=Coin,proto3" json:"Coin,omitempty"` // 当前身上余额
GameCoinTs int64 `protobuf:"varint,6,opt,name=GameCoinTs,proto3" json:"GameCoinTs,omitempty"` // 最后帐变时间戳
WBGain int64 `protobuf:"varint,7,opt,name=WBGain,proto3" json:"WBGain,omitempty"` // 黑白名单输赢统计
WinState int32 `protobuf:"varint,8,opt,name=WinState,proto3" json:"WinState,omitempty"` // 1:赢 2:输 3:和
WBGain int64 `protobuf:"varint,7,opt,name=WBGain,proto3" json:"WBGain,omitempty"` // 黑白名单输赢统计, 发送端可以忽略
WinState int32 `protobuf:"varint,8,opt,name=WinState,proto3" json:"WinState,omitempty"` // 1:赢 2:输 3:和, 用Gain区分不了输赢的游戏必传这个参数，否则可以忽略
}
func (x *PlayerData) Reset() {

10
protocol/task/task.pb.go
View File

@ -227,7 +227,7 @@ type CSTaskList struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
}
func (x *CSTaskList) Reset() {
@ -275,7 +275,7 @@ type SCTaskList struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
List []*TaskData `protobuf:"bytes,2,rep,name=List,proto3" json:"List,omitempty"` // 任务列表
}
@ -332,7 +332,7 @@ type CSTaskReward struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
Id int32 `protobuf:"varint,2,opt,name=Id,proto3" json:"Id,omitempty"` // 任务id
}
@ -453,7 +453,7 @@ type SCTaskChange struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
List []*TaskData `protobuf:"bytes,2,rep,name=List,proto3" json:"List,omitempty"` // 任务列表
}
@ -508,7 +508,7 @@ type CSTaskDebugInc struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
Tp int32 `protobuf:"varint,1,opt,name=Tp,proto3" json:"Tp,omitempty"` // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
Id int32 `protobuf:"varint,2,opt,name=Id,proto3" json:"Id,omitempty"` // 任务id
AddNum int32 `protobuf:"varint,3,opt,name=AddNum,proto3" json:"AddNum,omitempty"` // 直接增加次数
}

10
protocol/task/task.proto
View File

@ -33,18 +33,18 @@ message TaskData{
// 任务列表
// PACKET_CSTaskList
message CSTaskList{
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
}
// PACKET_SCTaskList
message SCTaskList{
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
repeated TaskData List = 2; // 任务列表
}
// 领取任务奖励
// PACKET_CSTaskReward
message CSTaskReward{
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
int32 Id = 2; // 任务id
}
// PACKET_SCTaskReward
@ -57,12 +57,12 @@ message SCTaskReward{
// 任务变更通知
// PACKET_SCTaskChange
message SCTaskChange{
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
repeated TaskData List = 2; // 任务列表
}
message CSTaskDebugInc{
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务
int32 Tp = 1; // 任务类型 1:日常任务 2:周活跃任务 3:新手任务 4:邀请任务 5:成就系统
int32 Id = 2; // 任务id
int32 AddNum = 3; // 直接增加次数
}

23
shell/build.sh
View File

@ -1,23 +0,0 @@
#!/bin/bash
workDir=""
cd $workDir
# 编译
cd ../dbproxy
go build
cd ../mgrsrv
go build
cd ../gatesrv
go build
cd ../worldsrv
go build
cd ../gamesrv
go build
cd ../robot
go build

11
shell/build_copy.sh
View File

@ -1,11 +0,0 @@
#!/bin/bash
targetDir="/home/win88"
targetPrefix="win88"
#cp -f ../dbproxy targetDir/dbproxy/$targetPrefix_dbproxy
#cp -f ../mgrsrv targetDir/mgrsrv/$targetPrefix_mgrsrv
#cp -f ../gatesrv targetDir/gatesrv/$targetPrefix_gatesrv
cp -f ../worldsrv targetDir/worldsrv/$targetPrefix_worldsrv
cp -f ../gamesrv targetDir/gamesrv/$targetPrefix_gamesrv
cp -f ../robot targetDir/robot/$targetPrefix_robot

37
shell/close.sh
View File

@ -1,37 +0,0 @@
#!/bin/bash
workDir="/home/win88"
pkill -9 win88_gatesrv
pkill -9 win88_mgrsrv
pkill -9 win88_robot
pkill -2 win88_gamesrv
echo "================ gamesrv ==================="
echo "check gamesrv srv close state"
ps -ef | grep "win88"
echo "try close gamesrv..."
tail -f workDirgamesrv/all.log | awk '/shutdown/ {if(NR%10==0) {exit}; print}'
echo "Kill gamesrv"
pkill -2 win88_worldsrv
echo "================ worldsrv ==================="
echo "check worldsrv srv close state"
ps -ef | grep "win88"
echo "try close worldsrv..."
tail -f worldsrv/all.log | awk '/shutdown/ {if(NR%20==0) {exit}; print}'
echo "Kill worldsrv"
pkill -2 win88_dbproxy
echo "================ dbproxy ==================="
echo "check dbproxy srv close state"
ps -ef | grep "win88"
echo "try close dbproxy..."
tail -f dbproxy/all.log | awk '/shutdown/ {if(NR%1==0) {exit}; print}'
echo "Kill dbproxy"
pkill -9 win88_gamesrv
pkill -9 win88_worldsrv
pkill -9 win88_dbproxy
echo "check srv close state"
ps -ef | grep "win88"

22
shell/start.sh
View File

@ -1,22 +0,0 @@
#!/bin/bash
workDir="/home/win88"
cd $workDir
cd dbproxy
nohup ./win88_dbproxy >/dev/null &
cd $workDir/mgrsrv
nohup ./win88_mgrsrv >/dev/null &
cd $workDir/gatesrv
nohup ./win88_gatesrv >/dev/null &
cd $workDir/gamesrv
nohup ./win88_gamesrv >/dev/null &
cd $workDir/worldsrv
nohup ./win88_worldsrv >/dev/null &
echo "启动完毕 等待3秒 启动AI."
sleep 3
cd $workDir/robot
nohup ./win88_robot >/dev/null &
echo "check srv states..."
ps -ef | grep win88

14
srvdata/client_ver.go
View File

@ -2,6 +2,10 @@ package srvdata
import "encoding/json"
func init() {
DataMgr.RegisterLoader("DB_ClientVer.dat", ClientVersSingeton)
}
type ClientVer struct {
MinApkVer int32
LatestApkVer int32
@ -19,6 +23,16 @@ type ClientVers struct {
gameVers map[string]map[string]ClientVer
}
func (c *ClientVers) Load(fileFullPath string) error {
updateClientVers()
return nil
}
func (c *ClientVers) Reload(fileFullPath string) error {
updateClientVers()
return nil
}
func updateClientVers() error {
packVers := make(map[string]map[string]ClientVer)
gameVers := make(map[string]map[string]ClientVer)

70
srvdata/config.go
View File

@ -22,39 +22,12 @@ func (fmc *DatFileModifiedCommand) Done(o *basic.Object) error {
logger.Logger.Info("modified file name ======", fn)
// loader
loader := DataMgr.GetLoader(fn)
if loader != nil {
err := loader.Reload(fmc.fileName)
for k, v := range DataMgr.GetLoader(fn) {
err := v.Reload(fmc.fileName)
if err != nil {
logger.Logger.Warn(fn, " loader err:", err)
logger.Logger.Warnf(fn, "%v loader %v err: %v", fn, k, err)
}
}
// loaderAfter
loaderAfter := DataMgrAfter.GetLoader(fn)
if loaderAfter != nil {
for _, v := range loaderAfter {
err := v.Reload(fmc.fileName)
if err != nil {
logger.Logger.Warn(fn, " loaderAfter err:", err)
}
}
}
//todo 实现DataLoader
switch fn {
case "DB_ClientVer.dat":
err := updateClientVers()
if err != nil {
return err
}
case "DB_Createroom.dat":
CreateRoomMgrSington.Init()
case "DB_Game_Drop.dat":
GameDropMgrSington.Init()
case "DB_Game_Role.dat", "DB_Game_Pet.dat":
RolePetMgrSington.Init()
}
return nil
}
@ -167,45 +140,16 @@ func (this *Configuration) Init() error {
// 使用 DataLoader 加载
for _, fileName := range loaderFiles {
// loader
loader := DataMgr.GetLoader(fileName)
if loader != nil {
for k, v := range DataMgr.GetLoader(fileName) {
fullPath := filepath.Join(this.RootPath, fileName)
err := loader.Load(fullPath)
err := v.Load(fullPath)
if err != nil {
logger.Logger.Warnf("%v loader err: %v", fileName, err)
logger.Logger.Warnf("%v loader %v err: %v", fileName, k, err)
} else {
logger.Logger.Infof("%v loader success", fileName)
}
} else {
logger.Logger.Warnf("%v no loader", fileName)
}
// loaderAfter 依赖xlsx数据
loaderAfter := DataMgrAfter.GetLoader(fileName)
if loaderAfter != nil {
fullPath := filepath.Join(this.RootPath, fileName)
for _, v := range loaderAfter {
err := v.Load(fullPath)
if err != nil {
logger.Logger.Warnf("%v loaderAfter err: %v", fileName, err)
} else {
logger.Logger.Infof("%v loaderAfter success", fileName)
}
logger.Logger.Infof("%v loader %v success", fileName, k)
}
}
}
//todo 实现DataLoader
err = updateClientVers()
if err != nil {
return err
}
//DB_Createroom
CreateRoomMgrSington.Init()
GameDropMgrSington.Init()
//role pet
RolePetMgrSington.Init()
return nil
}

14
srvdata/create_room.go
View File

@ -4,6 +4,10 @@ import (
"mongo.games.com/game/protocol/server"
)
func init() {
DataMgr.RegisterLoader("DB_Createroom.dat", CreateRoomMgrSington)
}
var CreateRoomMgrSington = &CreateRoomMgr{
GameIdDatas: make(map[int32][]*server.DB_Createroom),
Datas: make(map[int32][]*server.DB_Createroom),
@ -14,6 +18,16 @@ type CreateRoomMgr struct {
Datas map[int32][]*server.DB_Createroom
}
func (this *CreateRoomMgr) Load(fileFullPath string) error {
CreateRoomMgrSington.Init()
return nil
}
func (this *CreateRoomMgr) Reload(fileFullPath string) error {
CreateRoomMgrSington.Init()
return nil
}
func (this *CreateRoomMgr) Init() {
this.Datas = make(map[int32][]*server.DB_Createroom)
this.GameIdDatas = make(map[int32][]*server.DB_Createroom)

56
srvdata/dataloader.go
View File

@ -5,6 +5,7 @@ import (
"encoding/hex"
"errors"
"os"
"strings"
)
var fileSignMap = make(map[string]string)
@ -120,3 +121,58 @@ func (this *ProtobufDataLoader) Reload(fileFullPath string) error {
return err
}
var DataMgr = &dataMgr{
loaders: make(map[string]DataLoader),
afterLoaders: make(map[string][]DataLoader),
cacheGameFreeId: make(map[int32]CacheGameType),
}
type dataMgr struct {
loaders map[string]DataLoader
afterLoaders map[string][]DataLoader
cacheGameFreeId map[int32]CacheGameType
}
type CacheGameType struct {
Ids []int32
GameType int32
}
// register 注册数据加载器,这个应该只是自动生产的代码中会用到,其它地方用不到
func (this *dataMgr) register(name string, loader DataLoader) {
this.loaders[strings.ToLower(name)] = loader
}
// RegisterLoader 注册数据加载器,如果需要依赖配置表再生成新结构的数据用这个
// loader的方法调用会在配置表加载之后调用
func (this *dataMgr) RegisterLoader(name string, loader DataLoader) {
this.afterLoaders[strings.ToLower(name)] = append(this.afterLoaders[strings.ToLower(name)], loader)
}
func (this *dataMgr) GetLoader(name string) []DataLoader {
var ret []DataLoader
if loader, exist := this.loaders[strings.ToLower(name)]; exist {
ret = append(ret, loader)
}
if loader, exist := this.afterLoaders[strings.ToLower(name)]; exist {
ret = append(ret, loader...)
}
return ret
}
func (this *dataMgr) GetGameFreeIds(gameId, gameMode int32) (ids []int32, gameType int32) {
key := gameId<<16 | gameMode
if data, exist := this.cacheGameFreeId[key]; exist {
return data.Ids, data.GameType
} else {
for _, dbGameFree := range PBDB_GameFreeMgr.Datas.Arr {
if dbGameFree.GetGameId() == gameId && dbGameFree.GetGameMode() == gameMode {
ids = append(ids, dbGameFree.GetId())
gameType = dbGameFree.GetGameType()
}
}
this.cacheGameFreeId[key] = CacheGameType{Ids: ids, GameType: gameType}
}
return
}

66
srvdata/datamgr.go
View File

@ -1,66 +0,0 @@
package srvdata
import (
"strings"
)
var DataMgr = &dataMgr{
loaders: make(map[string]DataLoader),
cacheGameFreeId: make(map[int32]CacheGameType),
}
type dataMgr struct {
loaders map[string]DataLoader
cacheGameFreeId map[int32]CacheGameType
}
type CacheGameType struct {
Ids []int32
GameType int32
}
func (this *dataMgr) RegisteLoader(name string, loader DataLoader) {
this.loaders[strings.ToLower(name)] = loader
}
func (this *dataMgr) GetLoader(name string) DataLoader {
if loader, exist := this.loaders[strings.ToLower(name)]; exist {
return loader
}
return nil
}
func (this *dataMgr) GetGameFreeIds(gameId, gameMode int32) (ids []int32, gameType int32) {
key := gameId<<16 | gameMode
if data, exist := this.cacheGameFreeId[key]; exist {
return data.Ids, data.GameType
} else {
for _, dbGameFree := range PBDB_GameFreeMgr.Datas.Arr {
if dbGameFree.GetGameId() == gameId && dbGameFree.GetGameMode() == gameMode {
ids = append(ids, dbGameFree.GetId())
gameType = dbGameFree.GetGameType()
}
}
this.cacheGameFreeId[key] = CacheGameType{Ids: ids, GameType: gameType}
}
return
}
// DataMgrAfter 配置文件监听器，这个加载数据会在DataMgr之后
var DataMgrAfter = &dataMgrAfter{
loaders: make(map[string][]DataLoader),
}
type dataMgrAfter struct {
loaders map[string][]DataLoader
}
func (this *dataMgrAfter) RegisterLoader(name string, loader DataLoader) {
this.loaders[strings.ToLower(name)] = append(this.loaders[strings.ToLower(name)], loader)
}
func (this *dataMgrAfter) GetLoader(name string) []DataLoader {
if loader, exist := this.loaders[strings.ToLower(name)]; exist {
return loader
}
return nil
}

2
srvdata/db_activity1.go
View File

@ -65,5 +65,5 @@ func (this *DB_Activity1Mgr) GetData(id int32) *server.DB_Activity1 {
}
func init() {
DataMgr.RegisteLoader("DB_Activity1.dat", &ProtobufDataLoader{dh: PBDB_Activity1Mgr})
DataMgr.register("DB_Activity1.dat", &ProtobufDataLoader{dh: PBDB_Activity1Mgr})
}

2
srvdata/db_actsign.go
View File

@ -65,5 +65,5 @@ func (this *DB_ActSignMgr) GetData(id int32) *server.DB_ActSign {
}
func init() {
DataMgr.RegisteLoader("DB_ActSign.dat", &ProtobufDataLoader{dh: PBDB_ActSignMgr})
DataMgr.register("DB_ActSign.dat", &ProtobufDataLoader{dh: PBDB_ActSignMgr})
}

2
srvdata/db_animalcolor.go
View File

@ -65,5 +65,5 @@ func (this *DB_AnimalColorMgr) GetData(id int32) *server.DB_AnimalColor {
}
func init() {
DataMgr.RegisteLoader("DB_AnimalColor.dat", &ProtobufDataLoader{dh: PBDB_AnimalColorMgr})
DataMgr.register("DB_AnimalColor.dat", &ProtobufDataLoader{dh: PBDB_AnimalColorMgr})
}

2
srvdata/db_artilleryrate.go
View File

@ -65,5 +65,5 @@ func (this *DB_ArtilleryRateMgr) GetData(id int32) *server.DB_ArtilleryRate {
}
func init() {
DataMgr.RegisteLoader("DB_ArtilleryRate.dat", &ProtobufDataLoader{dh: PBDB_ArtilleryRateMgr})
DataMgr.register("DB_ArtilleryRate.dat", &ProtobufDataLoader{dh: PBDB_ArtilleryRateMgr})
}

2
srvdata/db_artilleryskin.go
View File

@ -65,5 +65,5 @@ func (this *DB_ArtillerySkinMgr) GetData(id int32) *server.DB_ArtillerySkin {
}
func init() {
DataMgr.RegisteLoader("DB_ArtillerySkin.dat", &ProtobufDataLoader{dh: PBDB_ArtillerySkinMgr})
DataMgr.register("DB_ArtillerySkin.dat", &ProtobufDataLoader{dh: PBDB_ArtillerySkinMgr})
}

2
srvdata/db_blackwhite.go
View File

@ -65,5 +65,5 @@ func (this *DB_BlackWhiteMgr) GetData(id int32) *server.DB_BlackWhite {
}
func init() {
DataMgr.RegisteLoader("DB_BlackWhite.dat", &ProtobufDataLoader{dh: PBDB_BlackWhiteMgr})
DataMgr.register("DB_BlackWhite.dat", &ProtobufDataLoader{dh: PBDB_BlackWhiteMgr})
}

2
srvdata/db_cardsjd.go
View File

@ -65,5 +65,5 @@ func (this *DB_CardsJDMgr) GetData(id int32) *server.DB_CardsJD {
}
func init() {
DataMgr.RegisteLoader("DB_CardsJD.dat", &ProtobufDataLoader{dh: PBDB_CardsJDMgr})
DataMgr.register("DB_CardsJD.dat", &ProtobufDataLoader{dh: PBDB_CardsJDMgr})
}

2
srvdata/db_cardsyule.go
View File

@ -65,5 +65,5 @@ func (this *DB_CardsYuLeMgr) GetData(id int32) *server.DB_CardsYuLe {
}
func init() {
DataMgr.RegisteLoader("DB_CardsYuLe.dat", &ProtobufDataLoader{dh: PBDB_CardsYuLeMgr})
DataMgr.register("DB_CardsYuLe.dat", &ProtobufDataLoader{dh: PBDB_CardsYuLeMgr})
}

2
srvdata/db_chessbilledrules.go
View File

@ -65,5 +65,5 @@ func (this *DB_ChessBilledRulesMgr) GetData(id int32) *server.DB_ChessBilledRule
}
func init() {
DataMgr.RegisteLoader("DB_ChessBilledRules.dat", &ProtobufDataLoader{dh: PBDB_ChessBilledRulesMgr})
DataMgr.register("DB_ChessBilledRules.dat", &ProtobufDataLoader{dh: PBDB_ChessBilledRulesMgr})
}

2
srvdata/db_chessmatchrules.go
View File

@ -65,5 +65,5 @@ func (this *DB_ChessMatchRulesMgr) GetData(id int32) *server.DB_ChessMatchRules
}
func init() {
DataMgr.RegisteLoader("DB_ChessMatchRules.dat", &ProtobufDataLoader{dh: PBDB_ChessMatchRulesMgr})
DataMgr.register("DB_ChessMatchRules.dat", &ProtobufDataLoader{dh: PBDB_ChessMatchRulesMgr})
}

2
srvdata/db_chessrank.go
View File

@ -65,5 +65,5 @@ func (this *DB_ChessRankMgr) GetData(id int32) *server.DB_ChessRank {
}
func init() {
DataMgr.RegisteLoader("DB_ChessRank.dat", &ProtobufDataLoader{dh: PBDB_ChessRankMgr})
DataMgr.register("DB_ChessRank.dat", &ProtobufDataLoader{dh: PBDB_ChessRankMgr})
}

2
srvdata/db_clientver.go
View File

@ -65,5 +65,5 @@ func (this *DB_ClientVerMgr) GetData(id int32) *server.DB_ClientVer {
}
func init() {
DataMgr.RegisteLoader("DB_ClientVer.dat", &ProtobufDataLoader{dh: PBDB_ClientVerMgr})
DataMgr.register("DB_ClientVer.dat", &ProtobufDataLoader{dh: PBDB_ClientVerMgr})
}

2
srvdata/db_collectbox.go
View File

@ -65,5 +65,5 @@ func (this *DB_CollectBoxMgr) GetData(id int32) *server.DB_CollectBox {
}
func init() {
DataMgr.RegisteLoader("DB_CollectBox.dat", &ProtobufDataLoader{dh: PBDB_CollectBoxMgr})
DataMgr.register("DB_CollectBox.dat", &ProtobufDataLoader{dh: PBDB_CollectBoxMgr})
}

2
srvdata/db_collectboxgain.go
View File

@ -65,5 +65,5 @@ func (this *DB_CollectBoxGainMgr) GetData(id int32) *server.DB_CollectBoxGain {
}
func init() {
DataMgr.RegisteLoader("DB_CollectBoxGain.dat", &ProtobufDataLoader{dh: PBDB_CollectBoxGainMgr})
DataMgr.register("DB_CollectBoxGain.dat", &ProtobufDataLoader{dh: PBDB_CollectBoxGainMgr})
}

2
srvdata/db_crashsearch.go
View File

@ -65,5 +65,5 @@ func (this *DB_CrashSearchMgr) GetData(id int32) *server.DB_CrashSearch {
}
func init() {
DataMgr.RegisteLoader("DB_CrashSearch.dat", &ProtobufDataLoader{dh: PBDB_CrashSearchMgr})
DataMgr.register("DB_CrashSearch.dat", &ProtobufDataLoader{dh: PBDB_CrashSearchMgr})
}

2
srvdata/db_createroom.go
View File

@ -65,5 +65,5 @@ func (this *DB_CreateroomMgr) GetData(id int32) *server.DB_Createroom {
}
func init() {
DataMgr.RegisteLoader("DB_Createroom.dat", &ProtobufDataLoader{dh: PBDB_CreateroomMgr})
DataMgr.register("DB_Createroom.dat", &ProtobufDataLoader{dh: PBDB_CreateroomMgr})
}

2
srvdata/db_fish.go
View File

@ -65,5 +65,5 @@ func (this *DB_FishMgr) GetData(id int32) *server.DB_Fish {
}
func init() {
DataMgr.RegisteLoader("DB_Fish.dat", &ProtobufDataLoader{dh: PBDB_FishMgr})
DataMgr.register("DB_Fish.dat", &ProtobufDataLoader{dh: PBDB_FishMgr})
}

2
srvdata/db_fishout.go
View File

@ -65,5 +65,5 @@ func (this *DB_FishOutMgr) GetData(id int32) *server.DB_FishOut {
}
func init() {
DataMgr.RegisteLoader("DB_FishOut.dat", &ProtobufDataLoader{dh: PBDB_FishOutMgr})
DataMgr.register("DB_FishOut.dat", &ProtobufDataLoader{dh: PBDB_FishOutMgr})
}

2
srvdata/db_fishpath.go
View File

@ -65,5 +65,5 @@ func (this *DB_FishPathMgr) GetData(id int32) *server.DB_FishPath {
}
func init() {
DataMgr.RegisteLoader("DB_FishPath.dat", &ProtobufDataLoader{dh: PBDB_FishPathMgr})
DataMgr.register("DB_FishPath.dat", &ProtobufDataLoader{dh: PBDB_FishPathMgr})
}

2
srvdata/db_fishroom.go
View File

@ -65,5 +65,5 @@ func (this *DB_FishRoomMgr) GetData(id int32) *server.DB_FishRoom {
}
func init() {
DataMgr.RegisteLoader("DB_FishRoom.dat", &ProtobufDataLoader{dh: PBDB_FishRoomMgr})
DataMgr.register("DB_FishRoom.dat", &ProtobufDataLoader{dh: PBDB_FishRoomMgr})
}

2
srvdata/db_fishskill.go
View File

@ -65,5 +65,5 @@ func (this *DB_FishSkillMgr) GetData(id int32) *server.DB_FishSkill {
}
func init() {
DataMgr.RegisteLoader("DB_FishSkill.dat", &ProtobufDataLoader{dh: PBDB_FishSkillMgr})
DataMgr.register("DB_FishSkill.dat", &ProtobufDataLoader{dh: PBDB_FishSkillMgr})
}

2
srvdata/db_fortunegod_odds.go
View File

@ -65,5 +65,5 @@ func (this *DB_FortuneGod_OddsMgr) GetData(id int32) *server.DB_FortuneGod_Odds
}
func init() {
DataMgr.RegisteLoader("DB_FortuneGod_Odds.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_OddsMgr})
DataMgr.register("DB_FortuneGod_Odds.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_OddsMgr})
}

2
srvdata/db_fortunegod_turnrate.go
View File

@ -65,5 +65,5 @@ func (this *DB_FortuneGod_TurnRateMgr) GetData(id int32) *server.DB_FortuneGod_T
}
func init() {
DataMgr.RegisteLoader("DB_FortuneGod_TurnRate.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_TurnRateMgr})
DataMgr.register("DB_FortuneGod_TurnRate.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_TurnRateMgr})
}

2
srvdata/db_fortunegod_weight.go
View File

@ -65,5 +65,5 @@ func (this *DB_FortuneGod_WeightMgr) GetData(id int32) *server.DB_FortuneGod_Wei
}
func init() {
DataMgr.RegisteLoader("DB_FortuneGod_Weight.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_WeightMgr})
DataMgr.register("DB_FortuneGod_Weight.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_WeightMgr})
}

2
srvdata/db_fortunegod_weightcondition.go
View File

@ -65,5 +65,5 @@ func (this *DB_FortuneGod_WeightConditionMgr) GetData(id int32) *server.DB_Fortu
}
func init() {
DataMgr.RegisteLoader("DB_FortuneGod_WeightCondition.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_WeightConditionMgr})
DataMgr.register("DB_FortuneGod_WeightCondition.dat", &ProtobufDataLoader{dh: PBDB_FortuneGod_WeightConditionMgr})
}

2
srvdata/db_game_drop.go
View File

@ -65,5 +65,5 @@ func (this *DB_Game_DropMgr) GetData(id int32) *server.DB_Game_Drop {
}
func init() {
DataMgr.RegisteLoader("DB_Game_Drop.dat", &ProtobufDataLoader{dh: PBDB_Game_DropMgr})
DataMgr.register("DB_Game_Drop.dat", &ProtobufDataLoader{dh: PBDB_Game_DropMgr})
}

2
srvdata/db_game_introduction.go
View File

@ -65,5 +65,5 @@ func (this *DB_Game_IntroductionMgr) GetData(id int32) *server.DB_Game_Introduct
}
func init() {
DataMgr.RegisteLoader("DB_Game_Introduction.dat", &ProtobufDataLoader{dh: PBDB_Game_IntroductionMgr})
DataMgr.register("DB_Game_Introduction.dat", &ProtobufDataLoader{dh: PBDB_Game_IntroductionMgr})
}

2
srvdata/db_game_pet.go
View File

@ -65,5 +65,5 @@ func (this *DB_Game_PetMgr) GetData(id int32) *server.DB_Game_Pet {
}
func init() {
DataMgr.RegisteLoader("DB_Game_Pet.dat", &ProtobufDataLoader{dh: PBDB_Game_PetMgr})
DataMgr.register("DB_Game_Pet.dat", &ProtobufDataLoader{dh: PBDB_Game_PetMgr})
}

2
srvdata/db_game_role.go
View File

@ -65,5 +65,5 @@ func (this *DB_Game_RoleMgr) GetData(id int32) *server.DB_Game_Role {
}
func init() {
DataMgr.RegisteLoader("DB_Game_Role.dat", &ProtobufDataLoader{dh: PBDB_Game_RoleMgr})
DataMgr.register("DB_Game_Role.dat", &ProtobufDataLoader{dh: PBDB_Game_RoleMgr})
}

2
srvdata/db_gamecoinpool.go
View File

@ -65,5 +65,5 @@ func (this *DB_GameCoinPoolMgr) GetData(id int32) *server.DB_GameCoinPool {
}
func init() {
DataMgr.RegisteLoader("DB_GameCoinPool.dat", &ProtobufDataLoader{dh: PBDB_GameCoinPoolMgr})
DataMgr.register("DB_GameCoinPool.dat", &ProtobufDataLoader{dh: PBDB_GameCoinPoolMgr})
}

2
srvdata/db_gamefree.go
View File

@ -65,5 +65,5 @@ func (this *DB_GameFreeMgr) GetData(id int32) *server.DB_GameFree {
}
func init() {
DataMgr.RegisteLoader("DB_GameFree.dat", &ProtobufDataLoader{dh: PBDB_GameFreeMgr})
DataMgr.register("DB_GameFree.dat", &ProtobufDataLoader{dh: PBDB_GameFreeMgr})
}

2
srvdata/db_gameitem.go
View File

@ -65,5 +65,5 @@ func (this *DB_GameItemMgr) GetData(id int32) *server.DB_GameItem {
}
func init() {
DataMgr.RegisteLoader("DB_GameItem.dat", &ProtobufDataLoader{dh: PBDB_GameItemMgr})
DataMgr.register("DB_GameItem.dat", &ProtobufDataLoader{dh: PBDB_GameItemMgr})
}

2
srvdata/db_gamematchlevel.go
View File

@ -65,5 +65,5 @@ func (this *DB_GameMatchLevelMgr) GetData(id int32) *server.DB_GameMatchLevel {
}
func init() {
DataMgr.RegisteLoader("DB_GameMatchLevel.dat", &ProtobufDataLoader{dh: PBDB_GameMatchLevelMgr})
DataMgr.register("DB_GameMatchLevel.dat", &ProtobufDataLoader{dh: PBDB_GameMatchLevelMgr})
}

2
srvdata/db_gamerule.go
View File

@ -65,5 +65,5 @@ func (this *DB_GameRuleMgr) GetData(id int32) *server.DB_GameRule {
}
func init() {
DataMgr.RegisteLoader("DB_GameRule.dat", &ProtobufDataLoader{dh: PBDB_GameRuleMgr})
DataMgr.register("DB_GameRule.dat", &ProtobufDataLoader{dh: PBDB_GameRuleMgr})
}

2
srvdata/db_gamesubsidy.go
View File

@ -65,5 +65,5 @@ func (this *DB_GameSubsidyMgr) GetData(id int32) *server.DB_GameSubsidy {
}
func init() {
DataMgr.RegisteLoader("DB_GameSubsidy.dat", &ProtobufDataLoader{dh: PBDB_GameSubsidyMgr})
DataMgr.register("DB_GameSubsidy.dat", &ProtobufDataLoader{dh: PBDB_GameSubsidyMgr})
}

2
srvdata/db_gammatchlv.go
View File

@ -65,5 +65,5 @@ func (this *DB_GamMatchLVMgr) GetData(id int32) *server.DB_GamMatchLV {
}
func init() {
DataMgr.RegisteLoader("DB_GamMatchLV.dat", &ProtobufDataLoader{dh: PBDB_GamMatchLVMgr})
DataMgr.register("DB_GamMatchLV.dat", &ProtobufDataLoader{dh: PBDB_GamMatchLVMgr})
}

2
srvdata/db_giftbox.go
View File

@ -65,5 +65,5 @@ func (this *DB_GiftBoxMgr) GetData(id int32) *server.DB_GiftBox {
}
func init() {
DataMgr.RegisteLoader("DB_GiftBox.dat", &ProtobufDataLoader{dh: PBDB_GiftBoxMgr})
DataMgr.register("DB_GiftBox.dat", &ProtobufDataLoader{dh: PBDB_GiftBoxMgr})
}

2
srvdata/db_giftcard.go
View File

@ -65,5 +65,5 @@ func (this *DB_GiftCardMgr) GetData(id int32) *server.DB_GiftCard {
}
func init() {
DataMgr.RegisteLoader("DB_GiftCard.dat", &ProtobufDataLoader{dh: PBDB_GiftCardMgr})
DataMgr.register("DB_GiftCard.dat", &ProtobufDataLoader{dh: PBDB_GiftCardMgr})
}

2
srvdata/db_iceageelementrate.go
View File

@ -65,5 +65,5 @@ func (this *DB_IceAgeElementRateMgr) GetData(id int32) *server.DB_IceAgeElementR
}
func init() {
DataMgr.RegisteLoader("DB_IceAgeElementRate.dat", &ProtobufDataLoader{dh: PBDB_IceAgeElementRateMgr})
DataMgr.register("DB_IceAgeElementRate.dat", &ProtobufDataLoader{dh: PBDB_IceAgeElementRateMgr})
}

2
srvdata/db_legend_odds.go
View File

@ -65,5 +65,5 @@ func (this *DB_Legend_OddsMgr) GetData(id int32) *server.DB_Legend_Odds {
}
func init() {
DataMgr.RegisteLoader("DB_Legend_Odds.dat", &ProtobufDataLoader{dh: PBDB_Legend_OddsMgr})
DataMgr.register("DB_Legend_Odds.dat", &ProtobufDataLoader{dh: PBDB_Legend_OddsMgr})
}

2
srvdata/db_legend_turnrate.go
View File

@ -65,5 +65,5 @@ func (this *DB_Legend_TurnRateMgr) GetData(id int32) *server.DB_Legend_TurnRate
}
func init() {
DataMgr.RegisteLoader("DB_Legend_TurnRate.dat", &ProtobufDataLoader{dh: PBDB_Legend_TurnRateMgr})
DataMgr.register("DB_Legend_TurnRate.dat", &ProtobufDataLoader{dh: PBDB_Legend_TurnRateMgr})
}

2
srvdata/db_legend_weight.go
View File

@ -65,5 +65,5 @@ func (this *DB_Legend_WeightMgr) GetData(id int32) *server.DB_Legend_Weight {
}
func init() {
DataMgr.RegisteLoader("DB_Legend_Weight.dat", &ProtobufDataLoader{dh: PBDB_Legend_WeightMgr})
DataMgr.register("DB_Legend_Weight.dat", &ProtobufDataLoader{dh: PBDB_Legend_WeightMgr})
}

2
srvdata/db_legend_weightcondition.go
View File

@ -65,5 +65,5 @@ func (this *DB_Legend_WeightConditionMgr) GetData(id int32) *server.DB_Legend_We
}
func init() {
DataMgr.RegisteLoader("DB_Legend_WeightCondition.dat", &ProtobufDataLoader{dh: PBDB_Legend_WeightConditionMgr})
DataMgr.register("DB_Legend_WeightCondition.dat", &ProtobufDataLoader{dh: PBDB_Legend_WeightConditionMgr})
}

2
srvdata/db_matchrank.go
View File

@ -65,5 +65,5 @@ func (this *DB_MatchRankMgr) GetData(id int32) *server.DB_MatchRank {
}
func init() {
DataMgr.RegisteLoader("DB_MatchRank.dat", &ProtobufDataLoader{dh: PBDB_MatchRankMgr})
DataMgr.register("DB_MatchRank.dat", &ProtobufDataLoader{dh: PBDB_MatchRankMgr})
}

2
srvdata/db_name.go
View File

@ -65,5 +65,5 @@ func (this *DB_NameMgr) GetData(id int32) *server.DB_Name {
}
func init() {
DataMgr.RegisteLoader("DB_Name.dat", &ProtobufDataLoader{dh: PBDB_NameMgr})
DataMgr.register("DB_Name.dat", &ProtobufDataLoader{dh: PBDB_NameMgr})
}

2
srvdata/db_nameboy.go
View File

@ -65,5 +65,5 @@ func (this *DB_NameBoyMgr) GetData(id int32) *server.DB_NameBoy {
}
func init() {
DataMgr.RegisteLoader("DB_NameBoy.dat", &ProtobufDataLoader{dh: PBDB_NameBoyMgr})
DataMgr.register("DB_NameBoy.dat", &ProtobufDataLoader{dh: PBDB_NameBoyMgr})
}

2
srvdata/db_namegirl.go
View File

@ -65,5 +65,5 @@ func (this *DB_NameGirlMgr) GetData(id int32) *server.DB_NameGirl {
}
func init() {
DataMgr.RegisteLoader("DB_NameGirl.dat", &ProtobufDataLoader{dh: PBDB_NameGirlMgr})
DataMgr.register("DB_NameGirl.dat", &ProtobufDataLoader{dh: PBDB_NameGirlMgr})
}

2
srvdata/db_newplayer.go
View File

@ -65,5 +65,5 @@ func (this *DB_NewPlayerMgr) GetData(id int32) *server.DB_NewPlayer {
}
func init() {
DataMgr.RegisteLoader("DB_NewPlayer.dat", &ProtobufDataLoader{dh: PBDB_NewPlayerMgr})
DataMgr.register("DB_NewPlayer.dat", &ProtobufDataLoader{dh: PBDB_NewPlayerMgr})
}

2
srvdata/db_phonelottery.go
View File

@ -65,5 +65,5 @@ func (this *DB_PhoneLotteryMgr) GetData(id int32) *server.DB_PhoneLottery {
}
func init() {
DataMgr.RegisteLoader("DB_PhoneLottery.dat", &ProtobufDataLoader{dh: PBDB_PhoneLotteryMgr})
DataMgr.register("DB_PhoneLottery.dat", &ProtobufDataLoader{dh: PBDB_PhoneLotteryMgr})
}

2
srvdata/db_playerexp.go
View File

@ -65,5 +65,5 @@ func (this *DB_PlayerExpMgr) GetData(id int32) *server.DB_PlayerExp {
}
func init() {
DataMgr.RegisteLoader("DB_PlayerExp.dat", &ProtobufDataLoader{dh: PBDB_PlayerExpMgr})
DataMgr.register("DB_PlayerExp.dat", &ProtobufDataLoader{dh: PBDB_PlayerExpMgr})
}

2
srvdata/db_playerinfo.go
View File

@ -65,5 +65,5 @@ func (this *DB_PlayerInfoMgr) GetData(id int32) *server.DB_PlayerInfo {
}
func init() {
DataMgr.RegisteLoader("DB_PlayerInfo.dat", &ProtobufDataLoader{dh: PBDB_PlayerInfoMgr})
DataMgr.register("DB_PlayerInfo.dat", &ProtobufDataLoader{dh: PBDB_PlayerInfoMgr})
}

2
srvdata/db_playertype.go
View File

@ -65,5 +65,5 @@ func (this *DB_PlayerTypeMgr) GetData(id int32) *server.DB_PlayerType {
}
func init() {
DataMgr.RegisteLoader("DB_PlayerType.dat", &ProtobufDataLoader{dh: PBDB_PlayerTypeMgr})
DataMgr.register("DB_PlayerType.dat", &ProtobufDataLoader{dh: PBDB_PlayerTypeMgr})
}

2
srvdata/db_potodd.go
View File

@ -65,5 +65,5 @@ func (this *DB_PotOddMgr) GetData(id int32) *server.DB_PotOdd {
}
func init() {
DataMgr.RegisteLoader("DB_PotOdd.dat", &ProtobufDataLoader{dh: PBDB_PotOddMgr})
DataMgr.register("DB_PotOdd.dat", &ProtobufDataLoader{dh: PBDB_PotOddMgr})
}

2
srvdata/db_propexchange.go
View File

@ -65,5 +65,5 @@ func (this *DB_PropExchangeMgr) GetData(id int32) *server.DB_PropExchange {
}
func init() {
DataMgr.RegisteLoader("DB_PropExchange.dat", &ProtobufDataLoader{dh: PBDB_PropExchangeMgr})
DataMgr.register("DB_PropExchange.dat", &ProtobufDataLoader{dh: PBDB_PropExchangeMgr})
}

2
srvdata/db_rankcycle.go
View File

@ -65,5 +65,5 @@ func (this *DB_RankCycleMgr) GetData(id int32) *server.DB_RankCycle {
}
func init() {
DataMgr.RegisteLoader("DB_RankCycle.dat", &ProtobufDataLoader{dh: PBDB_RankCycleMgr})
DataMgr.register("DB_RankCycle.dat", &ProtobufDataLoader{dh: PBDB_RankCycleMgr})
}

2
srvdata/db_ranklevel.go
View File

@ -65,5 +65,5 @@ func (this *DB_RankLevelMgr) GetData(id int32) *server.DB_RankLevel {
}
func init() {
DataMgr.RegisteLoader("DB_RankLevel.dat", &ProtobufDataLoader{dh: PBDB_RankLevelMgr})
DataMgr.register("DB_RankLevel.dat", &ProtobufDataLoader{dh: PBDB_RankLevelMgr})
}

2
srvdata/db_rankreward.go
View File

@ -65,5 +65,5 @@ func (this *DB_RankRewardMgr) GetData(id int32) *server.DB_RankReward {
}
func init() {
DataMgr.RegisteLoader("DB_RankReward.dat", &ProtobufDataLoader{dh: PBDB_RankRewardMgr})
DataMgr.register("DB_RankReward.dat", &ProtobufDataLoader{dh: PBDB_RankRewardMgr})
}

2
srvdata/db_sensitive_words.go
View File

@ -65,5 +65,5 @@ func (this *DB_Sensitive_WordsMgr) GetData(id int32) *server.DB_Sensitive_Words
}
func init() {
DataMgr.RegisteLoader("DB_Sensitive_Words.dat", &ProtobufDataLoader{dh: PBDB_Sensitive_WordsMgr})
DataMgr.register("DB_Sensitive_Words.dat", &ProtobufDataLoader{dh: PBDB_Sensitive_WordsMgr})
}

2
srvdata/db_slotrateweight.go
View File

@ -65,5 +65,5 @@ func (this *DB_SlotRateWeightMgr) GetData(id int32) *server.DB_SlotRateWeight {
}
func init() {
DataMgr.RegisteLoader("DB_SlotRateWeight.dat", &ProtobufDataLoader{dh: PBDB_SlotRateWeightMgr})
DataMgr.register("DB_SlotRateWeight.dat", &ProtobufDataLoader{dh: PBDB_SlotRateWeightMgr})
}

2
srvdata/db_systemchance.go
View File

@ -65,5 +65,5 @@ func (this *DB_SystemChanceMgr) GetData(id int32) *server.DB_SystemChance {
}
func init() {
DataMgr.RegisteLoader("DB_SystemChance.dat", &ProtobufDataLoader{dh: PBDB_SystemChanceMgr})
DataMgr.register("DB_SystemChance.dat", &ProtobufDataLoader{dh: PBDB_SystemChanceMgr})
}

2
srvdata/db_task.go
View File

@ -65,5 +65,5 @@ func (this *DB_TaskMgr) GetData(id int32) *server.DB_Task {
}
func init() {
DataMgr.RegisteLoader("DB_Task.dat", &ProtobufDataLoader{dh: PBDB_TaskMgr})
DataMgr.register("DB_Task.dat", &ProtobufDataLoader{dh: PBDB_TaskMgr})
}

2
srvdata/db_thirdplatformgamemapping.go
View File

@ -65,5 +65,5 @@ func (this *DB_ThirdPlatformGameMappingMgr) GetData(id int32) *server.DB_ThirdPl
}
func init() {
DataMgr.RegisteLoader("DB_ThirdPlatformGameMapping.dat", &ProtobufDataLoader{dh: PBDB_ThirdPlatformGameMappingMgr})
DataMgr.register("DB_ThirdPlatformGameMapping.dat", &ProtobufDataLoader{dh: PBDB_ThirdPlatformGameMappingMgr})
}

2
srvdata/db_tips.go
View File

@ -65,5 +65,5 @@ func (this *DB_TipsMgr) GetData(id int32) *server.DB_Tips {
}
func init() {
DataMgr.RegisteLoader("DB_Tips.dat", &ProtobufDataLoader{dh: PBDB_TipsMgr})
DataMgr.register("DB_Tips.dat", &ProtobufDataLoader{dh: PBDB_TipsMgr})
}

2
srvdata/db_vip.go
View File

@ -65,5 +65,5 @@ func (this *DB_VIPMgr) GetData(id int32) *server.DB_VIP {
}
func init() {
DataMgr.RegisteLoader("DB_VIP.dat", &ProtobufDataLoader{dh: PBDB_VIPMgr})
DataMgr.register("DB_VIP.dat", &ProtobufDataLoader{dh: PBDB_VIPMgr})
}

14
srvdata/gamedropmgr.go
View File

@ -4,6 +4,10 @@ import (
"strconv"
)
func init() {
DataMgr.RegisterLoader("DB_Game_Drop.dat", GameDropMgrSington)
}
var GameDropMgrSington = &GameDropMgr{
GameDropData: make(map[string][]*GameDropData),
}
@ -12,6 +16,16 @@ type GameDropMgr struct {
GameDropData map[string][]*GameDropData
}
func (this *GameDropMgr) Load(fileFullPath string) error {
GameDropMgrSington.Init()
return nil
}
func (this *GameDropMgr) Reload(fileFullPath string) error {
GameDropMgrSington.Init()
return nil
}
type GameDropData struct {
ItemId int32
Rate int32

8
srvdata/matchlevel.go
View File

@ -2,6 +2,10 @@ package srvdata
import "mongo.games.com/game/protocol/server"
func init() {
DataMgr.RegisterLoader("DB_GameMatchLevel.dat", MatchLevelMgr)
}
var MatchLevelMgr = &MatchLevel{
DBGameFreeId: map[int32][]*server.DB_GameMatchLevel{},
}
@ -46,7 +50,3 @@ func (m *MatchLevel) Get(gamefreeid, level int32) *server.DB_GameMatchLevel {
DownGradeOdds: []int32{300, 300, 85, 60, 55, 50, 45, 40, 35, 30},
}
}
func init() {
DataMgrAfter.RegisterLoader("DB_GameMatchLevel.dat", MatchLevelMgr)
}

18
srvdata/playerExp.go → srvdata/playerexp.go
View File

@ -1,17 +1,21 @@
package srvdata
var PlayerExpMgr = &DB_PlayerExpMgrEx{ArtilleryRateMap: make(map[int32]*ArtilleryRateData)}
func init() {
DataMgr.RegisterLoader("DB_PlayerExp.dat", PlayerExpMgr)
}
var PlayerExpMgr = &PlayerExp{ArtilleryRateMap: make(map[int32]*ArtilleryRateData)}
type ArtilleryRateData struct {
Shell int32
Level int32
}
type DB_PlayerExpMgrEx struct {
type PlayerExp struct {
ArtilleryRateMap map[int32]*ArtilleryRateData
}
func (this *DB_PlayerExpMgrEx) Load(fileFullPath string) error {
func (this *PlayerExp) Load(fileFullPath string) error {
this.ArtilleryRateMap = make(map[int32]*ArtilleryRateData)
for _, data := range PBDB_ArtilleryRateMgr.Datas.Arr {
this.ArtilleryRateMap[data.Level] = &ArtilleryRateData{
@ -23,17 +27,13 @@ func (this *DB_PlayerExpMgrEx) Load(fileFullPath string) error {
}
// 获取解锁的炮倍
func (this *DB_PlayerExpMgrEx) GetUnPower(level int32) int32 {
func (this *PlayerExp) GetUnPower(level int32) int32 {
if this.ArtilleryRateMap[level] != nil {
return this.ArtilleryRateMap[level].Shell
}
return 0
}
func (this *DB_PlayerExpMgrEx) Reload(fileFullPath string) error {
func (this *PlayerExp) Reload(fileFullPath string) error {
return this.Load(fileFullPath)
}
func init() {
DataMgrAfter.RegisterLoader("DB_PlayerExp.dat", PlayerExpMgr)
}

8
srvdata/playertype.go
View File

@ -2,6 +2,10 @@ package srvdata
import "mongo.games.com/game/protocol/server"
func init() {
DataMgr.RegisterLoader("DB_PlayerType.dat", PlayerTypeMgrSington)
}
var PlayerTypeMgrSington = &PlayerTypeMgr{
types: make(map[int32][]*server.DB_PlayerType),
}
@ -33,7 +37,3 @@ func (this *PlayerTypeMgr) GetPlayerType(id int32) []*server.DB_PlayerType {
}
return nil
}
func init() {
DataMgrAfter.RegisterLoader("DB_PlayerType.dat", PlayerTypeMgrSington)
}

8
srvdata/rankmatch.go
View File

@ -6,6 +6,10 @@ import (
"mongo.games.com/game/protocol/server"
)
func init() {
DataMgr.RegisterLoader("DB_RankLevel.dat", RankLevelMgr)
}
var RankLevelMgr = &RankLevel{
RankType: map[int32][]*server.DB_RankLevel{},
}
@ -61,7 +65,3 @@ func (r *RankLevel) GetNewScore(score int64) int64 {
}
return score/2 + 5000
}
func init() {
DataMgrAfter.RegisterLoader("DB_RankLevel.dat", RankLevelMgr)
}

15
srvdata/rolepetmgr.go
View File

@ -5,6 +5,11 @@ import (
"mongo.games.com/game/protocol/server"
)
func init() {
DataMgr.RegisterLoader("DB_Game_Role.dat", RolePetMgrSington)
DataMgr.RegisterLoader("DB_Game_Pet.dat", RolePetMgrSington)
}
var RolePetMgrSington = &RolePetMgr{
Roles: make(map[int32][]*server.DB_Game_Role),
Pets: make(map[int32][]*server.DB_Game_Pet),
@ -15,6 +20,16 @@ type RolePetMgr struct {
Pets map[int32][]*server.DB_Game_Pet
}
func (this *RolePetMgr) Load(fileFullPath string) error {
this.Init()
return nil
}
func (this *RolePetMgr) Reload(fileFullPath string) error {
this.Init()
return nil
}
func (this *RolePetMgr) Init() {
this.Roles = make(map[int32][]*server.DB_Game_Role)
this.Pets = make(map[int32][]*server.DB_Game_Pet)

8
srvdata/sensitive_word.go
View File

@ -1,5 +1,9 @@
package srvdata
func init() {
DataMgr.RegisterLoader("DB_Sensitive_Words.dat", &SensitiveWordTreeMgr{})
}
var sensitiveWordsTree = make(map[rune]*Word)
type Word struct {
@ -118,7 +122,3 @@ func (s *SensitiveWordTreeMgr) Reload(fileFullPath string) error {
sensitiveWordsTree = make(map[rune]*Word)
return initSensitiveWordTree()
}
func init() {
DataMgrAfter.RegisterLoader("DB_Sensitive_Words.dat", &SensitiveWordTreeMgr{})
}

5
srvdata/sensitive_word_test.go
View File

@ -7,10 +7,9 @@ import (
func initSensitiveWordEnv(t *testing.T) {
fileName := "DB_Sensitive_Words.dat"
loader := DataMgr.GetLoader(fileName)
if loader != nil {
for _, v := range DataMgr.GetLoader(fileName) {
fullPath := filepath.Join("../data", fileName)
err := loader.Load(fullPath)
err := v.Load(fullPath)
if err != nil {
t.Error(fileName, " loader err:", err)
}

37
srvdata/task.go Normal file
View File

@ -0,0 +1,37 @@
package srvdata
import (
"mongo.games.com/game/protocol/server"
"sort"
)
func init() {
DataMgr.RegisterLoader("DB_Task.dat", TaskMgr)
}
var TaskMgr = &Task{}
type Task struct {
ActivityType map[int32][]*server.DB_Task
}
func (m *Task) Load(fileFullPath string) error {
m.ActivityType = make(map[int32][]*server.DB_Task)
for _, v := range PBDB_TaskMgr.Datas.GetArr() {
m.ActivityType[v.GetActivityType()] = append(m.ActivityType[v.GetActivityType()], v)
}
for _, v := range m.ActivityType {
sort.Slice(v, func(i, j int) bool {
return v[i].GetOrder() < v[j].GetOrder()
})
}
return nil
}
func (m *Task) Reload(fileFullPath string) error {
return m.Load(fileFullPath)
}
func (m *Task) Get(tp int32) []*server.DB_Task {
return m.ActivityType[tp]
}

42
tools/xlsx2binary/agc.go
View File

@ -11694,12 +11694,12 @@ func AgcConvertDB_Task(fi,fo string) {
if len(row.Cells)<3+1{
if len(row.Cells)<1+1{
break
}
temp, _ = strconv.ParseInt(row.Cells[3].String(), 10, 32)
data.ActivityType = int32(temp)
temp, _ = strconv.ParseInt(row.Cells[1].String(), 10, 32)
data.Order = int32(temp)
@ -11713,7 +11713,7 @@ func AgcConvertDB_Task(fi,fo string) {
}
temp, _ = strconv.ParseInt(row.Cells[4].String(), 10, 32)
data.TaskType = int32(temp)
data.ActivityType = int32(temp)
@ -11726,9 +11726,9 @@ func AgcConvertDB_Task(fi,fo string) {
break
}
temp, _ = strconv.ParseInt(row.Cells[5].String(), 10, 32)
data.TaskType = int32(temp)
temp, _ = strconv.ParseInt(row.Cells[5].String(), 10, 64)
data.TargetTimes = int64(temp)
@ -11742,7 +11742,7 @@ func AgcConvertDB_Task(fi,fo string) {
temp, _ = strconv.ParseInt(row.Cells[6].String(), 10, 64)
data.FinishTimes = int64(temp)
data.TargetTimes = int64(temp)
@ -11754,14 +11754,28 @@ func AgcConvertDB_Task(fi,fo string) {
break
}
temp, _ = strconv.ParseInt(row.Cells[7].String(), 10, 64)
data.FinishTimes = int64(temp)
if row.Cells[7].String() != ""{
pairs := strings.Split(row.Cells[7].String(), ";")
if len(row.Cells)<8+1{
break
}
if row.Cells[8].String() != ""{
pairs := strings.Split(row.Cells[8].String(), ";")
resultMap := make(map[int64]int64)
for _, pair := range pairs {
kv := strings.Split(pair, ",")
@ -11783,11 +11797,11 @@ func AgcConvertDB_Task(fi,fo string) {
}
if len(row.Cells)<8+1{
if len(row.Cells)<9+1{
break
}
temp, _ = strconv.ParseInt(row.Cells[8].String(), 10, 32)
temp, _ = strconv.ParseInt(row.Cells[9].String(), 10, 32)
data.GameType = int32(temp)
@ -11797,16 +11811,16 @@ func AgcConvertDB_Task(fi,fo string) {
if len(row.Cells)<9+1{
if len(row.Cells)<10+1{
break
}
arrStr = strings.Split(row.Cells[9].String(), "|")
arrStr = strings.Split(row.Cells[10].String(), "|")
arrInt = nil
if len(arrStr) > 0 && row.Cells[9].String() != "" {
if len(arrStr) > 0 && row.Cells[10].String() != "" {
arrInt = make([]int32, len(arrStr), len(arrStr))
for i, v := range arrStr {
temp, _ = strconv.ParseInt(strings.TrimSpace(v), 10, 32)

2
tools/xlsx2proto/templ/gpb_mgr.templ
View File

@ -65,6 +65,6 @@ func (this *{{.ProtoName}}Mgr) GetData(id int32) *server.{{.ProtoName}} {
}
func init() {
DataMgr.RegisteLoader("{{.ProtoName}}.dat", &ProtobufDataLoader{dh: PB{{.ProtoName}}Mgr})
DataMgr.register("{{.ProtoName}}.dat", &ProtobufDataLoader{dh: PB{{.ProtoName}}Mgr})
}
{{end}}

7
worldsrv/action_task.go
View File

@ -103,12 +103,7 @@ func CSTaskList(s *netlib.Session, packetId int, data interface{}, sid int64) er
Tp: msg.GetTp(),
}
// todo 优化
tp := msg.GetTp()
for _, v := range srvdata.PBDB_TaskMgr.Datas.GetArr() {
if v.GetActivityType() != tp {
continue
}
for _, v := range srvdata.TaskMgr.Get(msg.GetTp()) {
item := &taskproto.TaskData{
Id: v.Id,
N: GetTaskTimes(p, v.Id),

2
worldsrv/srvdatamanager.go
View File

@ -117,5 +117,5 @@ func (this *PBDB_GameFreeMgrEx) GetGameFreeIdByGameDif(gameDif string) int32 {
//}
func init() {
srvdata.DataMgrAfter.RegisterLoader("DB_GameFree.dat", GameFreeMgrEx)
srvdata.DataMgr.RegisterLoader("DB_GameFree.dat", GameFreeMgrEx)
}

2
worldsrv/thirdPlatformGameMapping.go
View File

@ -125,5 +125,5 @@ func (this *ThirdPlatformGameMappingConfiguration) FindThirdInfoBySystemGameId(s
}
func init() {
srvdata.DataMgrAfter.RegisterLoader("DB_ThirdPlatformGameMapping.dat", ThirdPltGameMappingConfig)
srvdata.DataMgr.RegisterLoader("DB_ThirdPlatformGameMapping.dat", ThirdPltGameMappingConfig)
}

BIN
xlsx/DB_Task.xlsx
View File

Binary file not shown.