diff --git a/common/rpc/rpc.go b/common/rpc/rpc.go index 9ec114180..7fa8b5e82 100644 --- a/common/rpc/rpc.go +++ b/common/rpc/rpc.go @@ -35,16 +35,11 @@ func (h *ServerHandler) Kick(ctx context.Context, userid uint32) error { if err != nil { return fmt.Errorf("user not found") } - - return clientmap[useid1].KickPerson(userid) //实现指定服务器踢人 - // for _, v := range clientmap { - // err := v.KickPerson(userid) - // if err != nil { - // return fmt.Errorf("call on client: %w", err) - // } - // } - - //return nil + cl, ok := clientmap[useid1] + if ok { + return cl.KickPerson(userid) //实现指定服务器踢人 + } + return fmt.Errorf("获取数据失败") } // 注册logic服务器 diff --git a/common/socket/ServerEvent.go b/common/socket/ServerEvent.go index 6a1e778df..abf0bd482 100644 --- a/common/socket/ServerEvent.go +++ b/common/socket/ServerEvent.go @@ -6,9 +6,9 @@ import ( "sync/atomic" "time" + "blazing/cool" "blazing/logic/service/player" - "github.com/gogf/gf/v2/os/glog" "github.com/panjf2000/gnet/v2" "github.com/panjf2000/gnet/v2/pkg/logging" ) @@ -24,8 +24,9 @@ func (s *Server) Boot() error { if err != nil { return err } + // err := gnet.Run(s, s.network+"://"+s.addr, gnet.WithMulticore(s.multicore)) - glog.Debug(context.Background(), "server exits with error: %v", err) + cool.Loger.Debug(context.Background(), "server exits with error: %v", err) // logging.Infof("server exits with error: %v", err) return nil } @@ -56,13 +57,13 @@ func (s *Server) OnClose(c gnet.Conn, _ error) (action gnet.Action) { return } func (s *Server) OnTick() (delay time.Duration, action gnet.Action) { - logging.Infof("[connected-count=%v]", atomic.LoadInt64(&s.connected)) + cool.Loger.Infof(context.Background(), "[connected-count=%v]", atomic.LoadInt64(&s.connected)) return 10 * time.Second, gnet.None } func (s *Server) OnBoot(eng gnet.Engine) gnet.Action { s.eng = eng - logging.Infof("syslog server is listening on %s\n", s.addr) + cool.Loger.Infof(context.Background(), "syslog server is listening on %s\n", s.addr) return gnet.None } diff --git a/logic/service/player/player.go b/logic/service/player/player.go index 7a0f861f4..922e95bd3 100644 --- a/logic/service/player/player.go +++ b/logic/service/player/player.go @@ -290,9 +290,8 @@ func (p *Player) Save() { close(p.StopChan) //停止刷怪 p.IsLogin = false - share.ShareManager.DeleteUserOnline(p.Info.UserID) //设置用户登录服务器 - Mainplayer.Delete(p.Info.UserID) + share.ShareManager.DeleteUserOnline(p.Info.UserID) //设置用户登录服务器 } // 是否可以获得经验