From d4f160d284b6979945fa12dd25be225263c08b90 Mon Sep 17 00:00:00 2001 From: ALEXTANG <574809918@qq.com> Date: Sat, 15 Jul 2023 18:39:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=88=E7=90=86=E5=8C=96=E7=A8=8B=E5=BA=8F?= =?UTF-8?q?=E9=9B=86=EF=BC=8C=E6=9C=8D=E5=8A=A1=E5=99=A8Logic=E6=97=A0?= =?UTF-8?q?=E9=9C=80=E5=85=B1=E4=BA=AB=E7=9A=84=E4=BB=A3=E7=A0=81=E5=AD=98?= =?UTF-8?q?=E6=94=BE=E8=A7=A3=E5=86=B3=E6=96=B9=E6=A1=88=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=EF=BC=8C=E6=97=A0=E9=9C=80=E8=B5=B0Unity=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 合理化程序集，服务器Logic无需共享的代码存放解决方案目录，无需走Unity目录 --- .../DotNet/Logic/CustomExport.meta | 8 -- .../SceneTypeConfigToEnum.cs.meta | 11 --- Assets/GameScripts/DotNet/Logic/Entry.cs.meta | 11 --- .../DotNet/Logic/Generate~/ConfigTable.meta | 8 -- .../Logic/Generate~/ConfigTable/Entity.meta | 8 -- .../ConfigTable/Entity/SceneConfig.cs.meta | 11 --- .../ConfigTable/Entity/ServerConfig.cs.meta | 11 --- .../ConfigTable/Entity/WorldConfig.cs.meta | 11 --- .../DotNet/Logic/Generate~/CustomExport.meta | 8 -- .../Generate~/CustomExport/SceneType.cs.meta | 11 --- .../Logic/Generate~/NetworkProtocol.meta | 8 -- .../NetworkProtocol/InnerBsonMessage.cs.meta | 11 --- .../NetworkProtocol/InnerBsonOpcode.cs.meta | 11 --- .../NetworkProtocol/InnerMessage.cs.meta | 11 --- .../NetworkProtocol/InnerOpcode.cs.meta | 11 --- .../NetworkProtocol/OuterMessage.cs.meta | 11 --- .../NetworkProtocol/OuterOpcode.cs.meta | 11 --- .../NetworkProtocol/RouteType.cs.meta | 11 --- Assets/GameScripts/DotNet/Logic/Handler.meta | 8 -- .../DotNet/Logic/Handler/Address.meta | 8 -- .../Address/H_C2M_MessageHandler.cs.meta | 11 --- .../H_C2M_MessageRequestHandler.cs.meta | 11 --- ..._PushAddressMessageToClientHandler.cs.meta | 11 --- .../H_C2G_LoginAddressRequestHandler.cs.meta | 11 --- .../Handler/H_C2G_LoginRequestHandler.cs.meta | 11 --- .../Handler/H_C2G_MessageHandler.cs.meta | 11 --- .../H_C2G_MessageRequestHandler.cs.meta | 11 --- .../H_C2G_PushMessageToClientHandler.cs.meta | 11 --- .../I_G2M_LoginAddressRequestHandler.cs.meta | 11 --- Assets/GameScripts/DotNet/Logic/Helper.meta | 8 -- .../Logic/Helper/AssemblySystem.cs.meta | 11 --- .../Logic/Helper/ConfigTableSystem.cs.meta | 11 --- .../DotNet/Logic/OnCreateScene.cs.meta | 11 --- Assets/GameScripts/DotNet/Logic/Share.cs | 4 + .../MachineConfig.cs.meta => Share.cs.meta} | 2 +- .../Protobuf-net/protobuf-net.csproj.meta | 7 -- .../Config/Json/Server/MachineConfigData.Json | 14 +-- .../Config/Json/Server/SceneConfigData.Json | 54 ++--------- .../Config/Json/Server/ServerConfigData.Json | 34 ++----- .../Config/Json/Server/WorldConfigData.Json | 15 +-- .../Config/Server}/Entity/MachineConfig.cs | 0 .../Config/Server}/Entity/SceneConfig.cs | 0 .../Config/Server}/Entity/ServerConfig.cs | 0 .../Config/Server}/Entity/WorldConfig.cs | 0 DotNet/Core/Core.csproj | 2 +- DotNet/Logic/Logic.csproj | 12 +-- .../Logic/src/Config}/ConfigLoader.cs | 0 .../Logic/src/Config}/Core/BeanBase.cs | 0 .../Logic/src/Config}/Core/ByteBuf.cs | 0 .../Logic/src/Config}/Core/ITypeId.cs | 0 .../Logic/src/Config}/Core/StringUtil.cs | 0 .../GameConfig/Battle/ActorAttrAddType.cs | 0 .../GameConfig/Battle/ActorAttrDataType.cs | 0 .../GameConfig/Battle/BuffAttrConfig.cs | 0 .../Config}/GameConfig/Battle/BuffConfig.cs | 0 .../GameConfig/Battle/BuffDotTickConfig.cs | 0 .../GameConfig/Battle/BuffReplaceType.cs | 0 .../GameConfig/Battle/BuffResultType.cs | 0 .../Config}/GameConfig/Battle/BuffStateID.cs | 0 .../Config}/GameConfig/Battle/BuffTimeType.cs | 0 .../GameConfig/Battle/BuffTriggleState.cs | 0 .../GameConfig/Battle/ResAttrImpactData.cs | 0 .../GameConfig/Battle/SkillAttrDamageData.cs | 0 .../GameConfig/Battle/SkillAttrDamageType.cs | 0 .../GameConfig/Battle/SkillBaseConfig.cs | 0 .../GameConfig/Battle/SkillMagicType.cs | 0 .../src/Config}/GameConfig/Battle/TbBuff.cs | 0 .../Config}/GameConfig/Battle/TbBuffAttr.cs | 0 .../src/Config}/GameConfig/Battle/TbSkill.cs | 0 .../Logic/src/Config}/GameConfig/Tables.cs | 0 .../src/Config}/GameConfig/item/EQuality.cs | 0 .../Logic/src/Config}/GameConfig/item/Item.cs | 0 .../Config}/GameConfig/item/ItemExchange.cs | 0 .../src/Config}/GameConfig/item/TbItem.cs | 0 .../src/Config}/GameConfig/test/AccessFlag.cs | 0 .../CustomExport/SceneTypeConfigToEnum.cs | 0 .../Logic => DotNet/Logic/src}/Entry.cs | 0 .../ConfigTable/Entity/MachineConfig.cs | 88 +++++++++++++++++ .../ConfigTable/Entity/SceneConfig.cs | 94 +++++++++++++++++++ .../ConfigTable/Entity/ServerConfig.cs | 86 +++++++++++++++++ .../ConfigTable/Entity/WorldConfig.cs | 90 ++++++++++++++++++ .../src/Generate}/CustomExport/SceneType.cs | 0 .../NetworkProtocol/InnerBsonMessage.cs | 0 .../NetworkProtocol/InnerBsonOpcode.cs | 0 .../Generate}/NetworkProtocol/InnerMessage.cs | 0 .../Generate}/NetworkProtocol/InnerOpcode.cs | 0 .../Generate}/NetworkProtocol/OuterMessage.cs | 0 .../Generate}/NetworkProtocol/OuterOpcode.cs | 0 .../Generate}/NetworkProtocol/RouteType.cs | 0 .../Handler/Address/H_C2M_MessageHandler.cs | 0 .../Address/H_C2M_MessageRequestHandler.cs | 0 ...H_C2M_PushAddressMessageToClientHandler.cs | 0 .../H_C2G_LoginAddressRequestHandler.cs | 0 .../src}/Handler/H_C2G_LoginRequestHandler.cs | 0 .../src}/Handler/H_C2G_MessageHandler.cs | 0 .../Handler/H_C2G_MessageRequestHandler.cs | 0 .../H_C2G_PushMessageToClientHandler.cs | 0 .../I_G2M_LoginAddressRequestHandler.cs | 0 .../Logic/src}/Helper/AssemblySystem.cs | 0 .../Logic/src}/Helper/ConfigTableSystem.cs | 0 .../Logic/src}/OnCreateScene.cs | 0 101 files changed, 390 insertions(+), 451 deletions(-) delete mode 100644 Assets/GameScripts/DotNet/Logic/CustomExport.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/CustomExport/SceneTypeConfigToEnum.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Entry.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/SceneConfig.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/ServerConfig.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/WorldConfig.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/CustomExport.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/CustomExport/SceneType.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonMessage.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonOpcode.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerMessage.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerOpcode.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterMessage.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterOpcode.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/RouteType.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/Address.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageHandler.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageRequestHandler.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_PushAddressMessageToClientHandler.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginAddressRequestHandler.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginRequestHandler.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageHandler.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageRequestHandler.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/H_C2G_PushMessageToClientHandler.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Handler/I_G2M_LoginAddressRequestHandler.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Helper.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Helper/AssemblySystem.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/Helper/ConfigTableSystem.cs.meta delete mode 100644 Assets/GameScripts/DotNet/Logic/OnCreateScene.cs.meta create mode 100644 Assets/GameScripts/DotNet/Logic/Share.cs rename Assets/GameScripts/DotNet/Logic/{Generate~/ConfigTable/Entity/MachineConfig.cs.meta => Share.cs.meta} (83%) delete mode 100644 Assets/GameScripts/ThirdParty/Protobuf-net/protobuf-net.csproj.meta rename {Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable => DotNet/Config/Server}/Entity/MachineConfig.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable => DotNet/Config/Server}/Entity/SceneConfig.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable => DotNet/Config/Server}/Entity/ServerConfig.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable => DotNet/Config/Server}/Entity/WorldConfig.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/ConfigLoader.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/Core/BeanBase.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/Core/ByteBuf.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/Core/ITypeId.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/Core/StringUtil.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/ActorAttrAddType.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/ActorAttrDataType.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/BuffAttrConfig.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/BuffConfig.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/BuffDotTickConfig.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/BuffReplaceType.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/BuffResultType.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/BuffStateID.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/BuffTimeType.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/BuffTriggleState.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/ResAttrImpactData.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/SkillAttrDamageData.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/SkillAttrDamageType.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/SkillBaseConfig.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/SkillMagicType.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/TbBuff.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/TbBuffAttr.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Battle/TbSkill.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/Tables.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/item/EQuality.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/item/Item.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/item/ItemExchange.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/item/TbItem.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Config~ => DotNet/Logic/src/Config}/GameConfig/test/AccessFlag.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/CustomExport/SceneTypeConfigToEnum.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Entry.cs (100%) create mode 100644 DotNet/Logic/src/Generate/ConfigTable/Entity/MachineConfig.cs create mode 100644 DotNet/Logic/src/Generate/ConfigTable/Entity/SceneConfig.cs create mode 100644 DotNet/Logic/src/Generate/ConfigTable/Entity/ServerConfig.cs create mode 100644 DotNet/Logic/src/Generate/ConfigTable/Entity/WorldConfig.cs rename {Assets/GameScripts/DotNet/Logic/Generate~ => DotNet/Logic/src/Generate}/CustomExport/SceneType.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~ => DotNet/Logic/src/Generate}/NetworkProtocol/InnerBsonMessage.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~ => DotNet/Logic/src/Generate}/NetworkProtocol/InnerBsonOpcode.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~ => DotNet/Logic/src/Generate}/NetworkProtocol/InnerMessage.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~ => DotNet/Logic/src/Generate}/NetworkProtocol/InnerOpcode.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~ => DotNet/Logic/src/Generate}/NetworkProtocol/OuterMessage.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~ => DotNet/Logic/src/Generate}/NetworkProtocol/OuterOpcode.cs (100%) rename {Assets/GameScripts/DotNet/Logic/Generate~ => DotNet/Logic/src/Generate}/NetworkProtocol/RouteType.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Handler/Address/H_C2M_MessageHandler.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Handler/Address/H_C2M_MessageRequestHandler.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Handler/Address/H_C2M_PushAddressMessageToClientHandler.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Handler/H_C2G_LoginAddressRequestHandler.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Handler/H_C2G_LoginRequestHandler.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Handler/H_C2G_MessageHandler.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Handler/H_C2G_MessageRequestHandler.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Handler/H_C2G_PushMessageToClientHandler.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Handler/I_G2M_LoginAddressRequestHandler.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Helper/AssemblySystem.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/Helper/ConfigTableSystem.cs (100%) rename {Assets/GameScripts/DotNet/Logic => DotNet/Logic/src}/OnCreateScene.cs (100%) diff --git a/Assets/GameScripts/DotNet/Logic/CustomExport.meta b/Assets/GameScripts/DotNet/Logic/CustomExport.meta deleted file mode 100644 index bd541f64..00000000 --- a/Assets/GameScripts/DotNet/Logic/CustomExport.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9d91af67c28edce489bc064458254a30 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/CustomExport/SceneTypeConfigToEnum.cs.meta b/Assets/GameScripts/DotNet/Logic/CustomExport/SceneTypeConfigToEnum.cs.meta deleted file mode 100644 index 5e2f39a8..00000000 --- a/Assets/GameScripts/DotNet/Logic/CustomExport/SceneTypeConfigToEnum.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e12aa9c235cdfe84ca74924639cd6d22 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Entry.cs.meta b/Assets/GameScripts/DotNet/Logic/Entry.cs.meta deleted file mode 100644 index df83fc52..00000000 --- a/Assets/GameScripts/DotNet/Logic/Entry.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0fcece90443154e49a5a4bd57bbe7e82 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable.meta b/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable.meta deleted file mode 100644 index fdedc34f..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 1b8404cea481db34c91f2ba7567620db -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity.meta b/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity.meta deleted file mode 100644 index f7fb3419..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: bc782e6aee9c7654a85ff3e8178e1f53 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/SceneConfig.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/SceneConfig.cs.meta deleted file mode 100644 index 8562497b..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/SceneConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 3e4c00f667c811947b6c191342eab7ac -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/ServerConfig.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/ServerConfig.cs.meta deleted file mode 100644 index 0309c0ad..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/ServerConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 86a653380b833dc4abd9816ea3cc27d9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/WorldConfig.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/WorldConfig.cs.meta deleted file mode 100644 index 840db25d..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/WorldConfig.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 0effffaeff49200459ca1ea5dce76982 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/CustomExport.meta b/Assets/GameScripts/DotNet/Logic/Generate~/CustomExport.meta deleted file mode 100644 index ad69c826..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/CustomExport.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 34d6b1a4a6ca2eb4390f6ce02c611461 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/CustomExport/SceneType.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/CustomExport/SceneType.cs.meta deleted file mode 100644 index a6b2d9a7..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/CustomExport/SceneType.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: e77592eb467992947a57a22ed5249c0d -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol.meta b/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol.meta deleted file mode 100644 index 60b881b1..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: fb7989dfa4f501845a696744157d57b2 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonMessage.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonMessage.cs.meta deleted file mode 100644 index f93061d9..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonMessage.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9c2857a2685547246874c19eb182188a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonOpcode.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonOpcode.cs.meta deleted file mode 100644 index 34cf4cc1..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonOpcode.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ec1d3cc361a3cdf498afd9bef149ded6 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerMessage.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerMessage.cs.meta deleted file mode 100644 index e97dc740..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerMessage.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a087e0d601b77a34c91d2a27a3caaa59 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerOpcode.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerOpcode.cs.meta deleted file mode 100644 index fe1eb946..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerOpcode.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b495abbd9ecfd7547a2c986416e701fa -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterMessage.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterMessage.cs.meta deleted file mode 100644 index 8c357eb3..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterMessage.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: fed81665632c0eb40a9704d33e8a3b22 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterOpcode.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterOpcode.cs.meta deleted file mode 100644 index d2444b39..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterOpcode.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 47365b17af2f7c744aa93ff7e9dfec0e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/RouteType.cs.meta b/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/RouteType.cs.meta deleted file mode 100644 index 8e668043..00000000 --- a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/RouteType.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 6b6880642b7d6ca4b995a988465c77a1 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler.meta b/Assets/GameScripts/DotNet/Logic/Handler.meta deleted file mode 100644 index 43fb0067..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: b1677506e5cd7b347b38dd75ee4d0706 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/Address.meta b/Assets/GameScripts/DotNet/Logic/Handler/Address.meta deleted file mode 100644 index ca28bdce..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/Address.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: f4621a08083c52d4a8b1a1b81e8cbef7 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageHandler.cs.meta b/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageHandler.cs.meta deleted file mode 100644 index 9adb5c8f..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 7292412e46412f341afe261729a0261c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageRequestHandler.cs.meta b/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageRequestHandler.cs.meta deleted file mode 100644 index a6d55662..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageRequestHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 1cb9669623912ce48bdcad365cc1c26c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_PushAddressMessageToClientHandler.cs.meta b/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_PushAddressMessageToClientHandler.cs.meta deleted file mode 100644 index 9244e3bc..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_PushAddressMessageToClientHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 2030d3d4928a1524d8858ba1c485f562 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginAddressRequestHandler.cs.meta b/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginAddressRequestHandler.cs.meta deleted file mode 100644 index 0c25cd1e..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginAddressRequestHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a889d7a63c3f4754486afb58e40418a0 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginRequestHandler.cs.meta b/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginRequestHandler.cs.meta deleted file mode 100644 index bd822e64..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginRequestHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 43f82d10a26d78443801db581ed7251e -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageHandler.cs.meta b/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageHandler.cs.meta deleted file mode 100644 index 574505f8..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: dec8374fe05a89344a64674e05b06239 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageRequestHandler.cs.meta b/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageRequestHandler.cs.meta deleted file mode 100644 index af058d73..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageRequestHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4283804f211765a42b5a81aba74e2666 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_PushMessageToClientHandler.cs.meta b/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_PushMessageToClientHandler.cs.meta deleted file mode 100644 index dd82fe42..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_PushMessageToClientHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 958e9874d43c5834cb0739b90d644725 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Handler/I_G2M_LoginAddressRequestHandler.cs.meta b/Assets/GameScripts/DotNet/Logic/Handler/I_G2M_LoginAddressRequestHandler.cs.meta deleted file mode 100644 index 4c1335ee..00000000 --- a/Assets/GameScripts/DotNet/Logic/Handler/I_G2M_LoginAddressRequestHandler.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 9d7564e2d1386c64c98261758acd0109 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Helper.meta b/Assets/GameScripts/DotNet/Logic/Helper.meta deleted file mode 100644 index fb937b16..00000000 --- a/Assets/GameScripts/DotNet/Logic/Helper.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 9b231e7229fc3744cbe27ad320c6fb4f -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Helper/AssemblySystem.cs.meta b/Assets/GameScripts/DotNet/Logic/Helper/AssemblySystem.cs.meta deleted file mode 100644 index e7d3b7b2..00000000 --- a/Assets/GameScripts/DotNet/Logic/Helper/AssemblySystem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 4a0e634d3c2c44d40b6cbaeeeb56c780 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Helper/ConfigTableSystem.cs.meta b/Assets/GameScripts/DotNet/Logic/Helper/ConfigTableSystem.cs.meta deleted file mode 100644 index 5c8970af..00000000 --- a/Assets/GameScripts/DotNet/Logic/Helper/ConfigTableSystem.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: b319159facf1dfa4ab8d203a2c68a55a -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/OnCreateScene.cs.meta b/Assets/GameScripts/DotNet/Logic/OnCreateScene.cs.meta deleted file mode 100644 index a0125aea..00000000 --- a/Assets/GameScripts/DotNet/Logic/OnCreateScene.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: bf9edee1a93725b4f818c55132e2d70f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/GameScripts/DotNet/Logic/Share.cs b/Assets/GameScripts/DotNet/Logic/Share.cs new file mode 100644 index 00000000..786aea24 --- /dev/null +++ b/Assets/GameScripts/DotNet/Logic/Share.cs @@ -0,0 +1,4 @@ +public class Share +{ + +} diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/MachineConfig.cs.meta b/Assets/GameScripts/DotNet/Logic/Share.cs.meta similarity index 83% rename from Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/MachineConfig.cs.meta rename to Assets/GameScripts/DotNet/Logic/Share.cs.meta index acb7c8b0..abe80f28 100644 --- a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/MachineConfig.cs.meta +++ b/Assets/GameScripts/DotNet/Logic/Share.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9853ff3c8cde9a34f89c6e77f01c2b0f +guid: b0b267713d913c84c860dc88be4ff70e MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/GameScripts/ThirdParty/Protobuf-net/protobuf-net.csproj.meta b/Assets/GameScripts/ThirdParty/Protobuf-net/protobuf-net.csproj.meta deleted file mode 100644 index 0950983a..00000000 --- a/Assets/GameScripts/ThirdParty/Protobuf-net/protobuf-net.csproj.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3b9128b665b538746a11489aee369030 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/DotNet/Config/Json/Server/MachineConfigData.Json b/DotNet/Config/Json/Server/MachineConfigData.Json index f8306537..2b505f79 100644 --- a/DotNet/Config/Json/Server/MachineConfigData.Json +++ b/DotNet/Config/Json/Server/MachineConfigData.Json @@ -1,11 +1,3 @@ -{ - "List": [ - { - "Id": 1, - "OuterIP": "127.0.0.1", - "OuterBindIP": "127.0.0.1", - "InnerBindIP": "127.0.0.1", - "ManagementPort": 20000 - } - ] -} \ No newline at end of file +{"List":[ +{"Id":1,"OuterIP":"0.0.0.0","OuterBindIP":"0.0.0.0","InnerBindIP":"0.0.0.0","ManagementPort":20000} +]} diff --git a/DotNet/Config/Json/Server/SceneConfigData.Json b/DotNet/Config/Json/Server/SceneConfigData.Json index 510b0ca2..f6662a41 100644 --- a/DotNet/Config/Json/Server/SceneConfigData.Json +++ b/DotNet/Config/Json/Server/SceneConfigData.Json @@ -1,44 +1,10 @@ -{ - "List": [ - { - "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": "Chat", - "NetworkProtocol": null, - "OuterPort": 0 - } - ] -} \ No newline at end of file +{"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} +]} diff --git a/DotNet/Config/Json/Server/ServerConfigData.Json b/DotNet/Config/Json/Server/ServerConfigData.Json index d06074d0..bbaf4069 100644 --- a/DotNet/Config/Json/Server/ServerConfigData.Json +++ b/DotNet/Config/Json/Server/ServerConfigData.Json @@ -1,28 +1,6 @@ -{ - "List": [ - { - "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 - } - ] -} \ No newline at end of file +{"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} +]} diff --git a/DotNet/Config/Json/Server/WorldConfigData.Json b/DotNet/Config/Json/Server/WorldConfigData.Json index e9195228..43fea8ad 100644 --- a/DotNet/Config/Json/Server/WorldConfigData.Json +++ b/DotNet/Config/Json/Server/WorldConfigData.Json @@ -1,12 +1,3 @@ -{ - "List": [ - { - "Id": 1, - "WorldName": "测试服", - "DbConnection": "mongodb://root:root@127.0.0.1", - "DbName": "tengine_main", - "DbType": "MongoDB", - "IsGameWorld": true - } - ] -} \ No newline at end of file +{"List":[ +{"Id":1,"WorldName":"测试服","DbConnection":"mongodb://1.12.241.46:27017/","DbName":"tengine_test","DbType":"MongoDB","IsGameWorld":true} +]} diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/MachineConfig.cs b/DotNet/Config/Server/Entity/MachineConfig.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/MachineConfig.cs rename to DotNet/Config/Server/Entity/MachineConfig.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/SceneConfig.cs b/DotNet/Config/Server/Entity/SceneConfig.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/SceneConfig.cs rename to DotNet/Config/Server/Entity/SceneConfig.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/ServerConfig.cs b/DotNet/Config/Server/Entity/ServerConfig.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/ServerConfig.cs rename to DotNet/Config/Server/Entity/ServerConfig.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/WorldConfig.cs b/DotNet/Config/Server/Entity/WorldConfig.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/ConfigTable/Entity/WorldConfig.cs rename to DotNet/Config/Server/Entity/WorldConfig.cs diff --git a/DotNet/Core/Core.csproj b/DotNet/Core/Core.csproj index be6424df..b4595812 100644 --- a/DotNet/Core/Core.csproj +++ b/DotNet/Core/Core.csproj @@ -35,7 +35,7 @@ - Core\%(RecursiveDir)%(FileName)%(Extension) + src\%(RecursiveDir)%(FileName)%(Extension) diff --git a/DotNet/Logic/Logic.csproj b/DotNet/Logic/Logic.csproj index 22ba2dfb..e8d5bd00 100644 --- a/DotNet/Logic/Logic.csproj +++ b/DotNet/Logic/Logic.csproj @@ -23,14 +23,10 @@ - Core\%(RecursiveDir)%(FileName)%(Extension) + share\%(RecursiveDir)%(FileName)%(Extension) + + + %(RecursiveDir)%(FileName)%(Extension) - - - - Core\Config~\GameConfig\Battle - - - diff --git a/Assets/GameScripts/DotNet/Logic/Config~/ConfigLoader.cs b/DotNet/Logic/src/Config/ConfigLoader.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/ConfigLoader.cs rename to DotNet/Logic/src/Config/ConfigLoader.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/Core/BeanBase.cs b/DotNet/Logic/src/Config/Core/BeanBase.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/Core/BeanBase.cs rename to DotNet/Logic/src/Config/Core/BeanBase.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/Core/ByteBuf.cs b/DotNet/Logic/src/Config/Core/ByteBuf.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/Core/ByteBuf.cs rename to DotNet/Logic/src/Config/Core/ByteBuf.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/Core/ITypeId.cs b/DotNet/Logic/src/Config/Core/ITypeId.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/Core/ITypeId.cs rename to DotNet/Logic/src/Config/Core/ITypeId.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/Core/StringUtil.cs b/DotNet/Logic/src/Config/Core/StringUtil.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/Core/StringUtil.cs rename to DotNet/Logic/src/Config/Core/StringUtil.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/ActorAttrAddType.cs b/DotNet/Logic/src/Config/GameConfig/Battle/ActorAttrAddType.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/ActorAttrAddType.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/ActorAttrAddType.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/ActorAttrDataType.cs b/DotNet/Logic/src/Config/GameConfig/Battle/ActorAttrDataType.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/ActorAttrDataType.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/ActorAttrDataType.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffAttrConfig.cs b/DotNet/Logic/src/Config/GameConfig/Battle/BuffAttrConfig.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffAttrConfig.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/BuffAttrConfig.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffConfig.cs b/DotNet/Logic/src/Config/GameConfig/Battle/BuffConfig.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffConfig.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/BuffConfig.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffDotTickConfig.cs b/DotNet/Logic/src/Config/GameConfig/Battle/BuffDotTickConfig.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffDotTickConfig.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/BuffDotTickConfig.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffReplaceType.cs b/DotNet/Logic/src/Config/GameConfig/Battle/BuffReplaceType.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffReplaceType.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/BuffReplaceType.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffResultType.cs b/DotNet/Logic/src/Config/GameConfig/Battle/BuffResultType.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffResultType.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/BuffResultType.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffStateID.cs b/DotNet/Logic/src/Config/GameConfig/Battle/BuffStateID.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffStateID.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/BuffStateID.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffTimeType.cs b/DotNet/Logic/src/Config/GameConfig/Battle/BuffTimeType.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffTimeType.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/BuffTimeType.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffTriggleState.cs b/DotNet/Logic/src/Config/GameConfig/Battle/BuffTriggleState.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/BuffTriggleState.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/BuffTriggleState.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/ResAttrImpactData.cs b/DotNet/Logic/src/Config/GameConfig/Battle/ResAttrImpactData.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/ResAttrImpactData.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/ResAttrImpactData.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/SkillAttrDamageData.cs b/DotNet/Logic/src/Config/GameConfig/Battle/SkillAttrDamageData.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/SkillAttrDamageData.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/SkillAttrDamageData.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/SkillAttrDamageType.cs b/DotNet/Logic/src/Config/GameConfig/Battle/SkillAttrDamageType.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/SkillAttrDamageType.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/SkillAttrDamageType.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/SkillBaseConfig.cs b/DotNet/Logic/src/Config/GameConfig/Battle/SkillBaseConfig.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/SkillBaseConfig.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/SkillBaseConfig.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/SkillMagicType.cs b/DotNet/Logic/src/Config/GameConfig/Battle/SkillMagicType.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/SkillMagicType.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/SkillMagicType.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/TbBuff.cs b/DotNet/Logic/src/Config/GameConfig/Battle/TbBuff.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/TbBuff.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/TbBuff.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/TbBuffAttr.cs b/DotNet/Logic/src/Config/GameConfig/Battle/TbBuffAttr.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/TbBuffAttr.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/TbBuffAttr.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/TbSkill.cs b/DotNet/Logic/src/Config/GameConfig/Battle/TbSkill.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Battle/TbSkill.cs rename to DotNet/Logic/src/Config/GameConfig/Battle/TbSkill.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Tables.cs b/DotNet/Logic/src/Config/GameConfig/Tables.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/Tables.cs rename to DotNet/Logic/src/Config/GameConfig/Tables.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/item/EQuality.cs b/DotNet/Logic/src/Config/GameConfig/item/EQuality.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/item/EQuality.cs rename to DotNet/Logic/src/Config/GameConfig/item/EQuality.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/item/Item.cs b/DotNet/Logic/src/Config/GameConfig/item/Item.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/item/Item.cs rename to DotNet/Logic/src/Config/GameConfig/item/Item.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/item/ItemExchange.cs b/DotNet/Logic/src/Config/GameConfig/item/ItemExchange.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/item/ItemExchange.cs rename to DotNet/Logic/src/Config/GameConfig/item/ItemExchange.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/item/TbItem.cs b/DotNet/Logic/src/Config/GameConfig/item/TbItem.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/item/TbItem.cs rename to DotNet/Logic/src/Config/GameConfig/item/TbItem.cs diff --git a/Assets/GameScripts/DotNet/Logic/Config~/GameConfig/test/AccessFlag.cs b/DotNet/Logic/src/Config/GameConfig/test/AccessFlag.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Config~/GameConfig/test/AccessFlag.cs rename to DotNet/Logic/src/Config/GameConfig/test/AccessFlag.cs diff --git a/Assets/GameScripts/DotNet/Logic/CustomExport/SceneTypeConfigToEnum.cs b/DotNet/Logic/src/CustomExport/SceneTypeConfigToEnum.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/CustomExport/SceneTypeConfigToEnum.cs rename to DotNet/Logic/src/CustomExport/SceneTypeConfigToEnum.cs diff --git a/Assets/GameScripts/DotNet/Logic/Entry.cs b/DotNet/Logic/src/Entry.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Entry.cs rename to DotNet/Logic/src/Entry.cs diff --git a/DotNet/Logic/src/Generate/ConfigTable/Entity/MachineConfig.cs b/DotNet/Logic/src/Generate/ConfigTable/Entity/MachineConfig.cs new file mode 100644 index 00000000..9d3e975b --- /dev/null +++ b/DotNet/Logic/src/Generate/ConfigTable/Entity/MachineConfig.cs @@ -0,0 +1,88 @@ +using System; +using ProtoBuf; +using TEngine.Core; +using System.Linq; +using System.Collections.Generic; +// ReSharper disable CollectionNeverUpdated.Global +// ReSharper disable UnusedAutoPropertyAccessor.Global +#pragma warning disable CS0169 +#pragma warning disable CS8618 +#pragma warning disable CS8625 +#pragma warning disable CS8603 + +namespace TEngine +{ + [ProtoContract] + public sealed partial class MachineConfigData : AProto, IConfigTable, IDisposable + { + [ProtoMember(1)] + public List List { get; set; } = new List(); + [ProtoIgnore] + private readonly Dictionary _configs = new Dictionary(); + private static MachineConfigData _instance; + + public static MachineConfigData Instance + { + get { return _instance ??= ConfigTableManage.Load(); } + private set => _instance = value; + } + + public MachineConfig Get(uint id, bool check = true) + { + if (_configs.ContainsKey(id)) + { + return _configs[id]; + } + + if (check) + { + throw new Exception($"MachineConfig not find {id} Id"); + } + + return null; + } + public bool TryGet(uint id, out MachineConfig config) + { + config = null; + + if (!_configs.ContainsKey(id)) + { + return false; + } + + config = _configs[id]; + return true; + } + public override void AfterDeserialization() + { + for (var i = 0; i < List.Count; i++) + { + MachineConfig config = List[i]; + _configs.Add(config.Id, config); + config.AfterDeserialization(); + } + + base.AfterDeserialization(); + } + + public void Dispose() + { + Instance = null; + } + } + + [ProtoContract] + public sealed partial class MachineConfig : AProto + { + [ProtoMember(1, IsRequired = true)] + public uint Id { get; set; } // Id + [ProtoMember(2, IsRequired = true)] + public string OuterIP { get; set; } // 外网IP + [ProtoMember(3, IsRequired = true)] + public string OuterBindIP { get; set; } // 外网绑定IP + [ProtoMember(4, IsRequired = true)] + public string InnerBindIP { get; set; } // 内网绑定IP + [ProtoMember(5, IsRequired = true)] + public int ManagementPort { get; set; } // 管理端口 + } +} \ No newline at end of file diff --git a/DotNet/Logic/src/Generate/ConfigTable/Entity/SceneConfig.cs b/DotNet/Logic/src/Generate/ConfigTable/Entity/SceneConfig.cs new file mode 100644 index 00000000..4e3ec6df --- /dev/null +++ b/DotNet/Logic/src/Generate/ConfigTable/Entity/SceneConfig.cs @@ -0,0 +1,94 @@ +using System; +using ProtoBuf; +using TEngine.Core; +using System.Linq; +using System.Collections.Generic; +// ReSharper disable CollectionNeverUpdated.Global +// ReSharper disable UnusedAutoPropertyAccessor.Global +#pragma warning disable CS0169 +#pragma warning disable CS8618 +#pragma warning disable CS8625 +#pragma warning disable CS8603 + +namespace TEngine +{ + [ProtoContract] + public sealed partial class SceneConfigData : AProto, IConfigTable, IDisposable + { + [ProtoMember(1)] + public List List { get; set; } = new List(); + [ProtoIgnore] + private readonly Dictionary _configs = new Dictionary(); + private static SceneConfigData _instance; + + public static SceneConfigData Instance + { + get { return _instance ??= ConfigTableManage.Load(); } + private set => _instance = value; + } + + public SceneConfig Get(uint id, bool check = true) + { + if (_configs.ContainsKey(id)) + { + return _configs[id]; + } + + if (check) + { + throw new Exception($"SceneConfig not find {id} Id"); + } + + return null; + } + public bool TryGet(uint id, out SceneConfig config) + { + config = null; + + if (!_configs.ContainsKey(id)) + { + return false; + } + + config = _configs[id]; + return true; + } + public override void AfterDeserialization() + { + for (var i = 0; i < List.Count; i++) + { + SceneConfig config = List[i]; + _configs.Add(config.Id, config); + config.AfterDeserialization(); + } + + base.AfterDeserialization(); + } + + public void Dispose() + { + Instance = null; + } + } + + [ProtoContract] + public sealed partial class SceneConfig : AProto + { + [ProtoMember(1, IsRequired = true)] + public uint Id { get; set; } // ID + [ProtoMember(2, IsRequired = true)] + public long EntityId { get; set; } // 实体Id + [ProtoMember(3, IsRequired = true)] + public uint RouteId { get; set; } // 路由Id + [ProtoMember(4, IsRequired = true)] + public uint WorldId { get; set; } // 世界Id + [ProtoMember(5, IsRequired = true)] + public string SceneType { get; set; } // Scene类型 + [ProtoMember(6, IsRequired = true)] + public string Name { get; set; } // 名称 + [ProtoMember(7, IsRequired = true)] + public string NetworkProtocol { get; set; } // 协议类型 + [ProtoMember(8, IsRequired = true)] + public int OuterPort { get; set; } // 外网端口 + } +} \ No newline at end of file diff --git a/DotNet/Logic/src/Generate/ConfigTable/Entity/ServerConfig.cs b/DotNet/Logic/src/Generate/ConfigTable/Entity/ServerConfig.cs new file mode 100644 index 00000000..40d1c128 --- /dev/null +++ b/DotNet/Logic/src/Generate/ConfigTable/Entity/ServerConfig.cs @@ -0,0 +1,86 @@ +using System; +using ProtoBuf; +using TEngine.Core; +using System.Linq; +using System.Collections.Generic; +// ReSharper disable CollectionNeverUpdated.Global +// ReSharper disable UnusedAutoPropertyAccessor.Global +#pragma warning disable CS0169 +#pragma warning disable CS8618 +#pragma warning disable CS8625 +#pragma warning disable CS8603 + +namespace TEngine +{ + [ProtoContract] + public sealed partial class ServerConfigData : AProto, IConfigTable, IDisposable + { + [ProtoMember(1)] + public List List { get; set; } = new List(); + [ProtoIgnore] + private readonly Dictionary _configs = new Dictionary(); + private static ServerConfigData _instance; + + public static ServerConfigData Instance + { + get { return _instance ??= ConfigTableManage.Load(); } + private set => _instance = value; + } + + public ServerConfig Get(uint id, bool check = true) + { + if (_configs.ContainsKey(id)) + { + return _configs[id]; + } + + if (check) + { + throw new Exception($"ServerConfig not find {id} Id"); + } + + return null; + } + public bool TryGet(uint id, out ServerConfig config) + { + config = null; + + if (!_configs.ContainsKey(id)) + { + return false; + } + + config = _configs[id]; + return true; + } + public override void AfterDeserialization() + { + for (var i = 0; i < List.Count; i++) + { + ServerConfig config = List[i]; + _configs.Add(config.Id, config); + config.AfterDeserialization(); + } + + base.AfterDeserialization(); + } + + public void Dispose() + { + Instance = null; + } + } + + [ProtoContract] + public sealed partial class ServerConfig : AProto + { + [ProtoMember(1, IsRequired = true)] + public uint Id { get; set; } // 路由Id + [ProtoMember(2, IsRequired = true)] + public uint MachineId { get; set; } // 机器ID + [ProtoMember(3, IsRequired = true)] + public int InnerPort { get; set; } // 内网端口 + [ProtoMember(4, IsRequired = true)] + public bool ReleaseMode { get; set; } // Release下运行 + } +} \ No newline at end of file diff --git a/DotNet/Logic/src/Generate/ConfigTable/Entity/WorldConfig.cs b/DotNet/Logic/src/Generate/ConfigTable/Entity/WorldConfig.cs new file mode 100644 index 00000000..2ccb8545 --- /dev/null +++ b/DotNet/Logic/src/Generate/ConfigTable/Entity/WorldConfig.cs @@ -0,0 +1,90 @@ +using System; +using ProtoBuf; +using TEngine.Core; +using System.Linq; +using System.Collections.Generic; +// ReSharper disable CollectionNeverUpdated.Global +// ReSharper disable UnusedAutoPropertyAccessor.Global +#pragma warning disable CS0169 +#pragma warning disable CS8618 +#pragma warning disable CS8625 +#pragma warning disable CS8603 + +namespace TEngine +{ + [ProtoContract] + public sealed partial class WorldConfigData : AProto, IConfigTable, IDisposable + { + [ProtoMember(1)] + public List List { get; set; } = new List(); + [ProtoIgnore] + private readonly Dictionary _configs = new Dictionary(); + private static WorldConfigData _instance; + + public static WorldConfigData Instance + { + get { return _instance ??= ConfigTableManage.Load(); } + private set => _instance = value; + } + + public WorldConfig Get(uint id, bool check = true) + { + if (_configs.ContainsKey(id)) + { + return _configs[id]; + } + + if (check) + { + throw new Exception($"WorldConfig not find {id} Id"); + } + + return null; + } + public bool TryGet(uint id, out WorldConfig config) + { + config = null; + + if (!_configs.ContainsKey(id)) + { + return false; + } + + config = _configs[id]; + return true; + } + public override void AfterDeserialization() + { + for (var i = 0; i < List.Count; i++) + { + WorldConfig config = List[i]; + _configs.Add(config.Id, config); + config.AfterDeserialization(); + } + + base.AfterDeserialization(); + } + + public void Dispose() + { + Instance = null; + } + } + + [ProtoContract] + public sealed partial class WorldConfig : AProto + { + [ProtoMember(1, IsRequired = true)] + public uint Id { get; set; } // Id + [ProtoMember(2, IsRequired = true)] + public string WorldName { get; set; } // 名称 + [ProtoMember(3, IsRequired = true)] + public string DbConnection { get; set; } // 连接字符串 + [ProtoMember(4, IsRequired = true)] + public string DbName { get; set; } // 数据库名称 + [ProtoMember(5, IsRequired = true)] + public string DbType { get; set; } // 数据库类型 + [ProtoMember(6, IsRequired = true)] + public bool IsGameWorld { get; set; } // 是否游戏服 + } +} \ No newline at end of file diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/CustomExport/SceneType.cs b/DotNet/Logic/src/Generate/CustomExport/SceneType.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/CustomExport/SceneType.cs rename to DotNet/Logic/src/Generate/CustomExport/SceneType.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonMessage.cs b/DotNet/Logic/src/Generate/NetworkProtocol/InnerBsonMessage.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonMessage.cs rename to DotNet/Logic/src/Generate/NetworkProtocol/InnerBsonMessage.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonOpcode.cs b/DotNet/Logic/src/Generate/NetworkProtocol/InnerBsonOpcode.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerBsonOpcode.cs rename to DotNet/Logic/src/Generate/NetworkProtocol/InnerBsonOpcode.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerMessage.cs b/DotNet/Logic/src/Generate/NetworkProtocol/InnerMessage.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerMessage.cs rename to DotNet/Logic/src/Generate/NetworkProtocol/InnerMessage.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerOpcode.cs b/DotNet/Logic/src/Generate/NetworkProtocol/InnerOpcode.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/InnerOpcode.cs rename to DotNet/Logic/src/Generate/NetworkProtocol/InnerOpcode.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterMessage.cs b/DotNet/Logic/src/Generate/NetworkProtocol/OuterMessage.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterMessage.cs rename to DotNet/Logic/src/Generate/NetworkProtocol/OuterMessage.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterOpcode.cs b/DotNet/Logic/src/Generate/NetworkProtocol/OuterOpcode.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/OuterOpcode.cs rename to DotNet/Logic/src/Generate/NetworkProtocol/OuterOpcode.cs diff --git a/Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/RouteType.cs b/DotNet/Logic/src/Generate/NetworkProtocol/RouteType.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/RouteType.cs rename to DotNet/Logic/src/Generate/NetworkProtocol/RouteType.cs diff --git a/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageHandler.cs b/DotNet/Logic/src/Handler/Address/H_C2M_MessageHandler.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageHandler.cs rename to DotNet/Logic/src/Handler/Address/H_C2M_MessageHandler.cs diff --git a/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageRequestHandler.cs b/DotNet/Logic/src/Handler/Address/H_C2M_MessageRequestHandler.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_MessageRequestHandler.cs rename to DotNet/Logic/src/Handler/Address/H_C2M_MessageRequestHandler.cs diff --git a/Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_PushAddressMessageToClientHandler.cs b/DotNet/Logic/src/Handler/Address/H_C2M_PushAddressMessageToClientHandler.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Handler/Address/H_C2M_PushAddressMessageToClientHandler.cs rename to DotNet/Logic/src/Handler/Address/H_C2M_PushAddressMessageToClientHandler.cs diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginAddressRequestHandler.cs b/DotNet/Logic/src/Handler/H_C2G_LoginAddressRequestHandler.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginAddressRequestHandler.cs rename to DotNet/Logic/src/Handler/H_C2G_LoginAddressRequestHandler.cs diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginRequestHandler.cs b/DotNet/Logic/src/Handler/H_C2G_LoginRequestHandler.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Handler/H_C2G_LoginRequestHandler.cs rename to DotNet/Logic/src/Handler/H_C2G_LoginRequestHandler.cs diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageHandler.cs b/DotNet/Logic/src/Handler/H_C2G_MessageHandler.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageHandler.cs rename to DotNet/Logic/src/Handler/H_C2G_MessageHandler.cs diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageRequestHandler.cs b/DotNet/Logic/src/Handler/H_C2G_MessageRequestHandler.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Handler/H_C2G_MessageRequestHandler.cs rename to DotNet/Logic/src/Handler/H_C2G_MessageRequestHandler.cs diff --git a/Assets/GameScripts/DotNet/Logic/Handler/H_C2G_PushMessageToClientHandler.cs b/DotNet/Logic/src/Handler/H_C2G_PushMessageToClientHandler.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Handler/H_C2G_PushMessageToClientHandler.cs rename to DotNet/Logic/src/Handler/H_C2G_PushMessageToClientHandler.cs diff --git a/Assets/GameScripts/DotNet/Logic/Handler/I_G2M_LoginAddressRequestHandler.cs b/DotNet/Logic/src/Handler/I_G2M_LoginAddressRequestHandler.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Handler/I_G2M_LoginAddressRequestHandler.cs rename to DotNet/Logic/src/Handler/I_G2M_LoginAddressRequestHandler.cs diff --git a/Assets/GameScripts/DotNet/Logic/Helper/AssemblySystem.cs b/DotNet/Logic/src/Helper/AssemblySystem.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Helper/AssemblySystem.cs rename to DotNet/Logic/src/Helper/AssemblySystem.cs diff --git a/Assets/GameScripts/DotNet/Logic/Helper/ConfigTableSystem.cs b/DotNet/Logic/src/Helper/ConfigTableSystem.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/Helper/ConfigTableSystem.cs rename to DotNet/Logic/src/Helper/ConfigTableSystem.cs diff --git a/Assets/GameScripts/DotNet/Logic/OnCreateScene.cs b/DotNet/Logic/src/OnCreateScene.cs similarity index 100% rename from Assets/GameScripts/DotNet/Logic/OnCreateScene.cs rename to DotNet/Logic/src/OnCreateScene.cs