From 7fb33896def3968de035ed1f12dbf830da3a416e Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 26 Apr 2024 14:57:26 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=91=A8=E5=8D=A1=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/DB_GiftCard.dat | Bin 56 -> 57 bytes data/DB_GiftCard.json | 4 +++- gamesrv/base/player.go | 6 ++++-- protocol/server/pbdata.pb.go | 8 ++++---- protocol/server/pbdata.proto | 2 +- tools/xlsx2binary/agc.go | 14 +++++++++++--- worldsrv/player.go | 9 +++++++-- xlsx/DB_GiftCard.xlsx | Bin 11028 -> 11044 bytes 8 files changed, 30 insertions(+), 13 deletions(-) diff --git a/data/DB_GiftCard.dat b/data/DB_GiftCard.dat index 90fe006870017a72f1ab943fdd3d04dcbfc15806..15600367ff42a73b75826e6378f02a3bde3a8661 100644 GIT binary patch delta 12 TcmcDpWa2WP$YjE7#mE2v4G00c delta 11 ScmcDtVB#{H$YjD~!3Y2gK>@Y^ diff --git a/data/DB_GiftCard.json b/data/DB_GiftCard.json index e1d7dfb..e3df84b 100644 --- a/data/DB_GiftCard.json +++ b/data/DB_GiftCard.json @@ -12,7 +12,9 @@ "100001": 1000000 }, "Time": 7, - "Equity": 1 + "Equity": [ + 0 + ] } ] } \ No newline at end of file diff --git a/gamesrv/base/player.go b/gamesrv/base/player.go index a1067f3..a766a95 100644 --- a/gamesrv/base/player.go +++ b/gamesrv/base/player.go @@ -1415,8 +1415,10 @@ func (this *Player) GetWeekCardPrivilege(typeId int32) bool { for id, endTime := range this.WeekCardTime { if endTime > now { data := srvdata.PBDB_GiftCardMgr.GetData(id) - if data.Equity == typeId { - return true + for _, equity := range data.GetEquity() { + if equity == typeId { + return true + } } } } diff --git a/protocol/server/pbdata.pb.go b/protocol/server/pbdata.pb.go index 28ad6b4..cf49d9f 100644 --- a/protocol/server/pbdata.pb.go +++ b/protocol/server/pbdata.pb.go @@ -6232,7 +6232,7 @@ type DB_GiftCard struct { Rewards map[int64]int64 `protobuf:"bytes,4,rep,name=Rewards,proto3" json:"Rewards,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` DayRewards map[int64]int64 `protobuf:"bytes,5,rep,name=DayRewards,proto3" json:"DayRewards,omitempty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` Time int32 `protobuf:"varint,6,opt,name=Time,proto3" json:"Time,omitempty"` - Equity int32 `protobuf:"varint,7,opt,name=Equity,proto3" json:"Equity,omitempty"` + Equity []int32 `protobuf:"varint,7,rep,packed,name=Equity,proto3" json:"Equity,omitempty"` } func (x *DB_GiftCard) Reset() { @@ -6309,11 +6309,11 @@ func (x *DB_GiftCard) GetTime() int32 { return 0 } -func (x *DB_GiftCard) GetEquity() int32 { +func (x *DB_GiftCard) GetEquity() []int32 { if x != nil { return x.Equity } - return 0 + return nil } type DB_GiftCardArray struct { @@ -10750,7 +10750,7 @@ var file_pbdata_proto_rawDesc = []byte{ 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x0a, 0x44, 0x61, 0x79, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 0x12, 0x12, 0x0a, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x18, 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x54, 0x69, 0x6d, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x45, 0x71, 0x75, 0x69, 0x74, 0x79, - 0x18, 0x07, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x45, 0x71, 0x75, 0x69, 0x74, 0x79, 0x1a, 0x3a, + 0x18, 0x07, 0x20, 0x03, 0x28, 0x05, 0x52, 0x06, 0x45, 0x71, 0x75, 0x69, 0x74, 0x79, 0x1a, 0x3a, 0x0a, 0x0c, 0x52, 0x65, 0x77, 0x61, 0x72, 0x64, 0x73, 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, diff --git a/protocol/server/pbdata.proto b/protocol/server/pbdata.proto index 38e9103..b70f796 100644 --- a/protocol/server/pbdata.proto +++ b/protocol/server/pbdata.proto @@ -1069,7 +1069,7 @@ message DB_GiftCard { int32 Time = 6; - int32 Equity = 7; + repeated int32 Equity = 7; } diff --git a/tools/xlsx2binary/agc.go b/tools/xlsx2binary/agc.go index cf6a571..4f946d0 100644 --- a/tools/xlsx2binary/agc.go +++ b/tools/xlsx2binary/agc.go @@ -8202,12 +8202,20 @@ func AgcConvertDB_GiftCard(fi,fo string) { break } - temp, _ = strconv.ParseInt(row.Cells[6].String(), 10, 32) - data.Equity = int32(temp) - + arrStr = strings.Split(row.Cells[6].String(), "|") + arrInt = nil + if len(arrStr) > 0 && row.Cells[6].String() != "" { + arrInt = make([]int32, len(arrStr), len(arrStr)) + for i, v := range arrStr { + temp, _ = strconv.ParseInt(strings.TrimSpace(v), 10, 32) + arrInt[i] = int32(temp) + } + } + data.Equity = arrInt + diff --git a/worldsrv/player.go b/worldsrv/player.go index 20af3ab..417948d 100644 --- a/worldsrv/player.go +++ b/worldsrv/player.go @@ -2241,6 +2241,8 @@ func (this *Player) OnDayTimer(login, continuous bool, t int) { this.VipMatchTimes = 0 //VIP商城数据更新 this.UpdateVipShopData() + + this.AddDiamond(10000, 0, common.GainWay_Item_Sale, "sys", "123456") //周卡数据更新 this.WeekCardAward = make(map[int32]bool) // 重置每日任务 @@ -4773,9 +4775,12 @@ func (this *Player) GetWeekCardPrivilege(typeId int32) bool { for id, endTime := range this.WeekCardTime { if endTime > now { data := srvdata.PBDB_GiftCardMgr.GetData(id) - if data.Equity == typeId { - return true + for _, equity := range data.GetEquity() { + if equity == typeId { + return true + } } + } } return false diff --git a/xlsx/DB_GiftCard.xlsx b/xlsx/DB_GiftCard.xlsx index ad109cc373a778a945e3ca0c81138d37b0d0f263..1e95bf3ce3d30b8e6d4ca8a6980efa7dfdfc32d4 100644 GIT binary patch delta 2569 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 SMYRe27k`Rkr->5#ZSzlId!L*D delta 2532 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 From 06d5ac5fadad5e1e33f0bc15aa2ab282056b9edc Mon Sep 17 00:00:00 2001 From: by <123456@qq.com> Date: Fri, 26 Apr 2024 14:58:31 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=91=A8=E5=8D=A1=E7=A4=BC=E5=8C=85?= =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- worldsrv/player.go | 2 -- 1 file changed, 2 deletions(-) diff --git a/worldsrv/player.go b/worldsrv/player.go index 417948d..7760203 100644 --- a/worldsrv/player.go +++ b/worldsrv/player.go @@ -2241,8 +2241,6 @@ func (this *Player) OnDayTimer(login, continuous bool, t int) { this.VipMatchTimes = 0 //VIP商城数据更新 this.UpdateVipShopData() - - this.AddDiamond(10000, 0, common.GainWay_Item_Sale, "sys", "123456") //周卡数据更新 this.WeekCardAward = make(map[int32]bool) // 重置每日任务