diff --git a/DotNet/Config/Binary/SceneConfigData.bytes b/DotNet/Config/Binary/SceneConfigData.bytes index cc940095..06edf031 100644 Binary files a/DotNet/Config/Binary/SceneConfigData.bytes and b/DotNet/Config/Binary/SceneConfigData.bytes differ diff --git a/DotNet/Config/Binary/ServerConfigData.bytes b/DotNet/Config/Binary/ServerConfigData.bytes index 79df9546..52c10a3e 100644 Binary files a/DotNet/Config/Binary/ServerConfigData.bytes and b/DotNet/Config/Binary/ServerConfigData.bytes differ diff --git a/DotNet/Config/Excel/Server/SceneConfig.xlsx b/DotNet/Config/Excel/Server/SceneConfig.xlsx index 2a177c1f..01c7df48 100644 Binary files a/DotNet/Config/Excel/Server/SceneConfig.xlsx and b/DotNet/Config/Excel/Server/SceneConfig.xlsx differ diff --git a/DotNet/Config/Excel/Server/ServerConfig.xlsx b/DotNet/Config/Excel/Server/ServerConfig.xlsx index e2453f54..d399980b 100644 Binary files a/DotNet/Config/Excel/Server/ServerConfig.xlsx and b/DotNet/Config/Excel/Server/ServerConfig.xlsx differ diff --git a/DotNet/Config/Excel/Version.txt b/DotNet/Config/Excel/Version.txt index 41c291aa..981428c6 100644 --- a/DotNet/Config/Excel/Version.txt +++ b/DotNet/Config/Excel/Version.txt @@ -1 +1 @@ -{"MachineConfig":1688402650290,"SceneConfig":1688638278438,"WorldConfig":1688296851256,"ServerConfig":1688401154525} \ No newline at end of file +{"MachineConfig":1689596609276,"SceneConfig":1689619864417,"ServerConfig":1689620185714,"WorldConfig":1689267887552} \ No newline at end of file diff --git a/DotNet/Config/Json/Server/SceneConfigData.Json b/DotNet/Config/Json/Server/SceneConfigData.Json index f6662a41..8e087481 100644 --- a/DotNet/Config/Json/Server/SceneConfigData.Json +++ b/DotNet/Config/Json/Server/SceneConfigData.Json @@ -1,10 +1,7 @@ {"List":[ -{"Id":1,"EntityId":17246978048,"RouteId":1024,"WorldId":1,"SceneType":"Gate","Name":"Gate","NetworkProtocol":"KCP","OuterPort":20000}, -{"Id":2,"EntityId":34493956096,"RouteId":2048,"WorldId":1,"SceneType":"Addressable","Name":"Addressable1","NetworkProtocol":null,"OuterPort":0}, -{"Id":4,"EntityId":68920803328,"RouteId":3072,"WorldId":1,"SceneType":"Map","Name":"Map1","NetworkProtocol":null,"OuterPort":0}, -{"Id":5,"EntityId":86167781376,"RouteId":4096,"WorldId":1,"SceneType":"Chat","Name":"Chat","NetworkProtocol":null,"OuterPort":0}, -{"Id":6,"EntityId":103146389504,"RouteId":1025,"WorldId":1,"SceneType":"Gate","Name":"Gate","NetworkProtocol":"KCP","OuterPort":20000}, -{"Id":7,"EntityId":120393367552,"RouteId":2049,"WorldId":1,"SceneType":"Addressable","Name":"Addressable1","NetworkProtocol":null,"OuterPort":0}, -{"Id":8,"EntityId":137640345600,"RouteId":3073,"WorldId":1,"SceneType":"Map","Name":"Map1","NetworkProtocol":null,"OuterPort":0}, -{"Id":9,"EntityId":154887323648,"RouteId":4097,"WorldId":1,"SceneType":"Chat","Name":"Chat","NetworkProtocol":null,"OuterPort":0} +{"Id":1,"EntityId":17246978048,"RouteId":1024,"WorldId":0,"SceneType":"Gate","Name":"Gate","NetworkProtocol":"KCP","OuterPort":20000}, +{"Id":2,"EntityId":34493956096,"RouteId":2048,"WorldId":0,"SceneType":"Addressable","Name":"Addressable1","NetworkProtocol":null,"OuterPort":0}, +{"Id":4,"EntityId":68920803328,"RouteId":3072,"WorldId":0,"SceneType":"Map","Name":"Map1","NetworkProtocol":null,"OuterPort":0}, +{"Id":5,"EntityId":86167781376,"RouteId":4096,"WorldId":0,"SceneType":"Chat","Name":"Chat1","NetworkProtocol":null,"OuterPort":0}, +{"Id":6,"EntityId":103414759424,"RouteId":5120,"WorldId":0,"SceneType":"Gameplay","Name":"Gameplay1","NetworkProtocol":null,"OuterPort":0} ]} diff --git a/DotNet/Config/Json/Server/ServerConfigData.Json b/DotNet/Config/Json/Server/ServerConfigData.Json index bbaf4069..2b65db46 100644 --- a/DotNet/Config/Json/Server/ServerConfigData.Json +++ b/DotNet/Config/Json/Server/ServerConfigData.Json @@ -1,6 +1,7 @@ {"List":[ -{"Id":1025,"MachineId":1,"InnerPort":11001,"ReleaseMode":false}, -{"Id":2049,"MachineId":1,"InnerPort":11002,"ReleaseMode":false}, -{"Id":3073,"MachineId":1,"InnerPort":11003,"ReleaseMode":false}, -{"Id":4097,"MachineId":1,"InnerPort":11004,"ReleaseMode":false} +{"Id":1024,"MachineId":1,"InnerPort":11001,"ReleaseMode":false}, +{"Id":2048,"MachineId":1,"InnerPort":11002,"ReleaseMode":false}, +{"Id":3072,"MachineId":1,"InnerPort":11003,"ReleaseMode":false}, +{"Id":4096,"MachineId":1,"InnerPort":11004,"ReleaseMode":false}, +{"Id":5120,"MachineId":1,"InnerPort":11005,"ReleaseMode":false} ]} diff --git a/DotNet/Config/Json/Server/WorldConfigData.Json b/DotNet/Config/Json/Server/WorldConfigData.Json index 43fea8ad..c57c0ce1 100644 --- a/DotNet/Config/Json/Server/WorldConfigData.Json +++ b/DotNet/Config/Json/Server/WorldConfigData.Json @@ -1,3 +1,3 @@ {"List":[ -{"Id":1,"WorldName":"测试服","DbConnection":"mongodb://1.12.241.46:27017/","DbName":"tengine_test","DbType":"MongoDB","IsGameWorld":true} +{"Id":1,"WorldName":"测试服","DbConnection":"mongodb://root:root@127.0.0.1","DbName":"tengine_main","DbType":"MongoDB","IsGameWorld":true} ]} diff --git a/DotNet/Logic/src/Generate/CustomExport/SceneType.cs b/DotNet/Logic/src/Generate/CustomExport/SceneType.cs index e4ccaa18..a0d59e7f 100644 --- a/DotNet/Logic/src/Generate/CustomExport/SceneType.cs +++ b/DotNet/Logic/src/Generate/CustomExport/SceneType.cs @@ -7,6 +7,7 @@ namespace TEngine public const int Addressable = 2; public const int Map = 3; public const int Chat = 4; + public const int Gameplay = 5; public static readonly Dictionary SceneDic = new Dictionary() { @@ -14,6 +15,7 @@ namespace TEngine { "Addressable", 2 }, { "Map", 3 }, { "Chat", 4 }, + { "Gameplay", 5 }, }; } } diff --git a/DotNet/Logic/src/OnCreateScene.cs b/DotNet/Logic/src/OnCreateScene.cs index 6d72295c..21ed8d95 100644 --- a/DotNet/Logic/src/OnCreateScene.cs +++ b/DotNet/Logic/src/OnCreateScene.cs @@ -6,11 +6,37 @@ namespace TEngine.Logic; [Flags] public enum SceneType: long { + /// + /// 场景无。 + /// None = 0, - Gate = 1, // Gate - Addressable = 1 << 2, // 负责进程间消息通信 - Map = 1 << 3, // 游戏场景服 - Chat = 1 << 4, // 游戏聊天服 + + /// + /// 场景Gate。 + /// + Gate = 1, + + /// + /// 场景Addressable。 + /// 负责进程间消息通信。 + /// + Addressable = 1 << 2, + + /// + /// 场景GamePlay + /// 游戏玩法服。 + /// + Gameplay = 1 << 3, + + /// + /// 游戏场景服。 + /// + Map = 1 << 4, + + /// + /// 游戏聊天服。 + /// + Chat = 1 << 5, } /// @@ -39,6 +65,8 @@ public class OnCreateScene : AsyncEventSystem sceneConfigInfo.Scene.AddComponent(); break; } + case SceneType.Gameplay: + break; } Log.Info($"scene create: {self.SceneInfo.SceneType} {self.SceneInfo.Name} SceneId:{self.SceneInfo.Id} ServerId:{self.SceneInfo.RouteId} WorldId:{self.SceneInfo.WorldId}");