From a991013040078d76b766b780e6b4e592fc821f78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=94=E5=BF=B5?= <12574910+72wo@users.noreply.github.com> Date: Sat, 7 Feb 2026 22:54:44 +0800 Subject: [PATCH] 1 --- common/rpc/rpc.go | 4 ++-- logic/controller/Controller.go | 2 +- logic/controller/login_main.go | 3 +-- logic/server.go | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/common/rpc/rpc.go b/common/rpc/rpc.go index afd4f105f..939d18a24 100644 --- a/common/rpc/rpc.go +++ b/common/rpc/rpc.go @@ -75,9 +75,9 @@ func StartClient(id, port uint16, callback any) *struct { RegisterLogic func(uint16, uint16) error } { - + cool.Config.File.Domain = "127.0.0.1" var rpcaddr = "ws://" + cool.Config.File.Domain + gconv.String(cool.Config.Address) + "/rpc" - //rpcaddr = "127.0.0.1" + closer1, err := jsonrpc.NewMergeClient(context.Background(), rpcaddr, "", []interface{}{ &RPCClient, diff --git a/logic/controller/Controller.go b/logic/controller/Controller.go index e022127a8..a61479b6f 100644 --- a/logic/controller/Controller.go +++ b/logic/controller/Controller.go @@ -24,7 +24,7 @@ var Maincontroller = &Controller{} //注入service // Controller 分发cmd逻辑实现 type Controller struct { Port uint16 - RPCClient struct { + RPCClient *struct { Kick func(uint32) error RegisterLogic func(uint16, uint16) error diff --git a/logic/controller/login_main.go b/logic/controller/login_main.go index daec3118e..d019ddbb2 100644 --- a/logic/controller/login_main.go +++ b/logic/controller/login_main.go @@ -30,7 +30,7 @@ func (h Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.L defer c.Close() return } - + Maincontroller.RPCClient.Kick(data.Head.UserID) //通知其他服务器踢人 currentPlayer := player.GetPlayer(c, data.Head.UserID) if currentPlayer == nil { cool.Logger.Error(context.Background(), "获取玩家失败", data.Head.UserID) @@ -39,7 +39,6 @@ func (h Controller) Login(data *user.MAIN_LOGIN_IN, c gnet.Conn) (result *user.L return } currentPlayer.Service = service.NewUserService(data.Head.UserID) - h.RPCClient.Kick(data.Head.UserID) //通知其他服务器踢人 currentPlayer.Info = currentPlayer.Service.Info.SetLogin() share.ShareManager.SetUserOnline(data.Head.UserID, h.Port) //设置用户登录服务器 diff --git a/logic/server.go b/logic/server.go index eb74437fc..c5bbf9173 100644 --- a/logic/server.go +++ b/logic/server.go @@ -78,8 +78,8 @@ func Start() { rpcClient := rpc.StartClient(serverID, uint16(port), server) //连接rpc - controller.Maincontroller.RPCClient = *rpcClient //将RPC赋值Start - controller.Maincontroller.Port = uint16(port) //赋值服务器ID + controller.Maincontroller.RPCClient = rpcClient //将RPC赋值Start + controller.Maincontroller.Port = uint16(port) //赋值服务器ID controller.Init(true) xmlres.Initfile()