pet_home/pet_home_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

消息优化

Browse Source
This commit is contained in:
hahwu 2026-01-13 17:13:46 +08:00
parent 5354e1bca0
commit eaffa63ae8
4 changed files with 22 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/server/game/player_back.go
View File

@ -156,7 +156,7 @@ func (p *Player) PlayroomBackData() {
r.Unlock = PlayroomMod.GetUnlockIds() r.Unlock = PlayroomMod.GetUnlockIds()
r.DailyTaskReward = GoUtil.IntToInt32(PlayroomMod.DailyTaskReward) r.DailyTaskReward = GoUtil.IntToInt32(PlayroomMod.DailyTaskReward)
r.DailyTask = PlayroomMod.BackDataTask() r.DailyTask = PlayroomMod.BackDataTask()
r.Kiss = int32(p.GetPlayroomKiss()) r.Kiss = int32(p.GetPlayroomKiss(int(p.M_DwUin)))
r.Revenge = PlayroomMod.RevengeUid r.Revenge = PlayroomMod.RevengeUid
r.InteractNum = int32(PlayroomMod.InteractNum) r.InteractNum = int32(PlayroomMod.InteractNum)
r.AdItem = AdWatch r.AdItem = AdWatch
@ -195,16 +195,16 @@ func (p *Player) PlayroomVisit(Uid int) {
r.Upvote = GoUtil.InArray(Uid, PlayroomMod.UpvoteList) r.Upvote = GoUtil.InArray(Uid, PlayroomMod.UpvoteList)
r.Items = Items r.Items = Items
r.Status = int32(PlayroomMod.GameStatus) r.Status = int32(PlayroomMod.GameStatus)
r.UpvoteCount = int32(p.GetPlayroomUpvote()) r.UpvoteCount = int32(p.GetPlayroomUpvote(Uid))
r.Chip = int32(p.GetPlayroomChip()) r.Chip = int32(p.GetPlayroomChip(Uid))
r.Kiss = int32(p.GetPlayroomKiss()) r.Kiss = int32(p.GetPlayroomKiss(Uid))
r.DressSet = GoUtil.MapIntToInt32(PlayerData.DressSet) r.DressSet = GoUtil.MapIntToInt32(PlayerData.DressSet)
p.PushClientRes(r) p.PushClientRes(r)
} }
func (p *Player) NotifyPlayroomKiss() { func (p *Player) NotifyPlayroomKiss() {
m := &proto.NotifyPlayroomKiss{ m := &proto.NotifyPlayroomKiss{
Kiss: int32(p.GetPlayroomKiss()), Kiss: int32(p.GetPlayroomKiss(int(p.M_DwUin))),
} }
p.PushClientRes(m) p.PushClientRes(m)
} }

1
src/server/game/register_network_func.go
View File

@ -2097,7 +2097,6 @@ func ReqCardGive(player *Player, buf []byte) error {
} }
FriendMgrSend(m) FriendMgrSend(m)
} }
player.PushClientRes(&msg.ResCardGive{ player.PushClientRes(&msg.ResCardGive{
Code: msg.RES_CODE_SUCCESS, Code: msg.RES_CODE_SUCCESS,
}) })

24
src/server/game/var.go
View File

