feat 结构调整

Server/scene/app/grpc.go

@@ -3,7 +3,7 @@ package app
 import (
 	"common/net/grpc/service"
 	"scene/config"
-	"scene/grpc_server/server"
+	"scene/internal/grpc_server/server"
 )
 
 // ModuleGrpcServer Grpc服务模块

Server/scene/internal/grpc_server/server/server.go

@@ -6,17 +6,17 @@ import (
 	"common/proto/ss/grpc_pb"
 	"context"
 	"google.golang.org/protobuf/proto"
-	"scene/instance"
+	instance2 "scene/internal/instance"
 	"sync"
 )
 
 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, req.InstanceID)
+	var i *instance2.Instance
+	if len(instance2.Mgr.GetAll()) == 0 {
+		i = instance2.NewScene(s.SID, req.InstanceID)
 		i.Start(s.EtcdTTL)
 	} else {
-		for _, v := range instance.Mgr.GetAll() {
+		for _, v := range instance2.Mgr.GetAll() {
 			i = v
 			break
 		}
@@ -39,7 +39,7 @@ func (s *Server) Enter(ctx context.Context, req *grpc_pb.EnterReq) (*grpc_pb.Ent
 }
 
 func (s *Server) Leave(ctx context.Context, req *grpc_pb.LeaveReq) (*grpc_pb.LeaveResp, error) {
-	if i := instance.Mgr.GetByUniqueNo(req.UniqueNo); i != nil {
+	if i := instance2.Mgr.GetByUniqueNo(req.UniqueNo); i != nil {
 		i.EventIn <- req
 	}
 	return &grpc_pb.LeaveResp{}, nil
@@ -59,7 +59,7 @@ func (s *Server) Action(server grpc_pb.Scene_ActionServer) error {
 			if args, err := server.Recv(); err != nil {
 				return
 			} else {
-				if ins := instance.Mgr.GetByUniqueNo(args.UniqueNo); ins != nil {
+				if ins := instance2.Mgr.GetByUniqueNo(args.UniqueNo); ins != nil {
 					select {
 					case ins.EventIn <- args:
 					default:

Server/scene/internal/instance/instance.go

@@ -11,8 +11,8 @@ import (
 	"go.uber.org/zap"
 	"google.golang.org/protobuf/proto"
 	"runtime/debug"
-	"scene/grpc_server/stream_client"
-	"scene/npc"
+	"scene/internal/grpc_server/stream_client"
+	"scene/internal/npc"
 	"sync"
 	"time"
 )