From 74a8ba6d1b95478bf44d87662aac67b67f450d6f Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 29 Sep 2025 17:20:09 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=8D=E5=B9=BF=E5=91=8A=E7=A4=BC=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/mod/charge/Charge.go | 1 + src/server/msg/Gameapi.pb.go | 13 +++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/server/game/mod/charge/Charge.go b/src/server/game/mod/charge/Charge.go index 2cf79867..4c5c9016 100644 --- a/src/server/game/mod/charge/Charge.go +++ b/src/server/game/mod/charge/Charge.go @@ -296,6 +296,7 @@ func (c *ChargeMod) BackData() *msg.ResCharge { TodayCharge: float32(c.TodayCharge), MonthCharge: float32(c.MonthCharge), Wish: resWish, + AdEndTime: c.AdEndTime, } } diff --git a/src/server/msg/Gameapi.pb.go b/src/server/msg/Gameapi.pb.go index 8c1ec525..ac857e30 100644 --- a/src/server/msg/Gameapi.pb.go +++ b/src/server/msg/Gameapi.pb.go @@ -15923,6 +15923,7 @@ type ResCharge struct { SpecialChargeWeek int32 `protobuf:"varint,11,opt,name=SpecialChargeWeek,proto3" json:"SpecialChargeWeek,omitempty"` // 距离现在多少周 TodayCharge float32 `protobuf:"fixed32,12,opt,name=TodayCharge,proto3" json:"TodayCharge,omitempty"` // 今日充值金额 MonthCharge float32 `protobuf:"fixed32,13,opt,name=MonthCharge,proto3" json:"MonthCharge,omitempty"` // 本月充值金额 + AdEndTime int64 `protobuf:"varint,14,opt,name=AdEndTime,proto3" json:"AdEndTime,omitempty"` // 广告礼包结束时间 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -16048,6 +16049,13 @@ func (x *ResCharge) GetMonthCharge() float32 { return 0 } +func (x *ResCharge) GetAdEndTime() int64 { + if x != nil { + return x.AdEndTime + } + return 0 +} + type WishList struct { state protoimpl.MessageState `protogen:"open.v1"` Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id,omitempty"` // 物品id @@ -27010,7 +27018,7 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\rResDeleteMail\x12&\n" + "\x04Code\x18\x01 \x01(\x0e2\x12.tutorial.RES_CODER\x04Code\x12\x10\n" + "\x03Msg\x18\x02 \x01(\tR\x03Msg\x12\x0e\n" + - "\x02Id\x18\x03 \x01(\x05R\x02Id\"\xe1\x05\n" + + "\x02Id\x18\x03 \x01(\x05R\x02Id\"\xff\x05\n" + "\tResCharge\x12\x16\n" + "\x06Charge\x18\x01 \x01(\x02R\x06Charge\x12\x14\n" + "\x05Total\x18\x02 \x01(\x05R\x05Total\x12\x14\n" + @@ -27025,7 +27033,8 @@ const file_proto_Gameapi_proto_rawDesc = "" + " \x01(\x02R\rSpecialCharge\x12,\n" + "\x11SpecialChargeWeek\x18\v \x01(\x05R\x11SpecialChargeWeek\x12 \n" + "\vTodayCharge\x18\f \x01(\x02R\vTodayCharge\x12 \n" + - "\vMonthCharge\x18\r \x01(\x02R\vMonthCharge\x1aX\n" + + "\vMonthCharge\x18\r \x01(\x02R\vMonthCharge\x12\x1c\n" + + "\tAdEndTime\x18\x0e \x01(\x03R\tAdEndTime\x1aX\n" + "\x10SpecialShopEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\x05R\x03key\x12.\n" + "\x05value\x18\x02 \x01(\v2\x18.tutorial.ResSpecialShopR\x05value:\x028\x01\x1aT\n" +