From 3a86736040d264ec3f0a8c3997bb7e4f8eb2aba1 Mon Sep 17 00:00:00 2001 From: hahwu <31872165+hahwu@users.noreply.github.com> Date: Mon, 28 Apr 2025 17:32:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0playroominfo=20=E7=82=B9?= =?UTF-8?q?=E8=B5=9E=E6=AC=A1=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/server/game/Player.go | 1 + src/server/game/PlayerBack.go | 1 + src/server/game/Type.go | 1 + src/server/msg/Gameapi.pb.go | 13 +++++++++++-- 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/server/game/Player.go b/src/server/game/Player.go index bfaf351b..ce370313 100644 --- a/src/server/game/Player.go +++ b/src/server/game/Player.go @@ -806,6 +806,7 @@ func (p *Player) UpdateUserInfo() { simple.PetName = p.PlayMod.getBaseMod().PetName simple.Emoji = p.PlayMod.getEmojiMod().Set simple.Friend = p.PlayMod.getFriendMod().GetSimpleFriendList() + simple.Upvote = p.PlayMod.getPlayroomMod().Upvote value, _ := json.Marshal(simple) IdStr := strconv.Itoa(int(p.M_DwUin)) db.RedisSetKey(IdStr, string(value), 0) diff --git a/src/server/game/PlayerBack.go b/src/server/game/PlayerBack.go index d426e41a..3a2b718c 100644 --- a/src/server/game/PlayerBack.go +++ b/src/server/game/PlayerBack.go @@ -133,5 +133,6 @@ func PlayroomVisit(p *Player, Uid int) { r.Upvote = GoUtil.InArray(Uid, PlayroomMod.UpvoteList) r.Items = Items r.Status = int32(PlayroomMod.GameStatus) + r.UpvoteCount = int32(PlayerData.Upvote) p.PushClientRes(r) } diff --git a/src/server/game/Type.go b/src/server/game/Type.go index 3ea1171d..bbec70a7 100644 --- a/src/server/game/Type.go +++ b/src/server/game/Type.go @@ -25,6 +25,7 @@ type PlayerSimpleData struct { PetName string Emoji map[int]int Friend []int + Upvote int } type VarGoldCard struct { diff --git a/src/server/msg/Gameapi.pb.go b/src/server/msg/Gameapi.pb.go index 9e2f4fd8..d21c2683 100644 --- a/src/server/msg/Gameapi.pb.go +++ b/src/server/msg/Gameapi.pb.go @@ -19974,6 +19974,7 @@ type ResPlayroomInfo struct { PetName string `protobuf:"bytes,12,opt,name=PetName,proto3" json:"PetName,omitempty"` // 宠物名 Emoji map[int32]int32 `protobuf:"bytes,13,rep,name=Emoji,proto3" json:"Emoji,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"` // 表情 Upvote bool `protobuf:"varint,14,opt,name=Upvote,proto3" json:"Upvote,omitempty"` // 是否点赞 + UpvoteCount int32 `protobuf:"varint,15,opt,name=UpvoteCount,proto3" json:"UpvoteCount,omitempty"` // 点赞次数 unknownFields protoimpl.UnknownFields sizeCache protoimpl.SizeCache } @@ -20106,6 +20107,13 @@ func (x *ResPlayroomInfo) GetUpvote() bool { return false } +func (x *ResPlayroomInfo) GetUpvoteCount() int32 { + if x != nil { + return x.UpvoteCount + } + return 0 +} + // 请求翻牌 type ReqPlayroomFlip struct { state protoimpl.MessageState `protogen:"open.v1"` @@ -23984,7 +23992,7 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\x06Avatar\x18\x04 \x01(\x05R\x06Avatar\x12\x1a\n" + "\bLastTime\x18\x05 \x01(\x05R\bLastTime\"#\n" + "\x0fReqPlayroomInfo\x12\x10\n" + - "\x03Uid\x18\x01 \x01(\x03R\x03Uid\"\xfb\x05\n" + + "\x03Uid\x18\x01 \x01(\x03R\x03Uid\"\x9d\x06\n" + "\x0fResPlayroomInfo\x12\x10\n" + "\x03Uid\x18\x01 \x01(\x03R\x03Uid\x12\x12\n" + "\x04name\x18\x02 \x01(\tR\x04name\x12\x12\n" + @@ -24000,7 +24008,8 @@ const file_proto_Gameapi_proto_rawDesc = "" + "\x04Chip\x18\v \x03(\v2\x12.tutorial.ChipInfoR\x04Chip\x12\x18\n" + "\aPetName\x18\f \x01(\tR\aPetName\x12:\n" + "\x05Emoji\x18\r \x03(\v2$.tutorial.ResPlayroomInfo.EmojiEntryR\x05Emoji\x12\x16\n" + - "\x06Upvote\x18\x0e \x01(\bR\x06Upvote\x1a;\n" + + "\x06Upvote\x18\x0e \x01(\bR\x06Upvote\x12 \n" + + "\vUpvoteCount\x18\x0f \x01(\x05R\vUpvoteCount\x1a;\n" + "\rPlayroomEntry\x12\x10\n" + "\x03key\x18\x01 \x01(\x05R\x03key\x12\x14\n" + "\x05value\x18\x02 \x01(\x05R\x05value:\x028\x01\x1aL\n" +