@ -28,9 +28,9 @@ func (p *Player) GetVarData(key string) interface{} {
return cache.D return cache.D
} }
func (p *Player) GetUserVarData(key string) interface{} { func (p *Player) GetUserVarData(key string, PlayerId int) interface{} {
cache := map[string]*VarExpireData{} cache := map[string]*VarExpireData{}
err := LoadCacheVarData(GoUtil.GetVarKey(int(p.M_DwUin)), &cache) err := LoadCacheVarData(GoUtil.GetVarKey(int(PlayerId)), &cache)
if err != nil { if err != nil {
// log.Error("GetUserVarData err : %s, key: %s", err, key) // log.Error("GetUserVarData err : %s, key: %s", err, key)
return nil return nil
@ -53,7 +53,9 @@ func (p *Player) GetUserVarData(key string) interface{} {
func (p *Player) OpVarDataAsync(PlayerId int, key string, value interface{}, opType int) { func (p *Player) OpVarDataAsync(PlayerId int, key string, value interface{}, opType int) {
SendMsgToCenterAsync(&msg.Msg{ SendMsgToCenterAsync(&msg.Msg{
From: PlayerId, From: int(p.M_DwUin),
To: PlayerId,
SendT: GoUtil.Now(),
HandleType: msg.HANDLE_MOD_USER_VAR_SET, HandleType: msg.HANDLE_MOD_USER_VAR_SET,
Extra: msg.VarData{ Extra: msg.VarData{
Key: key, Key: key,
@ -65,7 +67,9 @@ func (p *Player) OpVarDataAsync(PlayerId int, key string, value interface{}, opT
func (p *Player) OpVarDataSync(PlayerId int, key string, value interface{}, opType int) (*msg.Msg, error) { func (p *Player) OpVarDataSync(PlayerId int, key string, value interface{}, opType int) (*msg.Msg, error) {
return SendMsgToCenterSync(&msg.Msg{ return SendMsgToCenterSync(&msg.Msg{
From: PlayerId, From: int(p.M_DwUin),
To: PlayerId,
SendT: GoUtil.Now(),
HandleType: msg.HANDLE_MOD_USER_VAR_SET, HandleType: msg.HANDLE_MOD_USER_VAR_SET,
Extra: msg.VarData{ Extra: msg.VarData{
Key: key, Key: key,
@ -113,16 +117,16 @@ func (p *Player) SubPlayroomChip(PlayerId int) {
p.SubVarDataAsync(VAR_PLAYROOM_CHIP, PlayerId) p.SubVarDataAsync(VAR_PLAYROOM_CHIP, PlayerId)
} }
func (p *Player) GetPlayroomUpvote() int { func (p *Player) GetPlayroomUpvote(PlayerId int) int {
data := p.GetUserVarData(VAR_PLAYROOM_UPVOTE) data := p.GetUserVarData(VAR_PLAYROOM_UPVOTE, PlayerId)
if data == nil { if data == nil {
return 0 return 0
} }
return data.(int) return data.(int)
} }
func (p *Player) GetPlayroomChip() int { func (p *Player) GetPlayroomChip(PlayerId int) int {
data := p.GetUserVarData(VAR_PLAYROOM_CHIP) data := p.GetUserVarData(VAR_PLAYROOM_CHIP, PlayerId)
if data == nil { if data == nil {
return 0 return 0
} }
@ -133,8 +137,8 @@ func (p *Player) SetPlayroomKiss(Kiss int, PlayerId int) {
p.SetVarDataAsync(VAR_PLAYROOM_KISS, Kiss, PlayerId) p.SetVarDataAsync(VAR_PLAYROOM_KISS, Kiss, PlayerId)
} }
func (p *Player) GetPlayroomKiss() int { func (p *Player) GetPlayroomKiss(PlayerId int) int {
data := p.GetUserVarData(VAR_PLAYROOM_KISS) data := p.GetUserVarData(VAR_PLAYROOM_KISS, PlayerId)
if data == nil { if data == nil {
return 0 return 0
} }

6
src/server/game/var_mgr.go
View File

@ -246,10 +246,10 @@ func SetUserVarDataHandler(m *msg.Msg) (interface{}, error) {
data.mu.Lock() data.mu.Lock()
defer data.mu.Unlock() defer data.mu.Unlock()
if v, ok := m.Extra.(msg.VarData); ok { if v, ok := m.Extra.(msg.VarData); ok {
varData := data.NewUseVar[m.From] varData := data.NewUseVar[m.To]
if varData == nil { if varData == nil {
varData = make(map[string]*VarExpireData) varData = make(map[string]*VarExpireData)
data.NewUseVar[m.From] = varData data.NewUseVar[m.To] = varData
} }
ved, ok := varData[v.Key] ved, ok := varData[v.Key]
if !ok { if !ok {
@ -282,7 +282,7 @@ func SetUserVarDataHandler(m *msg.Msg) (interface{}, error) {
data.Var[v.Key] = ved data.Var[v.Key] = ved
} }
// 保存到缓存中 // 保存到缓存中
SaveCacheVarData(GoUtil.GetVarKey(m.From), data.NewUseVar[m.From]) SaveCacheVarData(GoUtil.GetVarKey(m.To), data.NewUseVar[m.From])
return nil, nil return nil, nil
} }