diff --git a/go.mod b/go.mod index da9096b..4e30849 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,7 @@ module git.hlsq.asia/mmorpg/service-scene go 1.23.1 require ( - git.hlsq.asia/mmorpg/service-common v0.0.0-20260110153008-0be254c6a298 + git.hlsq.asia/mmorpg/service-common v0.0.0-20260112035311-ec291d4332e5 github.com/judwhite/go-svc v1.2.1 go.uber.org/zap v1.27.0 google.golang.org/grpc v1.71.1 diff --git a/go.sum b/go.sum index 43447fc..15e81e5 100644 --- a/go.sum +++ b/go.sum @@ -2,6 +2,10 @@ filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA= filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4= git.hlsq.asia/mmorpg/service-common v0.0.0-20260110153008-0be254c6a298 h1:zKQC0gqQfP9sUVYs7OsoHSrzdk379u6aenko6rMx1go= git.hlsq.asia/mmorpg/service-common v0.0.0-20260110153008-0be254c6a298/go.mod h1:xv6m1I2jUA6mudKVznygpnzMoshBQarthHD1QnkW4qc= +git.hlsq.asia/mmorpg/service-common v0.0.0-20260112034651-8c09b125a49d h1:R74eiDo6Vl04fE1Vx0X7pTkZB2o+SB5PgB3cu5/kcDo= +git.hlsq.asia/mmorpg/service-common v0.0.0-20260112034651-8c09b125a49d/go.mod h1:xv6m1I2jUA6mudKVznygpnzMoshBQarthHD1QnkW4qc= +git.hlsq.asia/mmorpg/service-common v0.0.0-20260112035311-ec291d4332e5 h1:SauhRmcRxeQj/luQRyIt9iHORp/U9cpm2I5o65rUeGg= +git.hlsq.asia/mmorpg/service-common v0.0.0-20260112035311-ec291d4332e5/go.mod h1:xv6m1I2jUA6mudKVznygpnzMoshBQarthHD1QnkW4qc= github.com/BurntSushi/toml v1.2.0 h1:Rt8g24XnyGTyglgET/PRUNlrUeu9F5L+7FilkXfZgs0= github.com/BurntSushi/toml v1.2.0/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ= github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs= diff --git a/internal/grpc_server/server/server.go b/internal/grpc_server/server/server.go index 1f81c08..5f3dfeb 100644 --- a/internal/grpc_server/server/server.go +++ b/internal/grpc_server/server/server.go @@ -3,8 +3,8 @@ package server import ( "context" "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb" "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb" - "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" instance2 "git.hlsq.asia/mmorpg/service-scene/internal/instance" "google.golang.org/protobuf/proto" "sync" diff --git a/internal/grpc_server/server/server_init.go b/internal/grpc_server/server/server_init.go index 52b2a4a..523a436 100644 --- a/internal/grpc_server/server/server_init.go +++ b/internal/grpc_server/server/server_init.go @@ -3,7 +3,7 @@ package server import ( "git.hlsq.asia/mmorpg/service-common/discover/common" "git.hlsq.asia/mmorpg/service-common/net/grpc/service" - "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb" "google.golang.org/grpc" ) diff --git a/internal/instance/instance.go b/internal/instance/instance.go index f0ad1bd..6100a00 100644 --- a/internal/instance/instance.go +++ b/internal/instance/instance.go @@ -5,8 +5,8 @@ import ( "fmt" "git.hlsq.asia/mmorpg/service-common/discover" "git.hlsq.asia/mmorpg/service-common/log" + "git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb" "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb" - "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" "git.hlsq.asia/mmorpg/service-common/utils" "git.hlsq.asia/mmorpg/service-scene/internal/grpc_server/stream_client" "git.hlsq.asia/mmorpg/service-scene/internal/npc" diff --git a/internal/npc/npc.go b/internal/npc/npc.go index 5a043ed..620d2af 100644 --- a/internal/npc/npc.go +++ b/internal/npc/npc.go @@ -1,7 +1,7 @@ package npc import ( - "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" + "git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb" ) // NPCNode 定义NPC节点 diff --git a/internal/npc/player.go b/internal/npc/player.go index 5dbdbf7..6667aa3 100644 --- a/internal/npc/player.go +++ b/internal/npc/player.go @@ -1,8 +1,8 @@ package npc import ( + "git.hlsq.asia/mmorpg/service-common/proto/rs/grpc_pb" "git.hlsq.asia/mmorpg/service-common/proto/sc/sc_pb" - "git.hlsq.asia/mmorpg/service-common/proto/ss/grpc_pb" ) // PlayerNode 定义玩家节点结构体