From 027426259110700e446938bff03000f8bb68866c Mon Sep 17 00:00:00 2001 From: "DESKTOP-V763RJ7\\Administrator" <835606593@qq.com> Date: Wed, 17 Dec 2025 09:54:24 +0800 Subject: [PATCH] =?UTF-8?q?feat=20=E7=A8=B3=E5=AE=9A300=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Server/common/discover/instance.go | 2 +- Server/common/net/socket/server.go | 1 + Server/common/net/socket/websocket/wsconn.go | 4 + Server/common/proto/sc/sc_pb/action.pb.go | 105 ++++--- .../proto/ss/grpc_pb/service_scene.pb.go | 262 +++++++++++++++--- .../proto/ss/grpc_pb/service_scene_grpc.pb.go | 36 +++ Server/gateway/config/config.prod.yaml | 6 +- Server/gateway/grpc_server/server/server.go | 1 + Server/gateway/handler/ws_handler/client.go | 17 +- Server/gateway/handler/ws_handler/handler.go | 35 ++- Server/gateway/handler/ws_handler/manager.go | 12 +- Server/gateway/net/ws_gateway/server.go | 6 +- Server/scene/grpc_server/server/server.go | 25 +- Server/scene/instance/instance.go | 40 +-- Server/scene/npc/npc.go | 51 ---- Server/scene/npc/player.go | 98 +++---- 16 files changed, 467 insertions(+), 234 deletions(-) diff --git a/Server/common/discover/instance.go b/Server/common/discover/instance.go index 8f10241..bf2a639 100644 --- a/Server/common/discover/instance.go +++ b/Server/common/discover/instance.go @@ -33,7 +33,7 @@ func FindInstanceByUniqueNo(uniqueNO int64) (sid string) { } // RegisterInstance 注册副本 -func RegisterInstance(sid int64, instanceID int, uniqueNo, ttl int64) error { +func RegisterInstance(sid int64, instanceID int32, uniqueNo, ttl int64) error { serverMU.Lock() defer serverMU.Unlock() leaseID, err := common.NewLeaseAndKeepAlive(ttl) diff --git a/Server/common/net/socket/server.go b/Server/common/net/socket/server.go index 2b799f4..d16e048 100644 --- a/Server/common/net/socket/server.go +++ b/Server/common/net/socket/server.go @@ -44,4 +44,5 @@ type ISocketConn interface { Ping() error // 需要隔一段时间调用一下，建议20s Write(data []byte) error Close() error + IsClose() bool } diff --git a/Server/common/net/socket/websocket/wsconn.go b/Server/common/net/socket/websocket/wsconn.go index 80c0105..fb107e0 100644 --- a/Server/common/net/socket/websocket/wsconn.go +++ b/Server/common/net/socket/websocket/wsconn.go @@ -197,6 +197,10 @@ func (w *WSConn) Close() (err error) { return w.write(make([]byte, 0), ws.OpClose) } +func (w *WSConn) IsClose() bool { + return w.isClose +} + func (w *WSConn) write(data []byte, opCode ws.OpCode) error { if w.isClose { return errors.New("connection has close") diff --git a/Server/common/proto/sc/sc_pb/action.pb.go b/Server/common/proto/sc/sc_pb/action.pb.go index cb9977a..13d5ccc 100644 --- a/Server/common/proto/sc/sc_pb/action.pb.go +++ b/Server/common/proto/sc/sc_pb/action.pb.go @@ -25,19 +25,19 @@ const ( type ActionID int32 const ( - ActionID_ACTION_ID_MOVE ActionID = 0 // 0-15都是移动指令 - ActionID_ACTION_ID_ATTACK ActionID = 16 // 攻击指令 + ActionID_ACTION_ID_MOVE ActionID = 0 // 移动 + ActionID_ACTION_ID_ATTACK ActionID = 1 // 攻击 ) // Enum value maps for ActionID. var ( ActionID_name = map[int32]string{ - 0: "ACTION_ID_MOVE", - 16: "ACTION_ID_ATTACK", + 0: "ACTION_ID_MOVE", + 1: "ACTION_ID_ATTACK", } ActionID_value = map[string]int32{ "ACTION_ID_MOVE": 0, - "ACTION_ID_ATTACK": 16, + "ACTION_ID_ATTACK": 1, } ) @@ -168,8 +168,12 @@ type C2S_Action struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - Action ActionID `protobuf:"varint,1,opt,name=Action,proto3,enum=ActionID" json:"Action,omitempty"` // 指令ID - Payload []byte `protobuf:"bytes,2,opt,name=Payload,proto3" json:"Payload,omitempty"` // 指令数据 + Sequence uint32 `protobuf:"varint,1,opt,name=Sequence,proto3" json:"Sequence,omitempty"` // 指令序号 + Timestamp int64 `protobuf:"varint,2,opt,name=Timestamp,proto3" json:"Timestamp,omitempty"` // 时间戳（毫秒） + Action ActionID `protobuf:"varint,3,opt,name=Action,proto3,enum=ActionID" json:"Action,omitempty"` // 指令ID + DirX int32 `protobuf:"zigzag32,4,opt,name=DirX,proto3" json:"DirX,omitempty"` // 移动-X方向（×100 缩放） + DirY int32 `protobuf:"zigzag32,5,opt,name=DirY,proto3" json:"DirY,omitempty"` // 移动-Y方向（×100 缩放） + SkillID int32 `protobuf:"varint,6,opt,name=SkillID,proto3" json:"SkillID,omitempty"` // 攻击-技能ID } func (x *C2S_Action) Reset() { @@ -204,6 +208,20 @@ func (*C2S_Action) Descriptor() ([]byte, []int) { return file_action_proto_rawDescGZIP(), []int{2} } +func (x *C2S_Action) GetSequence() uint32 { + if x != nil { + return x.Sequence + } + return 0 +} + +func (x *C2S_Action) GetTimestamp() int64 { + if x != nil { + return x.Timestamp + } + return 0 +} + func (x *C2S_Action) GetAction() ActionID { if x != nil { return x.Action @@ -211,11 +229,25 @@ func (x *C2S_Action) GetAction() ActionID { return ActionID_ACTION_ID_MOVE } -func (x *C2S_Action) GetPayload() []byte { +func (x *C2S_Action) GetDirX() int32 { if x != nil { - return x.Payload + return x.DirX } - return nil + return 0 +} + +func (x *C2S_Action) GetDirY() int32 { + if x != nil { + return x.DirY + } + return 0 +} + +func (x *C2S_Action) GetSkillID() int32 { + if x != nil { + return x.SkillID + } + return 0 } // MESSAGE_ID_POSITION @@ -224,9 +256,9 @@ type PositionInfo struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UID int32 `protobuf:"varint,1,opt,name=UID,proto3" json:"UID,omitempty"` - X float64 `protobuf:"fixed64,2,opt,name=X,proto3" json:"X,omitempty"` - Y float64 `protobuf:"fixed64,3,opt,name=Y,proto3" json:"Y,omitempty"` + UID int32 `protobuf:"varint,1,opt,name=UID,proto3" json:"UID,omitempty"` + X int32 `protobuf:"zigzag32,2,opt,name=X,proto3" json:"X,omitempty"` + Y int32 `protobuf:"zigzag32,3,opt,name=Y,proto3" json:"Y,omitempty"` } func (x *PositionInfo) Reset() { @@ -268,14 +300,14 @@ func (x *PositionInfo) GetUID() int32 { return 0 } -func (x *PositionInfo) GetX() float64 { +func (x *PositionInfo) GetX() int32 { if x != nil { return x.X } return 0 } -func (x *PositionInfo) GetY() float64 { +func (x *PositionInfo) GetY() int32 { if x != nil { return x.Y } @@ -340,24 +372,31 @@ var file_action_proto_rawDesc = []byte{ 0x63, 0x65, 0x49, 0x44, 0x22, 0x36, 0x0a, 0x11, 0x53, 0x32, 0x43, 0x5f, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x12, 0x21, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, - 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0x49, 0x0a, 0x0a, - 0x43, 0x32, 0x53, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x06, 0x41, 0x63, - 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x41, 0x63, 0x74, - 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, - 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, - 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x3c, 0x0a, 0x0c, 0x50, 0x6f, 0x73, 0x69, 0x74, - 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x49, 0x44, 0x18, 0x01, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x55, 0x49, 0x44, 0x12, 0x0c, 0x0a, 0x01, 0x58, 0x18, 0x02, - 0x20, 0x01, 0x28, 0x01, 0x52, 0x01, 0x58, 0x12, 0x0c, 0x0a, 0x01, 0x59, 0x18, 0x03, 0x20, 0x01, - 0x28, 0x01, 0x52, 0x01, 0x59, 0x22, 0x31, 0x0a, 0x0c, 0x53, 0x32, 0x43, 0x5f, 0x50, 0x6f, 0x73, - 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, - 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, - 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x2a, 0x34, 0x0a, 0x08, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x49, - 0x44, 0x5f, 0x4d, 0x4f, 0x56, 0x45, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x41, 0x43, 0x54, 0x49, - 0x4f, 0x4e, 0x5f, 0x49, 0x44, 0x5f, 0x41, 0x54, 0x54, 0x41, 0x43, 0x4b, 0x10, 0x10, 0x42, 0x17, - 0x5a, 0x15, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, - 0x63, 0x2f, 0x73, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x22, 0xab, 0x01, 0x0a, + 0x0a, 0x43, 0x32, 0x53, 0x5f, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x1a, 0x0a, 0x08, 0x53, + 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0d, 0x52, 0x08, 0x53, + 0x65, 0x71, 0x75, 0x65, 0x6e, 0x63, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x54, 0x69, 0x6d, 0x65, 0x73, + 0x74, 0x61, 0x6d, 0x70, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x09, 0x54, 0x69, 0x6d, 0x65, + 0x73, 0x74, 0x61, 0x6d, 0x70, 0x12, 0x21, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x0e, 0x32, 0x09, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, + 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, 0x44, 0x69, 0x72, 0x58, + 0x18, 0x04, 0x20, 0x01, 0x28, 0x11, 0x52, 0x04, 0x44, 0x69, 0x72, 0x58, 0x12, 0x12, 0x0a, 0x04, + 0x44, 0x69, 0x72, 0x59, 0x18, 0x05, 0x20, 0x01, 0x28, 0x11, 0x52, 0x04, 0x44, 0x69, 0x72, 0x59, + 0x12, 0x18, 0x0a, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, 0x06, 0x20, 0x01, 0x28, + 0x05, 0x52, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x22, 0x3c, 0x0a, 0x0c, 0x50, 0x6f, + 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x49, + 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x55, 0x49, 0x44, 0x12, 0x0c, 0x0a, 0x01, + 0x58, 0x18, 0x02, 0x20, 0x01, 0x28, 0x11, 0x52, 0x01, 0x58, 0x12, 0x0c, 0x0a, 0x01, 0x59, 0x18, + 0x03, 0x20, 0x01, 0x28, 0x11, 0x52, 0x01, 0x59, 0x22, 0x31, 0x0a, 0x0c, 0x53, 0x32, 0x43, 0x5f, + 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x21, 0x0a, 0x04, 0x49, 0x6e, 0x66, 0x6f, + 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x50, 0x6f, 0x73, 0x69, 0x74, 0x69, 0x6f, + 0x6e, 0x49, 0x6e, 0x66, 0x6f, 0x52, 0x04, 0x49, 0x6e, 0x66, 0x6f, 0x2a, 0x34, 0x0a, 0x08, 0x41, + 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x49, 0x44, 0x12, 0x12, 0x0a, 0x0e, 0x41, 0x43, 0x54, 0x49, 0x4f, + 0x4e, 0x5f, 0x49, 0x44, 0x5f, 0x4d, 0x4f, 0x56, 0x45, 0x10, 0x00, 0x12, 0x14, 0x0a, 0x10, 0x41, + 0x43, 0x54, 0x49, 0x4f, 0x4e, 0x5f, 0x49, 0x44, 0x5f, 0x41, 0x54, 0x54, 0x41, 0x43, 0x4b, 0x10, + 0x01, 0x42, 0x17, 0x5a, 0x15, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x2f, 0x73, 0x63, 0x2f, 0x73, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, + 0x6f, 0x33, } var ( diff --git a/Server/common/proto/ss/grpc_pb/service_scene.pb.go b/Server/common/proto/ss/grpc_pb/service_scene.pb.go index a1d0386..ec32954 100644 --- a/Server/common/proto/ss/grpc_pb/service_scene.pb.go +++ b/Server/common/proto/ss/grpc_pb/service_scene.pb.go @@ -89,8 +89,10 @@ type EnterResp struct { sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - SceneSID int64 `protobuf:"varint,1,opt,name=SceneSID,proto3" json:"SceneSID,omitempty"` // 场景服务ID - UniqueNo int64 `protobuf:"varint,2,opt,name=UniqueNo,proto3" json:"UniqueNo,omitempty"` // 副本唯一编号 + SceneSID int64 `protobuf:"varint,1,opt,name=SceneSID,proto3" json:"SceneSID,omitempty"` // 场景服务ID + UniqueNo int64 `protobuf:"varint,2,opt,name=UniqueNo,proto3" json:"UniqueNo,omitempty"` // 副本唯一编号 + MessageID int32 `protobuf:"varint,3,opt,name=MessageID,proto3" json:"MessageID,omitempty"` // 发送给客户端的消息ID + Payload []byte `protobuf:"bytes,4,opt,name=Payload,proto3" json:"Payload,omitempty"` // 消息负载 } func (x *EnterResp) Reset() { @@ -139,21 +141,146 @@ func (x *EnterResp) GetUniqueNo() int64 { return 0 } +func (x *EnterResp) GetMessageID() int32 { + if x != nil { + return x.MessageID + } + return 0 +} + +func (x *EnterResp) GetPayload() []byte { + if x != nil { + return x.Payload + } + return nil +} + +type LeaveReq struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields + + UID int32 `protobuf:"varint,1,opt,name=UID,proto3" json:"UID,omitempty"` // 用户ID + GatewaySID int64 `protobuf:"varint,2,opt,name=GatewaySID,proto3" json:"GatewaySID,omitempty"` // 网关服务ID + InstanceID int32 `protobuf:"varint,3,opt,name=InstanceID,proto3" json:"InstanceID,omitempty"` // 副本ID + UniqueNo int64 `protobuf:"varint,4,opt,name=UniqueNo,proto3" json:"UniqueNo,omitempty"` // 副本唯一编号 +} + +func (x *LeaveReq) Reset() { + *x = LeaveReq{} + if protoimpl.UnsafeEnabled { + mi := &file_service_scene_proto_msgTypes[2] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LeaveReq) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LeaveReq) ProtoMessage() {} + +func (x *LeaveReq) ProtoReflect() protoreflect.Message { + mi := &file_service_scene_proto_msgTypes[2] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use LeaveReq.ProtoReflect.Descriptor instead. +func (*LeaveReq) Descriptor() ([]byte, []int) { + return file_service_scene_proto_rawDescGZIP(), []int{2} +} + +func (x *LeaveReq) GetUID() int32 { + if x != nil { + return x.UID + } + return 0 +} + +func (x *LeaveReq) GetGatewaySID() int64 { + if x != nil { + return x.GatewaySID + } + return 0 +} + +func (x *LeaveReq) GetInstanceID() int32 { + if x != nil { + return x.InstanceID + } + return 0 +} + +func (x *LeaveReq) GetUniqueNo() int64 { + if x != nil { + return x.UniqueNo + } + return 0 +} + +type LeaveResp struct { + state protoimpl.MessageState + sizeCache protoimpl.SizeCache + unknownFields protoimpl.UnknownFields +} + +func (x *LeaveResp) Reset() { + *x = LeaveResp{} + if protoimpl.UnsafeEnabled { + mi := &file_service_scene_proto_msgTypes[3] + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + ms.StoreMessageInfo(mi) + } +} + +func (x *LeaveResp) String() string { + return protoimpl.X.MessageStringOf(x) +} + +func (*LeaveResp) ProtoMessage() {} + +func (x *LeaveResp) ProtoReflect() protoreflect.Message { + mi := &file_service_scene_proto_msgTypes[3] + if protoimpl.UnsafeEnabled && x != nil { + ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) + if ms.LoadMessageInfo() == nil { + ms.StoreMessageInfo(mi) + } + return ms + } + return mi.MessageOf(x) +} + +// Deprecated: Use LeaveResp.ProtoReflect.Descriptor instead. +func (*LeaveResp) Descriptor() ([]byte, []int) { + return file_service_scene_proto_rawDescGZIP(), []int{3} +} + type ActionReq struct { state protoimpl.MessageState sizeCache protoimpl.SizeCache unknownFields protoimpl.UnknownFields - UniqueNo int64 `protobuf:"varint,1,opt,name=UniqueNo,proto3" json:"UniqueNo,omitempty"` // 副本唯一编号 - UID int32 `protobuf:"varint,2,opt,name=UID,proto3" json:"UID,omitempty"` // 用户ID - Action int32 `protobuf:"varint,3,opt,name=Action,proto3" json:"Action,omitempty"` // 动作ID - Payload []byte `protobuf:"bytes,4,opt,name=Payload,proto3" json:"Payload,omitempty"` // 动作数据 + UniqueNo int64 `protobuf:"varint,1,opt,name=UniqueNo,proto3" json:"UniqueNo,omitempty"` // 副本唯一编号 + UID int32 `protobuf:"varint,2,opt,name=UID,proto3" json:"UID,omitempty"` // 用户ID + Action int32 `protobuf:"varint,3,opt,name=Action,proto3" json:"Action,omitempty"` // 指令ID + DirX int32 `protobuf:"zigzag32,4,opt,name=DirX,proto3" json:"DirX,omitempty"` // 移动-X方向（×1000 缩放） + DirY int32 `protobuf:"zigzag32,5,opt,name=DirY,proto3" json:"DirY,omitempty"` // 移动-Y方向（×1000 缩放） + SkillID int32 `protobuf:"varint,6,opt,name=SkillID,proto3" json:"SkillID,omitempty"` // 攻击-技能ID } func (x *ActionReq) Reset() { *x = ActionReq{} if protoimpl.UnsafeEnabled { - mi := &file_service_scene_proto_msgTypes[2] + mi := &file_service_scene_proto_msgTypes[4] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -166,7 +293,7 @@ func (x *ActionReq) String() string { func (*ActionReq) ProtoMessage() {} func (x *ActionReq) ProtoReflect() protoreflect.Message { - mi := &file_service_scene_proto_msgTypes[2] + mi := &file_service_scene_proto_msgTypes[4] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -179,7 +306,7 @@ func (x *ActionReq) ProtoReflect() protoreflect.Message { // Deprecated: Use ActionReq.ProtoReflect.Descriptor instead. func (*ActionReq) Descriptor() ([]byte, []int) { - return file_service_scene_proto_rawDescGZIP(), []int{2} + return file_service_scene_proto_rawDescGZIP(), []int{4} } func (x *ActionReq) GetUniqueNo() int64 { @@ -203,11 +330,25 @@ func (x *ActionReq) GetAction() int32 { return 0 } -func (x *ActionReq) GetPayload() []byte { +func (x *ActionReq) GetDirX() int32 { if x != nil { - return x.Payload + return x.DirX } - return nil + return 0 +} + +func (x *ActionReq) GetDirY() int32 { + if x != nil { + return x.DirY + } + return 0 +} + +func (x *ActionReq) GetSkillID() int32 { + if x != nil { + return x.SkillID + } + return 0 } type ActionResp struct { @@ -219,7 +360,7 @@ type ActionResp struct { func (x *ActionResp) Reset() { *x = ActionResp{} if protoimpl.UnsafeEnabled { - mi := &file_service_scene_proto_msgTypes[3] + mi := &file_service_scene_proto_msgTypes[5] ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) ms.StoreMessageInfo(mi) } @@ -232,7 +373,7 @@ func (x *ActionResp) String() string { func (*ActionResp) ProtoMessage() {} func (x *ActionResp) ProtoReflect() protoreflect.Message { - mi := &file_service_scene_proto_msgTypes[3] + mi := &file_service_scene_proto_msgTypes[5] if protoimpl.UnsafeEnabled && x != nil { ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x)) if ms.LoadMessageInfo() == nil { @@ -245,7 +386,7 @@ func (x *ActionResp) ProtoReflect() protoreflect.Message { // Deprecated: Use ActionResp.ProtoReflect.Descriptor instead. func (*ActionResp) Descriptor() ([]byte, []int) { - return file_service_scene_proto_rawDescGZIP(), []int{3} + return file_service_scene_proto_rawDescGZIP(), []int{5} } var File_service_scene_proto protoreflect.FileDescriptor @@ -259,26 +400,43 @@ var file_service_scene_proto_rawDesc = []byte{ 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x0a, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x49, 0x44, 0x12, 0x1e, 0x0a, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, - 0x63, 0x65, 0x49, 0x44, 0x22, 0x43, 0x0a, 0x09, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, + 0x63, 0x65, 0x49, 0x44, 0x22, 0x7b, 0x0a, 0x09, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1a, 0x0a, 0x08, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x53, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x53, 0x49, 0x44, 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4e, 0x6f, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, - 0x08, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4e, 0x6f, 0x22, 0x6b, 0x0a, 0x09, 0x41, 0x63, 0x74, + 0x08, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4e, 0x6f, 0x12, 0x1c, 0x0a, 0x09, 0x4d, 0x65, 0x73, + 0x73, 0x61, 0x67, 0x65, 0x49, 0x44, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x4d, 0x65, + 0x73, 0x73, 0x61, 0x67, 0x65, 0x49, 0x44, 0x12, 0x18, 0x0a, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, + 0x61, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, + 0x64, 0x22, 0x78, 0x0a, 0x08, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, + 0x03, 0x55, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x55, 0x49, 0x44, 0x12, + 0x1e, 0x0a, 0x0a, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x49, 0x44, 0x18, 0x02, 0x20, + 0x01, 0x28, 0x03, 0x52, 0x0a, 0x47, 0x61, 0x74, 0x65, 0x77, 0x61, 0x79, 0x53, 0x49, 0x44, 0x12, + 0x1e, 0x0a, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x44, 0x18, 0x03, 0x20, + 0x01, 0x28, 0x05, 0x52, 0x0a, 0x49, 0x6e, 0x73, 0x74, 0x61, 0x6e, 0x63, 0x65, 0x49, 0x44, 0x12, + 0x1a, 0x0a, 0x08, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4e, 0x6f, 0x18, 0x04, 0x20, 0x01, 0x28, + 0x03, 0x52, 0x08, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4e, 0x6f, 0x22, 0x0b, 0x0a, 0x09, 0x4c, + 0x65, 0x61, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x93, 0x01, 0x0a, 0x09, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x12, 0x1a, 0x0a, 0x08, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4e, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x55, 0x6e, 0x69, 0x71, 0x75, 0x65, 0x4e, 0x6f, 0x12, 0x10, 0x0a, 0x03, 0x55, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x55, 0x49, 0x44, 0x12, 0x16, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x18, 0x03, - 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x18, 0x0a, 0x07, - 0x50, 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x07, 0x50, - 0x61, 0x79, 0x6c, 0x6f, 0x61, 0x64, 0x22, 0x0c, 0x0a, 0x0a, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, - 0x52, 0x65, 0x73, 0x70, 0x32, 0x50, 0x0a, 0x05, 0x53, 0x63, 0x65, 0x6e, 0x65, 0x12, 0x20, 0x0a, - 0x05, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x09, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x65, - 0x71, 0x1a, 0x0a, 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, - 0x25, 0x0a, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x0a, 0x2e, 0x41, 0x63, 0x74, 0x69, - 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, 0x0b, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, - 0x73, 0x70, 0x22, 0x00, 0x28, 0x01, 0x42, 0x19, 0x5a, 0x17, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, - 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x2f, 0x73, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x70, - 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, + 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x12, 0x12, 0x0a, 0x04, + 0x44, 0x69, 0x72, 0x58, 0x18, 0x04, 0x20, 0x01, 0x28, 0x11, 0x52, 0x04, 0x44, 0x69, 0x72, 0x58, + 0x12, 0x12, 0x0a, 0x04, 0x44, 0x69, 0x72, 0x59, 0x18, 0x05, 0x20, 0x01, 0x28, 0x11, 0x52, 0x04, + 0x44, 0x69, 0x72, 0x59, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x18, + 0x06, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x49, 0x44, 0x22, 0x0c, + 0x0a, 0x0a, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x32, 0x72, 0x0a, 0x05, + 0x53, 0x63, 0x65, 0x6e, 0x65, 0x12, 0x20, 0x0a, 0x05, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x12, 0x09, + 0x2e, 0x45, 0x6e, 0x74, 0x65, 0x72, 0x52, 0x65, 0x71, 0x1a, 0x0a, 0x2e, 0x45, 0x6e, 0x74, 0x65, + 0x72, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x20, 0x0a, 0x05, 0x4c, 0x65, 0x61, 0x76, 0x65, + 0x12, 0x09, 0x2e, 0x4c, 0x65, 0x61, 0x76, 0x65, 0x52, 0x65, 0x71, 0x1a, 0x0a, 0x2e, 0x4c, 0x65, + 0x61, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x12, 0x25, 0x0a, 0x06, 0x41, 0x63, 0x74, + 0x69, 0x6f, 0x6e, 0x12, 0x0a, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x71, 0x1a, + 0x0b, 0x2e, 0x41, 0x63, 0x74, 0x69, 0x6f, 0x6e, 0x52, 0x65, 0x73, 0x70, 0x22, 0x00, 0x28, 0x01, + 0x42, 0x19, 0x5a, 0x17, 0x63, 0x6f, 0x6d, 0x6d, 0x6f, 0x6e, 0x2f, 0x70, 0x72, 0x6f, 0x74, 0x6f, + 0x2f, 0x73, 0x73, 0x2f, 0x67, 0x72, 0x70, 0x63, 0x5f, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, + 0x74, 0x6f, 0x33, } var ( @@ -293,20 +451,24 @@ func file_service_scene_proto_rawDescGZIP() []byte { return file_service_scene_proto_rawDescData } -var file_service_scene_proto_msgTypes = make([]protoimpl.MessageInfo, 4) +var file_service_scene_proto_msgTypes = make([]protoimpl.MessageInfo, 6) var file_service_scene_proto_goTypes = []interface{}{ (*EnterReq)(nil), // 0: EnterReq (*EnterResp)(nil), // 1: EnterResp - (*ActionReq)(nil), // 2: ActionReq - (*ActionResp)(nil), // 3: ActionResp + (*LeaveReq)(nil), // 2: LeaveReq + (*LeaveResp)(nil), // 3: LeaveResp + (*ActionReq)(nil), // 4: ActionReq + (*ActionResp)(nil), // 5: ActionResp } var file_service_scene_proto_depIdxs = []int32{ 0, // 0: Scene.Enter:input_type -> EnterReq - 2, // 1: Scene.Action:input_type -> ActionReq - 1, // 2: Scene.Enter:output_type -> EnterResp - 3, // 3: Scene.Action:output_type -> ActionResp - 2, // [2:4] is the sub-list for method output_type - 0, // [0:2] is the sub-list for method input_type + 2, // 1: Scene.Leave:input_type -> LeaveReq + 4, // 2: Scene.Action:input_type -> ActionReq + 1, // 3: Scene.Enter:output_type -> EnterResp + 3, // 4: Scene.Leave:output_type -> LeaveResp + 5, // 5: Scene.Action:output_type -> ActionResp + 3, // [3:6] is the sub-list for method output_type + 0, // [0:3] is the sub-list for method input_type 0, // [0:0] is the sub-list for extension type_name 0, // [0:0] is the sub-list for extension extendee 0, // [0:0] is the sub-list for field type_name @@ -343,7 +505,7 @@ func file_service_scene_proto_init() { } } file_service_scene_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} { - switch v := v.(*ActionReq); i { + switch v := v.(*LeaveReq); i { case 0: return &v.state case 1: @@ -355,6 +517,30 @@ func file_service_scene_proto_init() { } } file_service_scene_proto_msgTypes[3].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*LeaveResp); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_service_scene_proto_msgTypes[4].Exporter = func(v interface{}, i int) interface{} { + switch v := v.(*ActionReq); i { + case 0: + return &v.state + case 1: + return &v.sizeCache + case 2: + return &v.unknownFields + default: + return nil + } + } + file_service_scene_proto_msgTypes[5].Exporter = func(v interface{}, i int) interface{} { switch v := v.(*ActionResp); i { case 0: return &v.state @@ -373,7 +559,7 @@ func file_service_scene_proto_init() { GoPackagePath: reflect.TypeOf(x{}).PkgPath(), RawDescriptor: file_service_scene_proto_rawDesc, NumEnums: 0, - NumMessages: 4, + NumMessages: 6, NumExtensions: 0, NumServices: 1, }, diff --git a/Server/common/proto/ss/grpc_pb/service_scene_grpc.pb.go b/Server/common/proto/ss/grpc_pb/service_scene_grpc.pb.go index 6a7dfe0..b2063a3 100644 --- a/Server/common/proto/ss/grpc_pb/service_scene_grpc.pb.go +++ b/Server/common/proto/ss/grpc_pb/service_scene_grpc.pb.go @@ -23,6 +23,7 @@ const _ = grpc.SupportPackageIsVersion7 // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://pkg.go.dev/google.golang.org/grpc/?tab=doc#ClientConn.NewStream. type SceneClient interface { Enter(ctx context.Context, in *EnterReq, opts ...grpc.CallOption) (*EnterResp, error) + Leave(ctx context.Context, in *LeaveReq, opts ...grpc.CallOption) (*LeaveResp, error) Action(ctx context.Context, opts ...grpc.CallOption) (Scene_ActionClient, error) } @@ -43,6 +44,15 @@ func (c *sceneClient) Enter(ctx context.Context, in *EnterReq, opts ...grpc.Call return out, nil } +func (c *sceneClient) Leave(ctx context.Context, in *LeaveReq, opts ...grpc.CallOption) (*LeaveResp, error) { + out := new(LeaveResp) + err := c.cc.Invoke(ctx, "/Scene/Leave", in, out, opts...) + if err != nil { + return nil, err + } + return out, nil +} + func (c *sceneClient) Action(ctx context.Context, opts ...grpc.CallOption) (Scene_ActionClient, error) { stream, err := c.cc.NewStream(ctx, &Scene_ServiceDesc.Streams[0], "/Scene/Action", opts...) if err != nil { @@ -82,6 +92,7 @@ func (x *sceneActionClient) CloseAndRecv() (*ActionResp, error) { // for forward compatibility type SceneServer interface { Enter(context.Context, *EnterReq) (*EnterResp, error) + Leave(context.Context, *LeaveReq) (*LeaveResp, error) Action(Scene_ActionServer) error mustEmbedUnimplementedSceneServer() } @@ -93,6 +104,9 @@ type UnimplementedSceneServer struct { func (UnimplementedSceneServer) Enter(context.Context, *EnterReq) (*EnterResp, error) { return nil, status.Errorf(codes.Unimplemented, "method Enter not implemented") } +func (UnimplementedSceneServer) Leave(context.Context, *LeaveReq) (*LeaveResp, error) { + return nil, status.Errorf(codes.Unimplemented, "method Leave not implemented") +} func (UnimplementedSceneServer) Action(Scene_ActionServer) error { return status.Errorf(codes.Unimplemented, "method Action not implemented") } @@ -127,6 +141,24 @@ func _Scene_Enter_Handler(srv interface{}, ctx context.Context, dec func(interfa return interceptor(ctx, in, info, handler) } +func _Scene_Leave_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { + in := new(LeaveReq) + if err := dec(in); err != nil { + return nil, err + } + if interceptor == nil { + return srv.(SceneServer).Leave(ctx, in) + } + info := &grpc.UnaryServerInfo{ + Server: srv, + FullMethod: "/Scene/Leave", + } + handler := func(ctx context.Context, req interface{}) (interface{}, error) { + return srv.(SceneServer).Leave(ctx, req.(*LeaveReq)) + } + return interceptor(ctx, in, info, handler) +} + func _Scene_Action_Handler(srv interface{}, stream grpc.ServerStream) error { return srv.(SceneServer).Action(&sceneActionServer{stream}) } @@ -164,6 +196,10 @@ var Scene_ServiceDesc = grpc.ServiceDesc{ MethodName: "Enter", Handler: _Scene_Enter_Handler, }, + { + MethodName: "Leave", + Handler: _Scene_Leave_Handler, + }, }, Streams: []grpc.StreamDesc{ { diff --git a/Server/gateway/config/config.prod.yaml b/Server/gateway/config/config.prod.yaml index 586a8dd..227a274 100644 --- a/Server/gateway/config/config.prod.yaml +++ b/Server/gateway/config/config.prod.yaml @@ -19,11 +19,11 @@ serve: ttl: 20 socket: web: - address: "172.18.28.0" + address: "127.0.0.1" port: 8501 raw: - address: "172.18.28.0" + address: "127.0.0.1" port: 8502 http: - address: "172.18.28.0" + address: "127.0.0.1" port: 8503 diff --git a/Server/gateway/grpc_server/server/server.go b/Server/gateway/grpc_server/server/server.go index f587c22..d0a2754 100644 --- a/Server/gateway/grpc_server/server/server.go +++ b/Server/gateway/grpc_server/server/server.go @@ -28,6 +28,7 @@ func (s *Server) ToClient(server grpc_pb.Gateway_ToClientServer) error { } } else { if client := ws_handler.UserMgr.GetByUID(int(args.UID)); client != nil { + if client := ws_handler.UserMgr.GetByUID(args.UID); client != nil { client.WriteBytes(sc_pb.MessageID(args.MessageID), args.Payload) } } diff --git a/Server/gateway/handler/ws_handler/client.go b/Server/gateway/handler/ws_handler/client.go index ee74672..11e6763 100644 --- a/Server/gateway/handler/ws_handler/client.go +++ b/Server/gateway/handler/ws_handler/client.go @@ -24,13 +24,13 @@ type Client struct { cancel context.CancelFunc // 取消上下文 heartBeat time.Time // 最后一次心跳 - UID int + UID int32 // 用户ID SceneSID int64 // 场景服ID - InstanceID int - UniqueNo int64 + InstanceID int32 // 副本ID，副本类型 + UniqueNo int64 // 副本唯一编号 } -func NewClient(uid int, conn socket.ISocketConn) *Client { +func NewClient(uid int32, conn socket.ISocketConn) *Client { client := &Client{ UID: uid, conn: conn, @@ -64,7 +64,7 @@ func (c *Client) Loop() { } case <-t.C: _ = c.conn.Ping() - if time.Now().Sub(c.heartBeat) > 120*time.Second { + if time.Now().Sub(c.heartBeat) > 60*time.Second { return } } @@ -86,6 +86,9 @@ func (c *Client) OnEvent(event Event) { // WriteMessage 向客户端发送消息 func (c *Client) WriteMessage(id sc_pb.MessageID, data proto.Message) { + if c.conn.IsClose() { + return + } d, err := proto.Marshal(data) if err != nil { c.logger.Errorf("WriteMessage proto.Marshal err: %v", err) @@ -106,6 +109,9 @@ func (c *Client) WriteMessage(id sc_pb.MessageID, data proto.Message) { // WriteBytes 向客户端发送字节数据 func (c *Client) WriteBytes(id sc_pb.MessageID, data []byte) { + if c.conn.IsClose() { + return + } m, err := proto.Marshal(&sc_pb.Message{ ID: id, Payload: data, @@ -137,5 +143,6 @@ func (c *Client) onClose() { c.mailChan = nil } UserMgr.Delete(c.UID) + c.onLeave() c.Done() } diff --git a/Server/gateway/handler/ws_handler/handler.go b/Server/gateway/handler/ws_handler/handler.go index 2d57ef7..4b5087c 100644 --- a/Server/gateway/handler/ws_handler/handler.go +++ b/Server/gateway/handler/ws_handler/handler.go @@ -18,7 +18,6 @@ func (c *Client) handle(event Event) { c.cancel() return } - c.logger.Infof("收到客户端消息：%v", msg.ID) switch msg.ID { case sc_pb.MessageID_MESSAGE_ID_ENTER_INSTANCE: m := &sc_pb.C2S_EnterInstance{} @@ -49,7 +48,7 @@ func (c *Client) onEnter(msg *sc_pb.C2S_EnterInstance) { return } resp, err := client.Enter(c.ctx, &grpc_pb.EnterReq{ - UID: int32(c.UID), + UID: c.UID, GatewaySID: GatewaySID, InstanceID: msg.InstanceID, }) @@ -59,14 +58,26 @@ func (c *Client) onEnter(msg *sc_pb.C2S_EnterInstance) { } c.SceneSID = resp.SceneSID c.UniqueNo = resp.UniqueNo - c.InstanceID = int(msg.InstanceID) - c.WriteMessage(sc_pb.MessageID_MESSAGE_ID_POSITION, &sc_pb.S2C_Position{ - Info: []*sc_pb.PositionInfo{{ - UID: int32(c.UID), - X: 1, - Y: 1, - }}, + c.InstanceID = msg.InstanceID + c.WriteBytes(sc_pb.MessageID(resp.MessageID), resp.Payload) +} + +func (c *Client) onLeave() { + client, err := service.SceneNewClient(c.SceneSID) + if err != nil { + c.logger.Errorf("SceneNewClient err: %v", err) + return + } + _, err = client.Leave(c.ctx, &grpc_pb.LeaveReq{ + UID: c.UID, + GatewaySID: GatewaySID, + InstanceID: c.InstanceID, + UniqueNo: c.UniqueNo, }) + if err != nil { + c.logger.Errorf("leave err: %v", err) + return + } } func (c *Client) onAction(msg *sc_pb.C2S_Action) { @@ -75,9 +86,11 @@ func (c *Client) onAction(msg *sc_pb.C2S_Action) { } if err := stream_client.SendMessageToScene(c.SceneSID, stream_client.FunAction, &grpc_pb.ActionReq{ UniqueNo: c.UniqueNo, - UID: int32(c.UID), + UID: c.UID, Action: int32(msg.Action), - Payload: msg.Payload, + DirX: msg.DirX, + DirY: msg.DirY, + SkillID: msg.SkillID, }); err != nil { c.logger.Errorf("send action err: %v", err) } diff --git a/Server/gateway/handler/ws_handler/manager.go b/Server/gateway/handler/ws_handler/manager.go index 96b79d4..e186d2d 100644 --- a/Server/gateway/handler/ws_handler/manager.go +++ b/Server/gateway/handler/ws_handler/manager.go @@ -7,35 +7,35 @@ import ( var UserMgr *userManager type userManager struct { - userMap map[int]*Client + userMap map[int32]*Client sync.RWMutex } func init() { UserMgr = &userManager{ - userMap: make(map[int]*Client), + userMap: make(map[int32]*Client), } } -func (m *userManager) Add(uid int, client *Client) { +func (m *userManager) Add(uid int32, client *Client) { m.Lock() defer m.Unlock() m.userMap[uid] = client } -func (m *userManager) Delete(uid int) { +func (m *userManager) Delete(uid int32) { m.Lock() defer m.Unlock() delete(m.userMap, uid) } -func (m *userManager) GetAll() map[int]*Client { +func (m *userManager) GetAll() map[int32]*Client { m.RLock() defer m.RUnlock() return m.userMap } -func (m *userManager) GetByUID(uid int) *Client { +func (m *userManager) GetByUID(uid int32) *Client { m.RLock() defer m.RUnlock() return m.userMap[uid] diff --git a/Server/gateway/net/ws_gateway/server.go b/Server/gateway/net/ws_gateway/server.go index 1365392..f44dbb6 100644 --- a/Server/gateway/net/ws_gateway/server.go +++ b/Server/gateway/net/ws_gateway/server.go @@ -30,11 +30,11 @@ func (g *GatewayWsServer) OnHandShake(conn socket.ISocketConn) { if err != nil { _ = conn.Close() } - if oldClient := ws_handler.UserMgr.GetByUID(t); oldClient != nil { + if oldClient := ws_handler.UserMgr.GetByUID(int32(t)); oldClient != nil { oldClient.CloseClient() } - client := ws_handler.NewClient(t, conn) - ws_handler.UserMgr.Add(t, client) + client := ws_handler.NewClient(int32(t), conn) + ws_handler.UserMgr.Add(int32(t), client) conn.SetParam("client", client) } diff --git a/Server/scene/grpc_server/server/server.go b/Server/scene/grpc_server/server/server.go index 18f2b1a..743d806 100644 --- a/Server/scene/grpc_server/server/server.go +++ b/Server/scene/grpc_server/server/server.go @@ -2,8 +2,10 @@ package server import ( "common/log" + "common/proto/sc/sc_pb" "common/proto/ss/grpc_pb" "context" + "google.golang.org/protobuf/proto" "scene/instance" "sync" ) @@ -11,7 +13,7 @@ import ( func (s *Server) Enter(ctx context.Context, req *grpc_pb.EnterReq) (*grpc_pb.EnterResp, error) { var i *instance.Instance if len(instance.Mgr.GetAll()) == 0 { - i = instance.NewScene(s.SID, int(req.InstanceID)) + i = instance.NewScene(s.SID, req.InstanceID) i.Start(s.EtcdTTL) } else { for _, v := range instance.Mgr.GetAll() { @@ -20,12 +22,29 @@ func (s *Server) Enter(ctx context.Context, req *grpc_pb.EnterReq) (*grpc_pb.Ent } } i.EventIn <- req + + payload, _ := proto.Marshal(&sc_pb.S2C_EnterInstance{ + Info: &sc_pb.PositionInfo{ + UID: req.UID, + X: 1, + Y: 1, + }, + }) return &grpc_pb.EnterResp{ - SceneSID: s.SID, - UniqueNo: i.UniqueNo, + SceneSID: s.SID, + UniqueNo: i.UniqueNo, + MessageID: int32(sc_pb.MessageID_MESSAGE_ID_ENTER_INSTANCE), + Payload: payload, }, nil } +func (s *Server) Leave(ctx context.Context, req *grpc_pb.LeaveReq) (*grpc_pb.LeaveResp, error) { + if i := instance.Mgr.GetByUniqueNo(req.UniqueNo); i != nil { + i.EventIn <- req + } + return &grpc_pb.LeaveResp{}, nil +} + func (s *Server) Action(server grpc_pb.Scene_ActionServer) error { wg := &sync.WaitGroup{} wg.Add(1) diff --git a/Server/scene/instance/instance.go b/Server/scene/instance/instance.go index b0a6cf1..30542b5 100644 --- a/Server/scene/instance/instance.go +++ b/Server/scene/instance/instance.go @@ -19,26 +19,27 @@ import ( // Instance 场景类 type Instance struct { - wg sync.WaitGroup - players map[int]*npc.PlayerNode // 存储所有玩家节点 [uid] - ctx context.Context // 停止指令 - cancel context.CancelFunc // 停止函数 - logger *zap.SugaredLogger // 日志 + wg sync.WaitGroup + players map[int32]*npc.PlayerNode // 存储所有玩家节点 [uid] + ctx context.Context // 停止指令 + cancel context.CancelFunc // 停止函数 + logger *zap.SugaredLogger // 日志 + lastLogicTime int64 // 上次逻辑帧执行时间（毫秒时间戳） SID int64 // 服务ID - InstanceID int // 副本ID + InstanceID int32 // 副本ID UniqueNo int64 // 唯一编号 EventIn chan proto.Message // 消息入口 } // NewScene 初始化场景 -func NewScene(sid int64, instanceID int) *Instance { +func NewScene(sid int64, instanceID int32) *Instance { s := &Instance{ - players: make(map[int]*npc.PlayerNode), + players: make(map[int32]*npc.PlayerNode), SID: sid, InstanceID: instanceID, UniqueNo: utils.SnowflakeInstance().Generate().Int64(), - EventIn: make(chan proto.Message), + EventIn: make(chan proto.Message, 1024), } s.logger = log.GetLogger().Named(fmt.Sprintf("instance %v:%v", s.InstanceID, s.UniqueNo)) s.ctx, s.cancel = context.WithCancel(context.Background()) @@ -69,12 +70,15 @@ func (i *Instance) Start(ttl int64) { } // 场景心跳 tick := time.NewTicker(50 * time.Millisecond) + i.lastLogicTime = time.Now().UnixMilli() for { select { case <-i.ctx.Done(): return case <-tick.C: - i.onLogic() + now := time.Now().UnixMilli() + i.onLogic(now - i.lastLogicTime) + i.lastLogicTime = now case e := <-i.EventIn: i.onEvent(e) } @@ -87,25 +91,27 @@ func (i *Instance) Start(ttl int64) { func (i *Instance) onEvent(e proto.Message) { switch v := e.(type) { case *grpc_pb.EnterReq: - i.players[int(v.UID)] = npc.NewPlayerNode(v.GatewaySID, int(v.UID)) + i.players[v.UID] = npc.NewPlayerNode(v.GatewaySID, v.UID) case *grpc_pb.ActionReq: - if node, ok := i.players[int(v.UID)]; ok { + if node, ok := i.players[v.UID]; ok { node.AddAction(v) } + case *grpc_pb.LeaveReq: + delete(i.players, v.UID) } } // 逻辑帧 -func (i *Instance) onLogic() { +func (i *Instance) onLogic(delta int64) { positionUpdate := make([]*sc_pb.PositionInfo, 0) sid := int64(0) - // 优先处理移动指令 + // 处理玩家指令 for _, node := range i.players { - if node.LogicMove() { + if node.LogicAction(delta) { positionUpdate = append(positionUpdate, &sc_pb.PositionInfo{ UID: int32(node.UID), - X: node.Position[0], - Y: node.Position[1], + X: int32(node.Position[0] * 100), + Y: int32(node.Position[1] * 100), }) sid = node.GatewaySID } diff --git a/Server/scene/npc/npc.go b/Server/scene/npc/npc.go index 98291fe..49ab661 100644 --- a/Server/scene/npc/npc.go +++ b/Server/scene/npc/npc.go @@ -23,54 +23,3 @@ func NewNPCNode(gatewaySID int64, uid int) *NPCNode { Action: make([]*grpc_pb.ActionReq, 0), } } - -// 逻辑帧-移动 -func (p *NPCNode) logicMove() bool { - if p.MoveCross&DirUp != 0 && p.MoveCross&DirDown != 0 { - p.MoveCross &^= DirUp | DirDown - } - if p.MoveCross&DirLeft != 0 && p.MoveCross&DirRight != 0 { - p.MoveCross &^= DirLeft | DirRight - } - - var moveX, moveY float64 - if p.MoveCross&DirUp != 0 { - moveY += 1 - } - if p.MoveCross&DirDown != 0 { - moveY -= 1 - } - if p.MoveCross&DirLeft != 0 { - moveX -= 1 - } - if p.MoveCross&DirRight != 0 { - moveX += 1 - } - // 没有移动 - if moveX == 0 && moveY == 0 { - return false - } - - if moveX != 0 && moveY != 0 { - const diagonalFactor = 0.7071 - moveX *= diagonalFactor - moveY *= diagonalFactor - } - - speed := 10.0 - p.Position[0] += moveX * speed - p.Position[1] += moveY * speed - if p.Position[0] < 0 { - p.Position[0] = 0 - } - if p.Position[0] > 400 { - p.Position[0] = 400 - } - if p.Position[1] < 0 { - p.Position[1] = 0 - } - if p.Position[1] > 400 { - p.Position[1] = 400 - } - return true -} diff --git a/Server/scene/npc/player.go b/Server/scene/npc/player.go index 97174aa..3f9ef8c 100644 --- a/Server/scene/npc/player.go +++ b/Server/scene/npc/player.go @@ -1,92 +1,64 @@ package npc import ( + "common/proto/sc/sc_pb" "common/proto/ss/grpc_pb" ) // PlayerNode 定义玩家节点结构体 type PlayerNode struct { - UID int // 用户ID - GatewaySID int64 // 网关服务ID + UID int32 // 用户ID + GatewaySID int64 // 网关服务ID + MoveSpeed float32 // 移动速度 - Position [2]float64 // 二维坐标 [x, y] - MoveCross int8 // 移动十字，1 上 2 下 4 左 8 右 - Action []*grpc_pb.ActionReq // 其他操作 + Position [2]float32 // 二维坐标 [x, y] + MoveDirection [2]int8 // 移动方向 [x, y] + MoveCount int8 // 移动指令使用计数 + Action []*grpc_pb.ActionReq // 其他操作 } -func NewPlayerNode(gatewaySID int64, uid int) *PlayerNode { +func NewPlayerNode(gatewaySID int64, uid int32) *PlayerNode { return &PlayerNode{ UID: uid, GatewaySID: gatewaySID, - Position: [2]float64{0, 0}, - MoveCross: 0, + MoveSpeed: 5 * 0.00001, + Position: [2]float32{0, 0}, Action: make([]*grpc_pb.ActionReq, 0), } } // AddAction 将指令存储到玩家身上 func (p *PlayerNode) AddAction(e *grpc_pb.ActionReq) { - if e.Action < 16 { - p.MoveCross = int8(e.Action) - } else { - p.Action = append(p.Action, e) - } + p.Action = append(p.Action, e) } -const ( - DirUp int8 = 1 << iota // 1 (00000001) - DirDown // 2 (00000010) - DirLeft // 4 (00000100) - DirRight // 8 (00001000) -) +// LogicAction 处理玩家操作指令 +// return 是否更新玩家状态 +func (p *PlayerNode) LogicAction(delta int64) bool { + for _, a := range p.Action { + switch sc_pb.ActionID(a.Action) { + case sc_pb.ActionID_ACTION_ID_MOVE: + p.MoveDirection = [2]int8{int8(a.DirX), int8(a.DirY)} + p.MoveCount = 0 + case sc_pb.ActionID_ACTION_ID_ATTACK: + } + } + p.Action = make([]*grpc_pb.ActionReq, 0) -// LogicMove 逻辑帧-移动 -func (p *PlayerNode) LogicMove() bool { - if p.MoveCross&DirUp != 0 && p.MoveCross&DirDown != 0 { - p.MoveCross &^= DirUp | DirDown - } - if p.MoveCross&DirLeft != 0 && p.MoveCross&DirRight != 0 { - p.MoveCross &^= DirLeft | DirRight - } + return p.move(delta) +} - var moveX, moveY float64 - if p.MoveCross&DirUp != 0 { - moveY += 1 - } - if p.MoveCross&DirDown != 0 { - moveY -= 1 - } - if p.MoveCross&DirLeft != 0 { - moveX -= 1 - } - if p.MoveCross&DirRight != 0 { - moveX += 1 - } - // 没有移动 - if moveX == 0 && moveY == 0 { +func (p *PlayerNode) move(delta int64) bool { + if p.MoveDirection[0] == 0 && p.MoveDirection[1] == 0 { return false } - - if moveX != 0 && moveY != 0 { - const diagonalFactor = 0.7071 - moveX *= diagonalFactor - moveY *= diagonalFactor - } - - speed := 10.0 - p.Position[0] += moveX * speed - p.Position[1] += moveY * speed - if p.Position[0] < 0 { - p.Position[0] = 0 - } - if p.Position[0] > 400 { - p.Position[0] = 400 - } - if p.Position[1] < 0 { - p.Position[1] = 0 - } - if p.Position[1] > 400 { - p.Position[1] = 400 + // 移动指令只能用2秒，客户端需要定期续上 + if p.MoveCount >= 40 { + p.MoveDirection = [2]int8{0, 0} + return false } + p.Position[0] += float32(p.MoveDirection[0]) * float32(delta) * p.MoveSpeed + p.Position[1] += float32(p.MoveDirection[1]) * float32(delta) * p.MoveSpeed + p.MoveCount++ return true }