昔念
e2a184b687
将 `Clientmap` 从普通 map 改为 `sync.Map`，提升并发安全性。新增 `addClient` 和 `getClient` 方法封装存取逻辑，并在多处调用点进行了替换。 fix(fight): 修复战斗逻辑中技能ID与攻击时间字段引用错误 将 `attacker.AttackValue.SkillID` 和 `attacker.AttackValue.AttackTime` 的访问方式修正为正确的字段路径。 refactor(fight): 调整战斗结束信息处理流程 合并 `FightOverInfo` 结构到 `FightC` 中，简化广播发送逻辑，统一通过 `f.FightOverInfo` 发送战斗结果。 refactor(effect): 修改效果叠加判断逻辑并增强健壮性 更新效果节点比较方法，增加参数匹配检查以支持更精确的效果识别；同时添加 `equalInts` 工具函数用于数组内容对比。
151 lines
3.7 KiB
Go
151 lines
3.7 KiB
Go
package rpc
|
||
|
||
import (
|
||
"blazing/common/data/share"
|
||
"blazing/cool"
|
||
"sync"
|
||
|
||
"blazing/modules/base/service"
|
||
"context"
|
||
"fmt"
|
||
"log"
|
||
"net/http"
|
||
|
||
blservice "blazing/modules/blazing/service"
|
||
|
||
"github.com/filecoin-project/go-jsonrpc"
|
||
"github.com/gogf/gf/v2/util/gconv"
|
||
)
|
||
|
||
var rpcport = gconv.String(cool.Config.RPC)
|
||
|
||
// 定义改为sync.Map
|
||
var Clientmap sync.Map
|
||
|
||
// 存值示例
|
||
func addClient(id uint16, client *ClientHandler) {
|
||
// 普通map：Clientmap[id] = client
|
||
Clientmap.Store(id, client) // sync.Map存值
|
||
}
|
||
|
||
// 取值示例
|
||
func getClient(id uint16) (*ClientHandler, bool) {
|
||
// 普通map：client, ok := Clientmap[id]
|
||
val, ok := Clientmap.Load(id) // sync.Map取值
|
||
if !ok {
|
||
return nil, false
|
||
}
|
||
// 类型断言（确保value是*ClientHandler）
|
||
client, ok := val.(*ClientHandler)
|
||
return client, ok
|
||
}
|
||
|
||
type ClientHandler struct {
|
||
KickPerson func(uint32) error //踢人,这里是返回具体的logic
|
||
QuitSelf func(int) error //关闭服务器进程
|
||
}
|
||
|
||
// Define the server handler
|
||
type ServerHandler struct{}
|
||
|
||
// 实现踢人
|
||
func (h *ServerHandler) Kick(ctx context.Context, userid uint32) error {
|
||
|
||
cool.Loger.Info(context.TODO(), "服务器收到踢人")
|
||
useid1, err := share.ShareManager.GetUserOnline(userid)
|
||
|
||
if err != nil {
|
||
return fmt.Errorf("user not found", err)
|
||
}
|
||
|
||
cl, ok := getClient(useid1)
|
||
if ok {
|
||
err := cl.KickPerson(userid) //实现指定服务器踢人
|
||
if err != nil {
|
||
return fmt.Errorf("踢人失败", err)
|
||
}
|
||
}
|
||
return nil
|
||
}
|
||
|
||
// 注册logic服务器
|
||
func (h *ServerHandler) RegisterLogic(ctx context.Context, id, port uint16) error {
|
||
cool.Loger.Debug(context.Background(), "注册logic服务器", id, port)
|
||
|
||
//TODO 待修复滚动更新可能导致的玩家可以同时在旧服务器和新服务器同时在线的bug
|
||
revClient, ok := jsonrpc.ExtractReverseClient[ClientHandler](ctx)
|
||
if !ok {
|
||
return fmt.Errorf("no reverse client")
|
||
}
|
||
t, _ := blservice.NewLoginServiceService().GetServerID(id)
|
||
aa, ok := getClient(t)
|
||
if ok && aa != nil { //如果已经存在且这个端口已经被存过
|
||
aa.QuitSelf(0)
|
||
}
|
||
addClient(port, &revClient)
|
||
|
||
//Refurh()
|
||
return nil
|
||
|
||
}
|
||
|
||
func StartServer() {
|
||
// create a new server instance
|
||
rpcServer := jsonrpc.NewServer(jsonrpc.WithReverseClient[ClientHandler](""))
|
||
|
||
rpcServer.Register("", &ServerHandler{})
|
||
cool.Loger.Debug(context.Background(), "jsonrpc server start", rpcport)
|
||
// go time.AfterFunc(3000, func() {
|
||
// testjsonrpc()
|
||
// })
|
||
|
||
err := http.ListenAndServe("0.0.0.0:"+rpcport, rpcServer)
|
||
cool.Loger.Debug(context.Background(), "jsonrpc server fail", err)
|
||
}
|
||
|
||
var closer jsonrpc.ClientCloser
|
||
|
||
func StartClient(id, port uint16, callback any) *struct {
|
||
Kick func(uint32) error
|
||
|
||
RegisterLogic func(uint16, uint16) error
|
||
} {
|
||
|
||
var rpcaddr, _ = service.NewBaseSysParamService().DataByKey(context.Background(), "server_ip")
|
||
|
||
closer1, err := jsonrpc.NewMergeClient(context.Background(),
|
||
"ws://"+rpcaddr+":"+rpcport, "", []interface{}{
|
||
&RPCClient,
|
||
}, nil, jsonrpc.WithClientHandler("", callback),
|
||
jsonrpc.WithReconnFun(func() { RPCClient.RegisterLogic(id, port) }),
|
||
)
|
||
if err != nil {
|
||
log.Fatalf("Failed to create client: %v", err)
|
||
}
|
||
|
||
//if port != 0 { //注册logic
|
||
RPCClient.RegisterLogic(id, port)
|
||
|
||
//}
|
||
|
||
closer = closer1
|
||
return &RPCClient
|
||
}
|
||
|
||
// 关闭客户端
|
||
func CloseClient() {
|
||
if closer != nil {
|
||
closer()
|
||
}
|
||
}
|
||
|
||
// Setup RPCClient with reverse call handler
|
||
var RPCClient struct {
|
||
Kick func(uint32) error //踢人
|
||
|
||
RegisterLogic func(uint16, uint16) error
|
||
|
||
// UserLogin func(int32, int32) error //用户登录事件
|
||
// UserLogout func(int32, int32) error //用户登出事件
|
||
}
|