From 919917081773dc0e36c98a67342bca94f0bf1512 Mon Sep 17 00:00:00 2001 From: aozhiwei Date: Sat, 20 Apr 2024 15:26:22 +0800 Subject: [PATCH] 1 --- server/matchserver/common/types.go | 3 ++- server/matchserver/player/player.go | 4 ++++ server/matchserver/team/team.go | 8 ++++++++ 3 files changed, 14 insertions(+), 1 deletion(-) diff --git a/server/matchserver/common/types.go b/server/matchserver/common/types.go index 92b4ff51..053682a7 100644 --- a/server/matchserver/common/types.go +++ b/server/matchserver/common/types.go @@ -76,7 +76,7 @@ type UserQueryStatusRsp struct { Errmsg string `json:"errmsg"` Users []struct { AccountId string `json:"account_id"` - Battling string `json:"battling"` + Battling int32 `json:"battling"` } } @@ -159,6 +159,7 @@ type Player interface { GetSortIdx() int32 SetSortIdx(int32) IsBattling() bool + SetBattling(bool) GenNextCopy() Player } diff --git a/server/matchserver/player/player.go b/server/matchserver/player/player.go index c12156c2..afaf4b75 100644 --- a/server/matchserver/player/player.go +++ b/server/matchserver/player/player.go @@ -546,6 +546,10 @@ func (this *player) IsBattling() bool { return this.battling } +func (this *player) SetBattling(state bool) { + this.battling = state +} + func newPlayer() *player { hum := new(player) return hum diff --git a/server/matchserver/team/team.go b/server/matchserver/team/team.go index 37dc1823..bbe7b980 100644 --- a/server/matchserver/team/team.go +++ b/server/matchserver/team/team.go @@ -634,6 +634,14 @@ func (this *team) checkMemberState() { rspObj, func(rsp f5.HttpCliResponse) { sending = false + if rsp.GetErr() == nil && rsp.JsonParseOk() { + for _, u := range rspObj.Users { + m := this.GetMemberByAccountId(u.AccountId) + if m != nil { + m.SetBattling(u.Battling != 0) + } + } + } }) } } else {