diff --git a/data/DB_PropExchange.dat b/data/DB_PropExchange.dat index 0f787f8..ff3fd75 100644 Binary files a/data/DB_PropExchange.dat and b/data/DB_PropExchange.dat differ diff --git a/data/DB_PropExchange.json b/data/DB_PropExchange.json index e4e72b6..85e6958 100644 --- a/data/DB_PropExchange.json +++ b/data/DB_PropExchange.json @@ -63,6 +63,54 @@ "Gain": { "100002": 500 } - } + }, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} ] } \ No newline at end of file diff --git a/data/DB_Task.dat b/data/DB_Task.dat index 23d9c66..fe6fc98 100644 Binary files a/data/DB_Task.dat and b/data/DB_Task.dat differ diff --git a/data/DB_Task.json b/data/DB_Task.json index bff53d6..2480fa0 100644 --- a/data/DB_Task.json +++ b/data/DB_Task.json @@ -207,8 +207,8 @@ "TargetTimes": 10, "FinishTimes": 1, "Award": { - "100001": 10000000, - "100002": 10 + "100001": 250000, + "50001": 1 } }, { @@ -219,8 +219,8 @@ "TargetTimes": 5, "FinishTimes": 1, "Award": { - "100001": 10000000, - "100002": 10 + "100001": 2500000, + "50001": 2 } }, { @@ -231,8 +231,8 @@ "TargetTimes": 10, "FinishTimes": 1, "Award": { - "100001": 10000000, - "100002": 10 + "100001": 5000000, + "50001": 4 } }, { @@ -243,8 +243,8 @@ "TargetTimes": 100, "FinishTimes": 1, "Award": { - "100001": 10000000, - "100002": 10 + "100001": 2500000, + "50001": 2 } }, { @@ -255,8 +255,8 @@ "TargetTimes": 500, "FinishTimes": 1, "Award": { - "100001": 10000000, - "100002": 10 + "100001": 12500000, + "50001": 10 } }, { @@ -267,8 +267,8 @@ "TargetTimes": 1000, "FinishTimes": 1, "Award": { - "100001": 10000000, - "100002": 10 + "100001": 25000000, + "50001": 20 } }, { diff --git a/protocol/server/server.pb.go b/protocol/server/server.pb.go index 79f734c..2a23ac8 100644 --- a/protocol/server/server.pb.go +++ b/protocol/server/server.pb.go @@ -851,7 +851,7 @@ type WGCreateScene struct { SceneId int32 `protobuf:"varint,1,opt,name=SceneId,proto3" json:"SceneId,omitempty"` GameId int32 `protobuf:"varint,2,opt,name=GameId,proto3" json:"GameId,omitempty"` GameMode int32 `protobuf:"varint,3,opt,name=GameMode,proto3" json:"GameMode,omitempty"` - Params []int32 `protobuf:"varint,4,rep,packed,name=Params,proto3" json:"Params,omitempty"` + Params []int64 `protobuf:"varint,4,rep,packed,name=Params,proto3" json:"Params,omitempty"` Creator int32 `protobuf:"varint,5,opt,name=Creator,proto3" json:"Creator,omitempty"` Agentor int32 `protobuf:"varint,6,opt,name=Agentor,proto3" json:"Agentor,omitempty"` ReplayCode string `protobuf:"bytes,7,opt,name=ReplayCode,proto3" json:"ReplayCode,omitempty"` @@ -926,7 +926,7 @@ func (x *WGCreateScene) GetGameMode() int32 { return 0 } -func (x *WGCreateScene) GetParams() []int32 { +func (x *WGCreateScene) GetParams() []int64 { if x != nil { return x.Params } @@ -1649,7 +1649,7 @@ type GWPlayerLeave struct { 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]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 + MatchId int64 `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"` //比赛数据 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"` // 排位积分 @@ -1792,7 +1792,7 @@ func (x *GWPlayerLeave) GetItems() map[int32]int64 { return nil } -func (x *GWPlayerLeave) GetMatchId() int32 { +func (x *GWPlayerLeave) GetMatchId() int64 { if x != nil { return x.MatchId } @@ -8723,7 +8723,7 @@ var file_server_proto_rawDesc = []byte{ 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x47, 0x61, 0x6d, 0x65, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x47, 0x61, 0x6d, 0x65, 0x4d, 0x6f, 0x64, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x50, 0x61, 0x72, 0x61, - 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, + 0x6d, 0x73, 0x18, 0x04, 0x20, 0x03, 0x28, 0x03, 0x52, 0x06, 0x50, 0x61, 0x72, 0x61, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x43, 0x72, 0x65, 0x61, 0x74, 0x6f, 0x72, 0x12, 0x18, 0x0a, 0x07, 0x41, 0x67, 0x65, 0x6e, 0x74, 0x6f, 0x72, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x41, 0x67, 0x65, @@ -8878,7 +8878,7 @@ var file_server_proto_rawDesc = []byte{ 0x2e, 0x73, 0x65, 0x72, 0x76, 0x65, 0x72, 0x2e, 0x47, 0x57, 0x50, 0x6c, 0x61, 0x79, 0x65, 0x72, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x2e, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x49, 0x74, 0x65, 0x6d, 0x73, 0x12, 0x18, 0x0a, 0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, - 0x49, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x49, + 0x49, 0x64, 0x18, 0x10, 0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x49, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x43, 0x75, 0x72, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x18, 0x11, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x43, 0x75, 0x72, 0x49, 0x73, 0x57, 0x69, 0x6e, 0x12, 0x57, 0x0a, 0x10, 0x4d, 0x61, 0x74, 0x63, 0x68, 0x52, 0x6f, 0x62, 0x6f, 0x74, 0x47, 0x72, 0x61, 0x64, 0x65, diff --git a/protocol/server/server.proto b/protocol/server/server.proto index 9f7b807..d0250b7 100644 --- a/protocol/server/server.proto +++ b/protocol/server/server.proto @@ -165,7 +165,7 @@ message WGCreateScene { int32 SceneId = 1; int32 GameId = 2; int32 GameMode = 3; - repeated int32 Params = 4; + repeated int64 Params = 4; int32 Creator = 5; int32 Agentor = 6; string ReplayCode = 7; @@ -267,7 +267,7 @@ message GWPlayerLeave{ int64 TotalConvertibleFlow = 13; //流水 int64 ValidCacheBetTotal = 14; //有效下注缓存 map Items = 15; - int32 MatchId = 16;//比赛场id + int64 MatchId = 16;//比赛场id int64 CurIsWin = 17;//本局是否赢 负数：输 0：平局 正数：赢 map MatchRobotGrades = 18;//比赛数据 map RankScore = 19;// 排位积分 diff --git a/xlsx/DB_CollectBox.xlsx b/xlsx/DB_CollectBox.xlsx index ed964e7..ef5d964 100644 Binary files a/xlsx/DB_CollectBox.xlsx and b/xlsx/DB_CollectBox.xlsx differ diff --git a/xlsx/DB_CollectBoxGain.xlsx b/xlsx/DB_CollectBoxGain.xlsx index 60f352e..f1fe5cf 100644 Binary files a/xlsx/DB_CollectBoxGain.xlsx and b/xlsx/DB_CollectBoxGain.xlsx differ diff --git a/xlsx/DB_PropExchange.xlsx b/xlsx/DB_PropExchange.xlsx index fbf6d3a..91badd0 100644 Binary files a/xlsx/DB_PropExchange.xlsx and b/xlsx/DB_PropExchange.xlsx differ diff --git a/xlsx/DB_Task.xlsx b/xlsx/DB_Task.xlsx index 1b1fab6..0008809 100644 Binary files a/xlsx/DB_Task.xlsx and b/xlsx/DB_Task.xlsx differ