Game/Fishing2Server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix error

Browse Source
This commit is contained in:
bob
2025-06-30 15:02:56 +08:00
parent 8e45469c83
commit d7916515fd
27 changed files with 319 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Config/Binary/MachineConfigData.bytes Normal file
View File

@@ -0,0 +1,2 @@
# 127.0.0.1 127.0.0.1" 127.0.0.1

2
Config/Binary/ProcessConfigData.bytes Normal file
View File

@@ -0,0 +1,2 @@


6
Config/Binary/SceneConfigData.bytes Normal file
View File

@@ -0,0 +1,6 @@
&é" MultiThread* Addressable@ůUH
(ę" MultiThread*Gate2KCP8 ś@úUH
ë" MultiThread*Map@űUH
ě" MultiThread*Chat@üUH
í" MultiThread*Map@ýUH

4
Config/Binary/UnitConfigData.bytes Normal file
View File

@@ -0,0 +1,4 @@
'Unit01Unit01"
Idle
Run

2
Config/Binary/WorldConfigData.bytes Normal file
View File

@@ -0,0 +1,2 @@
$ 测试服" fantasy_main*MongoDB

1
Config/Excel/Custom.txt Normal file
View File

@@ -0,0 +1 @@
// 自定义导出配置文件,用于配置自定义导出自定义程序的路径

BIN
Config/Excel/Server/MachineConfig.xlsx Normal file
View File

Binary file not shown.

BIN
Config/Excel/Server/ProcessConfig.xlsx Normal file
View File

Binary file not shown.

BIN
Config/Excel/Server/SceneConfig.xlsx Normal file
View File

Binary file not shown.

BIN
Config/Excel/Server/WorldConfig.xlsx Normal file
View File

Binary file not shown.

BIN
Config/Excel/UnitConfig.xlsx Normal file
View File

Binary file not shown.

1
Config/Excel/Version.txt Normal file
View File

@@ -0,0 +1 @@
{"WorksheetNames":[-8419147776733210060,-3495952183970875596,-1088042625810372120,1720330851179383898],"Tables":{"-3495952183970875596":1750919742778,"-1088042625810372120":1731573652950,"1720330851179383898":1728449870789,"3730651590607244245":1731575713470,"5812538452563588342":1748394916174}}

3
Config/Json/Server/MachineConfigData.Json Normal file
View File

@@ -0,0 +1,3 @@
{"List":[
{"Id":1,"OuterIP":"127.0.0.1","OuterBindIP":"127.0.0.1","InnerBindIP":"127.0.0.1"}
]}

3
Config/Json/Server/ProcessConfigData.Json Normal file
View File

@@ -0,0 +1,3 @@
{"List":[
{"Id":1,"MachineId":1,"StartupGroup":0}
]}

7
Config/Json/Server/SceneConfigData.Json Normal file
View File

@@ -0,0 +1,7 @@
{"List":[
{"Id":1001,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Addressable","NetworkProtocol":null,"OuterPort":0,"InnerPort":11001,"SceneType":2},
{"Id":1002,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Gate","NetworkProtocol":"KCP","OuterPort":20000,"InnerPort":11002,"SceneType":3},
{"Id":1003,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Map","NetworkProtocol":null,"OuterPort":0,"InnerPort":11003,"SceneType":4},
{"Id":1004,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Chat","NetworkProtocol":null,"OuterPort":0,"InnerPort":11004,"SceneType":8},
{"Id":1005,"ProcessConfigId":1,"WorldConfigId":1,"SceneRuntimeMode":"MultiThread","SceneTypeString":"Map","NetworkProtocol":null,"OuterPort":0,"InnerPort":11005,"SceneType":4}
]}

3
Config/Json/Server/UnitConfigData.Json Normal file
View File

@@ -0,0 +1,3 @@
{"List":[
{"Id":1,"Name":"Unit01","Model":"Unit01","Dic":{"Dic":{"1":"Idle","2":"Run"}}}
]}

3
Config/Json/Server/WorldConfigData.Json Normal file
View File

@@ -0,0 +1,3 @@
{"List":[
{"Id":1,"WorldName":"测试服","DbConnection":null,"DbName":"fantasy_main","DbType":"MongoDB"}
]}

75
Config/NetworkProtocol/Inner/InnerMessage.proto Normal file
View File

@@ -0,0 +1,75 @@
syntax = "proto3";
package Sining.Message;
message G2A_TestMessage // IRouteMessage
{
string Tag = 1;
}
message G2A_TestRequest // IRouteRequest,G2A_TestResponse
{
}
message G2A_TestResponse // IRouteResponse
{
}
message G2M_RequestAddressableId // IRouteRequest,M2G_ResponseAddressableId
{
}
message M2G_ResponseAddressableId // IRouteResponse
{
int64 AddressableId = 1; // Map服务器返回的AddressableId
}
/// 通知Chat服务器创建一个RouteId
message G2Chat_CreateRouteRequest // IRouteRequest,Chat2G_CreateRouteResponse
{
int64 GateRouteId = 1;
}
message Chat2G_CreateRouteResponse // IRouteResponse
{
int64 ChatRouteId = 1;
}
/// Map给另外一个Map发送Unit数据
// Protocol Bson
message M2M_SendUnitRequest // IRouteRequest,M2M_SendUnitResponse
{
Unit Unit = 1;
}
// Protocol Bson
message M2M_SendUnitResponse // IRouteResponse
{
}
/// Gate发送Addressable消息给MAP
message G2M_SendAddressableMessage // IAddressableRouteMessage
{
string Tag = 1;
}
// Gate通知Map创建一个SubScene
message G2M_CreateSubSceneRequest // IRouteRequest,M2G_CreateSubSceneResponse
{
}
message M2G_CreateSubSceneResponse // IRouteResponse
{
int64 SubSceneRouteId = 1;
}
// Gate给SubScene发送一个消息
message G2SubScene_SentMessage // IRouteMessage
{
string Tag = 1;
}
/// Gate通知SubScene创建一个Addressable消息
message G2SubScene_AddressableIdRequest // IRouteRequest,SubScene2G_AddressableIdResponse
{
}
message SubScene2G_AddressableIdResponse // IRouteResponse
{
int64 AddressableId = 1; // SubScene服务器返回的AddressableId
}
/// Chat发送一个漫游消息给Map
message Chat2M_TestMessage // IRoamingMessage,MapRoamingType
{
string Tag = 1;
}

1
Config/NetworkProtocol/OpCode.Cache Normal file
View File

@@ -0,0 +1 @@
{}

182
Config/NetworkProtocol/Outer/OuterMessage.proto Normal file
View File

@@ -0,0 +1,182 @@
syntax = "proto3";
package Fantasy.Network.Message;
// 协议分为:
// ProtoBuf:可以在Outer和Inner文件里使用。
// MemoryPack:可以在Outer和Inner文件里使用。
// Bson:仅支持在Inner文件里使用。
// 使用方式:
// 在message协议上方添加// Protocol+空格+协议名字
// 例如:// Protocol ProtoBuf 或 // Protocol MemoryPack
message C2G_TestMessage // IMessage
{
string Tag = 1;
}
message C2G_TestRequest // IRequest,G2C_TestResponse
{
string Tag = 1;
}
message G2C_TestResponse // IResponse
{
string Tag = 1;
}
message C2G_TestRequestPushMessage // IMessage
{
}
/// Gate服务器推送一个消息给客户端
message G2C_PushMessage // IMessage
{
string Tag = 1;
}
message C2G_CreateAddressableRequest // IRequest,G2C_CreateAddressableResponse
{
}
message G2C_CreateAddressableResponse // IResponse
{
}
message C2M_TestMessage // IAddressableRouteMessage
{
string Tag = 1;
}
message C2M_TestRequest // IAddressableRouteRequest,M2C_TestResponse
{
string Tag = 1;
}
message M2C_TestResponse // IAddressableRouteResponse
{
string Tag = 1;
}
/// 通知Gate服务器创建一个Chat的Route连接
message C2G_CreateChatRouteRequest // IRequest,G2C_CreateChatRouteResponse
{
}
message G2C_CreateChatRouteResponse // IResponse
{
}
/// 发送一个Route消息给Chat
message C2Chat_TestMessage // ICustomRouteMessage,ChatRoute
{
string Tag = 1;
}
/// 发送一个RPCRoute消息给Chat
message C2Chat_TestMessageRequest // ICustomRouteRequest,Chat2C_TestMessageResponse,ChatRoute
{
string Tag = 1;
}
message Chat2C_TestMessageResponse // ICustomRouteResponse
{
string Tag = 1;
}
/// 发送一个RPC消息给Map，让Map里的Entity转移到另外一个Map上
message C2M_MoveToMapRequest // IAddressableRouteRequest,M2C_MoveToMapResponse
{
}
message M2C_MoveToMapResponse // IAddressableRouteResponse
{
}
/// 发送一个消息给Gate，让Gate发送一个Addressable消息给MAP
message C2G_SendAddressableToMap // IMessage
{
string Tag = 1;
}
/// 发送一个消息给Chat，让Chat服务器主动推送一个RouteMessage消息给客户端
message C2Chat_TestRequestPushMessage // ICustomRouteMessage,ChatRoute
{
}
/// Chat服务器主动推送一个消息给客户端
message Chat2C_PushMessage // ICustomRouteMessage,ChatRoute
{
string Tag = 1;
}
/// 客户端发送给Gate服务器通知map服务器创建一个SubScene
message C2G_CreateSubSceneRequest // IRequest,G2C_CreateSubSceneResponse
{
}
message G2C_CreateSubSceneResponse // IResponse
{
}
/// 客户端通知Gate服务器给SubScene发送一个消息
message C2G_SendToSubSceneMessage // IMessage
{
}
/// 客户端通知Gate服务器创建一个SubScene的Address消息
message C2G_CreateSubSceneAddressableRequest // IRequest,G2C_CreateSubSceneAddressableResponse
{
}
message G2C_CreateSubSceneAddressableResponse // IResponse
{
}
/// 客户端向SubScene发送一个测试消息
message C2SubScene_TestMessage // IAddressableRouteMessage
{
string Tag = 1;
}
/// 客户端向SubScene发送一个销毁测试消息
message C2SubScene_TestDisposeMessage // IAddressableRouteMessage
{
}
/// 客户端向服务器发送连接消息（Roaming）
message C2G_ConnectRoamingRequest // IRequest,G2C_ConnectRoamingResponse
{
}
message G2C_ConnectRoamingResponse // IResponse
{
}
/// 测试一个Chat漫游普通消息
message C2Chat_TestRoamingMessage // IRoamingMessage,ChatRoamingType
{
string Tag = 1;
}
/// 测试一个Map漫游普通消息
message C2Map_TestRoamingMessage // IRoamingMessage,MapRoamingType
{
string Tag = 1;
}
/// 测试一个Chat漫游RPC消息
message C2Chat_TestRPCRoamingRequest // IRoamingRequest,Chat2C_TestRPCRoamingResponse,ChatRoamingType
{
string Tag = 1;
}
message Chat2C_TestRPCRoamingResponse // IRoamingResponse
{
}
/// 客户端发送一个漫游消息给Map通知Map主动推送一个消息给客户端
message C2Map_PushMessageToClient // IRoamingMessage,MapRoamingType
{
string Tag = 1;
}
/// 漫游端发送一个消息给客户端
message Map2C_PushMessageToClient // IRoamingMessage,MapRoamingType
{
string Tag = 1;
}
/// 测试传送漫游的触发协议
message C2Map_TestTransferRequest // IRoamingRequest,Map2C_TestTransferResponse,MapRoamingType
{
}
message Map2C_TestTransferResponse // IRoamingResponse
{
}
/// 测试一个Chat发送到Map之间漫游协议
message C2Chat_TestSendMapMessage // IRoamingMessage,ChatRoamingType
{
string Tag = 1;
}

3
Config/NetworkProtocol/RoamingType.Config Normal file
View File

@@ -0,0 +1,3 @@
// Roaming协议定义(需要定义10000以上、因为10000以内的框架预留)
MapRoamingType = 10001
ChatRoamingType = 10002

3
Config/NetworkProtocol/RouteType.Config Normal file
View File

@@ -0,0 +1,3 @@
// Route协议定义(需要定义1000以上、因为1000以内的框架预留)
GateRoute = 1001 // Gate
ChatRoute = 1002 // Chat

6
Entity/Entity.csproj
View File

@@ -4,8 +4,8 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<LangVersion>default</LangVersion>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
@@ -17,8 +17,8 @@
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Fantasy.Net\Fantasy.Net\Fantasy.Net.csproj" />
<ProjectReference Include="..\..\..\Fantasy.Packages\Fantasy.ConfigTable\Net\Fantasy.ConfigTable.csproj" />
<ProjectReference Include="..\Fantasy\Fantasy.Net\Fantasy.Net\Fantasy.Net.csproj" />
<ProjectReference Include="..\Fantasy\Fantasy.Packages\Fantasy.ConfigTable\Net\Fantasy.ConfigTable.csproj" />
</ItemGroup>
</Project>

4
Hotfix/Hotfix.csproj
View File

@@ -3,13 +3,13 @@
<PropertyGroup>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<TargetFrameworks>net9.0;net8.0</TargetFrameworks>
<LangVersion>default</LangVersion>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Fantasy.Net\Fantasy.Net\Fantasy.Net.csproj" />
<ProjectReference Include="..\Entity\Entity.csproj" />
<ProjectReference Include="..\Fantasy\Fantasy.Net\Fantasy.Net\Fantasy.Net.csproj" />
</ItemGroup>
<ItemGroup>

8
Main/Main.csproj
View File

@@ -4,21 +4,21 @@
<OutputType>Exe</OutputType>
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<TargetFrameworks>net8.0;net9.0</TargetFrameworks>
<LangVersion>default</LangVersion>
<TargetFramework>net9.0</TargetFramework>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath>../../Bin/Debug/</OutputPath>
<OutputPath>../Bin/Debug/</OutputPath>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath>../../Bin/Release/</OutputPath>
<OutputPath>../Bin/Release/</OutputPath>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Fantasy.Net\Fantasy.Net\Fantasy.Net.csproj" />
<ProjectReference Include="..\Entity\Entity.csproj" />
<ProjectReference Include="..\Fantasy\Fantasy.Net\Fantasy.Net\Fantasy.Net.csproj" />
<ProjectReference Include="..\Hotfix\Hotfix.csproj" />
</ItemGroup>

10
Server.sln
View File

@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Net", "..\..\Fantasy.Net\Fantasy.Net\Fantasy.Net.csproj", "{7BDEBABB-8630-4B61-8AF4-75DD969F29E6}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.Net", "Fantasy\Fantasy.Net\Fantasy.Net\Fantasy.Net.csproj", "{7BDEBABB-8630-4B61-8AF4-75DD969F29E6}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Main", "Main\Main.csproj", "{FE0784FD-8ACB-42FB-82EC-81A1335C85CF}"
EndProject
@@ -8,7 +8,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Entity", "Entity\Entity.csp
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Hotfix", "Hotfix\Hotfix.csproj", "{B2740AB3-250F-44E2-B61D-8F3C4D9B4BEB}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.ConfigTable", "..\..\Fantasy.Packages\Fantasy.ConfigTable\Net\Fantasy.ConfigTable.csproj", "{0A539FA2-C595-4AA3-A2C3-86BF86EA7FFB}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Fantasy.ConfigTable", "Fantasy\Fantasy.Packages\Fantasy.ConfigTable\Net\Fantasy.ConfigTable.csproj", "{0A539FA2-C595-4AA3-A2C3-86BF86EA7FFB}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Fantasy", "Fantasy", "{B1F4CF72-A767-4509-B050-8DB30D0DC40A}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -37,4 +39,8 @@ Global
{0A539FA2-C595-4AA3-A2C3-86BF86EA7FFB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{0A539FA2-C595-4AA3-A2C3-86BF86EA7FFB}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{0A539FA2-C595-4AA3-A2C3-86BF86EA7FFB} = {B1F4CF72-A767-4509-B050-8DB30D0DC40A}
{7BDEBABB-8630-4B61-8AF4-75DD969F29E6} = {B1F4CF72-A767-4509-B050-8DB30D0DC40A}
EndGlobalSection
EndGlobal

1
Server.sln.DotSettings.user
View File

@@ -13,6 +13,7 @@
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8bc9cdb23bc146bcaaae0bb9e45e5d46d9dc00_003Fdb_003F02b9a6a5_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ADictionary_00602_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F77fc0eb92b774686bbae91cb92331703d83600_003Feb_003F3472606c_003FDictionary_00602_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AEnumerable_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fe8241d251b32455eb32cf531792be2de95400_003F8d_003F7f127f2d_003FEnumerable_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003Fbob_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FSourcesCache_003Fbd1d5c50194fea68ff3559c160230b0ab50f5acf4ce3061bffd6d62958e2182_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFileStream_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F77fc0eb92b774686bbae91cb92331703d83600_003Fd1_003Fe3244183_003FFileStream_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFilterDefinition_00601_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F8ea7d078decf4c90ba8835b5c94f73f224de00_003Fbb_003F26ba78ed_003FFilterDefinition_00601_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AHttpListenerContext_002Ecs_002Fl_003A_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003F_002E_002E_003FLibrary_003FApplication_0020Support_003FJetBrains_003FRider2024_002E2_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F39685ddee93747a69e157aaf821b46b74ec00_003F0c_003F83013c19_003FHttpListenerContext_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>