diff --git a/modules/gameinvite/api_accept.go b/modules/gameinvite/api_accept.go index d67dda2d8..87eae0e77 100644 --- a/modules/gameinvite/api_accept.go +++ b/modules/gameinvite/api_accept.go @@ -28,6 +28,7 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR blueRecord *pb.GameInviteQiecuoRecord sessions []comm.IUserSession gamedata *pb.GameInviteData + timeout int32 = 10 rules string roomid string ok bool @@ -66,10 +67,18 @@ func (this *apiComp) Accept(session comm.IUserSession, req *pb.GameInviteAcceptR } return } + + switch req.Gtype { + case 0, 1, 2, 3, 4: + timeout = 10 + case 5: + timeout = 60 + } + rules = gamedata.Rules for _, v := range gamedata.Targets { if v.Uid == session.GetUserId() { - if configure.Now().Sub(time.Unix(v.Timestamp, 0)).Seconds() > 10 { + if configure.Now().Sub(time.Unix(v.Timestamp, 0)).Seconds() > float64(timeout) { errdata = &pb.ErrorData{ Code: pb.ErrorCode_PracticeInviteTimeOut, Title: pb.ErrorCode_PracticeInviteTimeOut.ToString(), diff --git a/modules/gameinvite/api_qiecuo.go b/modules/gameinvite/api_qiecuo.go index ab0a90c6f..caff8e20f 100644 --- a/modules/gameinvite/api_qiecuo.go +++ b/modules/gameinvite/api_qiecuo.go @@ -27,6 +27,7 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.GameInviteQiecuoR info *pb.GameInviteQiecuoRecord gamedata *pb.GameInviteData user *pb.DBUser + timeout int32 ok bool keep bool ) @@ -77,11 +78,16 @@ func (this *apiComp) Qiecuo(session comm.IUserSession, req *pb.GameInviteQiecuoR // keep = true // } // } - + switch req.Gtype { + case 0, 1, 2, 3, 4: + timeout = 10 + case 5: + timeout = 60 + } for _, v := range gamedata.Targets { if v.Uid == req.Fid { keep = true - if configure.Now().Sub(time.Unix(v.Timestamp, 0)).Seconds() > 10 { + if configure.Now().Sub(time.Unix(v.Timestamp, 0)).Seconds() > float64(timeout) { v.Timestamp = configure.Now().Unix() } else { errdata = &pb.ErrorData{