From 34cec5071f903e86b8a5c39c08e185da7e9f10e3 Mon Sep 17 00:00:00 2001 From: sk <123456@qq.com> Date: Wed, 17 Apr 2024 18:02:31 +0800 Subject: [PATCH] update --- data/DB_PropExchange.dat | 6 +++--- data/DB_Task.dat | Bin 583 -> 583 bytes protocol/server/server.pb.go | 12 ++++++------ protocol/server/server.proto | 4 ++-- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index b4dee6d..5b4f370 100644 --- a/data/DB_PropExchange.dat +++ b/data/DB_PropExchange.dat @@ -1,5 +1,5 @@ -6Նֆ׆ӆԆ"= +6׆ӆԆՆֆ"= .؆نچۆ"= -WԆՆ׆نӆֆ؆چۆ"  -]Ԇۆ܆چӆՆֆ׆؆ن" \ No newline at end of file +WՆֆۆӆ׆؆نچԆ"  +]؆ن܆ӆԆՆֆ׆چۆ" \ No newline at end of file diff --git a/data/DB_Task.dat b/data/DB_Task.dat index c69d8e5a2621ccb1360036aee473bf2755135e2f..5c2c40e683baa4c8cb4aaa91ef329f4824ad5f8b 100644 GIT binary patch delta 78 zcmX@ka-3y?z91XNl3q3e5hD(cg+O{iFWW{3X~xM@7)2)MGr9_~aV!Fgav5=gWgFH$ SVwrr5F&`?N0uz4tS{wjYNEV*} delta 79 zcmX@ka-3y?z90w3!d^Ck1-)!WY#d8~ERl^4(u{&^9E*T#E+dHSffn1zIgB2YKQjt4 Xa!o$Qm@mW$*46OvwKz~4NNEZHXjK++ diff --git a/protocol/server/server.pb.go b/protocol/server/server.pb.go index 5d36cf4..53f4d4a 100644 --- a/protocol/server/server.pb.go +++ b/protocol/server/server.pb.go @@ -1301,7 +1301,7 @@ type WGPlayerEnter struct { SnId int32 `protobuf:"varint,14,opt,name=SnId,proto3" json:"SnId,omitempty"` SingleAdjust []byte `protobuf:"bytes,15,opt,name=SingleAdjust,proto3" json:"SingleAdjust,omitempty"` //单控数据 Pos int32 `protobuf:"varint,16,opt,name=Pos,proto3" json:"Pos,omitempty"` - Items map[int32]int32 `protobuf:"bytes,17,rep,name=Items,proto3" json:"Items,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Items map[int32]int64 `protobuf:"bytes,17,rep,name=Items,proto3" json:"Items,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` MatchParams []int32 `protobuf:"varint,18,rep,packed,name=MatchParams,proto3" json:"MatchParams,omitempty"` //比赛参数 RankScore map[int32]int64 `protobuf:"bytes,19,rep,name=RankScore,proto3" json:"RankScore,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 排位积分 } @@ -1450,7 +1450,7 @@ func (x *WGPlayerEnter) GetPos() int32 { return 0 } -func (x *WGPlayerEnter) GetItems() map[int32]int32 { +func (x *WGPlayerEnter) GetItems() map[int32]int64 { if x != nil { return x.Items } @@ -1637,7 +1637,7 @@ type GWPlayerLeave struct { LostTimes int32 `protobuf:"varint,12,opt,name=LostTimes,proto3" json:"LostTimes,omitempty"` //输局 TotalConvertibleFlow int64 `protobuf:"varint,13,opt,name=TotalConvertibleFlow,proto3" json:"TotalConvertibleFlow,omitempty"` //流水 ValidCacheBetTotal int64 `protobuf:"varint,14,opt,name=ValidCacheBetTotal,proto3" json:"ValidCacheBetTotal,omitempty"` //有效下注缓存 - Items map[int32]int32 `protobuf:"bytes,15,rep,name=Items,proto3" json:"Items,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` + Items map[int32]int64 `protobuf:"bytes,15,rep,name=Items,proto3" json:"Items,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` MatchId int32 `protobuf:"varint,16,opt,name=MatchId,proto3" json:"MatchId,omitempty"` //比赛场id CurIsWin int64 `protobuf:"varint,17,opt,name=CurIsWin,proto3" json:"CurIsWin,omitempty"` //本局是否赢 负数：输 0：平局 正数：赢 MatchRobotGrades map[int32]int32 `protobuf:"bytes,18,rep,name=MatchRobotGrades,proto3" json:"MatchRobotGrades,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //比赛数据 @@ -1774,7 +1774,7 @@ func (x *GWPlayerLeave) GetValidCacheBetTotal() int64 { return 0 } -func (x *GWPlayerLeave) GetItems() map[int32]int32 { +func (x *GWPlayerLeave) GetItems() map[int32]int64 { if x != nil { return x.Items } @@ -8789,7 +8789,7 @@ var file_server_proto_rawDesc = []byte{ 0x72, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, - 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, + 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3c, 0x0a, 0x0e, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, @@ -8856,7 +8856,7 @@ var file_server_proto_rawDesc = []byte{ 0x09, 0x52, 0x61, 0x6e, 0x6b, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x1a, 0x38, 0x0a, 0x0a, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, - 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, + 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x43, 0x0a, 0x15, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x62, 0x6f, 0x74, 0x47, 0x72, 0x61, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, diff --git a/protocol/server/server.proto b/protocol/server/server.proto index d7c61d0..6d6c1dd 100644 --- a/protocol/server/server.proto +++ b/protocol/server/server.proto @@ -225,7 +225,7 @@ message WGPlayerEnter { int32 SnId = 14; bytes SingleAdjust = 15;//单控数据 int32 Pos = 16; - map Items = 17; + map Items = 17; repeated int32 MatchParams = 18;//比赛参数 map RankScore = 19;// 排位积分 } @@ -264,7 +264,7 @@ message GWPlayerLeave{ int32 LostTimes = 12; //输局 int64 TotalConvertibleFlow = 13; //流水 int64 ValidCacheBetTotal = 14; //有效下注缓存 - map Items = 15; + map Items = 15; int32 MatchId = 16;//比赛场id int64 CurIsWin = 17;//本局是否赢 负数：输 0：平局 正数：赢 map MatchRobotGrades = 18;//比赛数据