diff --git a/src/server/game/player_back.go b/src/server/game/player_back.go index 2dbcbfc7..cb327656 100644 --- a/src/server/game/player_back.go +++ b/src/server/game/player_back.go @@ -156,7 +156,7 @@ func (p *Player) PlayroomBackData() { r.Unlock = PlayroomMod.GetUnlockIds() r.DailyTaskReward = GoUtil.IntToInt32(PlayroomMod.DailyTaskReward) r.DailyTask = PlayroomMod.BackDataTask() - r.Kiss = int32(p.GetPlayroomKiss()) + r.Kiss = int32(p.GetPlayroomKiss(int(p.M_DwUin))) r.Revenge = PlayroomMod.RevengeUid r.InteractNum = int32(PlayroomMod.InteractNum) r.AdItem = AdWatch @@ -195,16 +195,16 @@ func (p *Player) PlayroomVisit(Uid int) { r.Upvote = GoUtil.InArray(Uid, PlayroomMod.UpvoteList) r.Items = Items r.Status = int32(PlayroomMod.GameStatus) - r.UpvoteCount = int32(p.GetPlayroomUpvote()) - r.Chip = int32(p.GetPlayroomChip()) - r.Kiss = int32(p.GetPlayroomKiss()) + r.UpvoteCount = int32(p.GetPlayroomUpvote(Uid)) + r.Chip = int32(p.GetPlayroomChip(Uid)) + r.Kiss = int32(p.GetPlayroomKiss(Uid)) r.DressSet = GoUtil.MapIntToInt32(PlayerData.DressSet) p.PushClientRes(r) } func (p *Player) NotifyPlayroomKiss() { m := &proto.NotifyPlayroomKiss{ - Kiss: int32(p.GetPlayroomKiss()), + Kiss: int32(p.GetPlayroomKiss(int(p.M_DwUin))), } p.PushClientRes(m) } diff --git a/src/server/game/register_network_func.go b/src/server/game/register_network_func.go index fb04408c..f1461d49 100644 --- a/src/server/game/register_network_func.go +++ b/src/server/game/register_network_func.go @@ -2097,7 +2097,6 @@ func ReqCardGive(player *Player, buf []byte) error { } FriendMgrSend(m) } - player.PushClientRes(&msg.ResCardGive{ Code: msg.RES_CODE_SUCCESS, }) diff --git a/src/server/game/var.go b/src/server/game/var.go index 783db211..c8f0b8a4 100644 --- a/src/server/game/var.go +++ b/src/server/game/var.go @@ -28,9 +28,9 @@ func (p *Player) GetVarData(key string) interface{} { return cache.D } -func (p *Player) GetUserVarData(key string) interface{} { +func (p *Player) GetUserVarData(key string, PlayerId int) interface{} { cache := map[string]*VarExpireData{} - err := LoadCacheVarData(GoUtil.GetVarKey(int(p.M_DwUin)), &cache) + err := LoadCacheVarData(GoUtil.GetVarKey(int(PlayerId)), &cache) if err != nil { // log.Error("GetUserVarData err : %s, key: %s", err, key) 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) { SendMsgToCenterAsync(&msg.Msg{ - From: PlayerId, + From: int(p.M_DwUin), + To: PlayerId, + SendT: GoUtil.Now(), HandleType: msg.HANDLE_MOD_USER_VAR_SET, Extra: msg.VarData{ 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) { return SendMsgToCenterSync(&msg.Msg{ - From: PlayerId, + From: int(p.M_DwUin), + To: PlayerId, + SendT: GoUtil.Now(), HandleType: msg.HANDLE_MOD_USER_VAR_SET, Extra: msg.VarData{ Key: key, @@ -113,16 +117,16 @@ func (p *Player) SubPlayroomChip(PlayerId int) { p.SubVarDataAsync(VAR_PLAYROOM_CHIP, PlayerId) } -func (p *Player) GetPlayroomUpvote() int { - data := p.GetUserVarData(VAR_PLAYROOM_UPVOTE) +func (p *Player) GetPlayroomUpvote(PlayerId int) int { + data := p.GetUserVarData(VAR_PLAYROOM_UPVOTE, PlayerId) if data == nil { return 0 } return data.(int) } -func (p *Player) GetPlayroomChip() int { - data := p.GetUserVarData(VAR_PLAYROOM_CHIP) +func (p *Player) GetPlayroomChip(PlayerId int) int { + data := p.GetUserVarData(VAR_PLAYROOM_CHIP, PlayerId) if data == nil { return 0 } @@ -133,8 +137,8 @@ func (p *Player) SetPlayroomKiss(Kiss int, PlayerId int) { p.SetVarDataAsync(VAR_PLAYROOM_KISS, Kiss, PlayerId) } -func (p *Player) GetPlayroomKiss() int { - data := p.GetUserVarData(VAR_PLAYROOM_KISS) +func (p *Player) GetPlayroomKiss(PlayerId int) int { + data := p.GetUserVarData(VAR_PLAYROOM_KISS, PlayerId) if data == nil { return 0 } diff --git a/src/server/game/var_mgr.go b/src/server/game/var_mgr.go index e2d2b309..c5544eb0 100644 --- a/src/server/game/var_mgr.go +++ b/src/server/game/var_mgr.go @@ -246,10 +246,10 @@ func SetUserVarDataHandler(m *msg.Msg) (interface{}, error) { data.mu.Lock() defer data.mu.Unlock() if v, ok := m.Extra.(msg.VarData); ok { - varData := data.NewUseVar[m.From] + varData := data.NewUseVar[m.To] if varData == nil { varData = make(map[string]*VarExpireData) - data.NewUseVar[m.From] = varData + data.NewUseVar[m.To] = varData } ved, ok := varData[v.Key] if !ok { @@ -282,7 +282,7 @@ func SetUserVarDataHandler(m *msg.Msg) (interface{}, error) { 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 }