Update
This commit is contained in:
ALEXTANG
2023-07-13 18:20:39 +08:00
parent bff8f20af3
commit fbb26ea9ea
4 changed files with 38 additions and 11 deletions

View File

@@ -5,6 +5,10 @@ namespace TEngine
{ {
static Log() static Log()
{ {
if (LogCore.Instance == null)
{
LogCore.TempInstance = new LogCore();
}
LogCore.Instance.ILog = new NLog("Server"); LogCore.Instance.ILog = new NLog("Server");
} }

View File

@@ -17,6 +17,26 @@ namespace TEngine.Core
AssemblyManager.OnUnLoadAssemblyEvent += OnUnLoad; AssemblyManager.OnUnLoadAssemblyEvent += OnUnLoad;
} }
/// <summary>
/// 特殊情况调用设置。
/// </summary>
public static T TempInstance
{
get
{
return Instance;
}
set
{
if (Instance != null)
{
return;
}
Instance = value;
}
}
public virtual Task Initialize() public virtual Task Initialize()
{ {
return Task.CompletedTask; return Task.CompletedTask;

View File

@@ -3,7 +3,10 @@
"rootNamespace": "", "rootNamespace": "",
"references": [ "references": [
"GUID:08c3762f54316454ca6b6fbcb22b40e5", "GUID:08c3762f54316454ca6b6fbcb22b40e5",
"GUID:aa06d4cc755c979489c256c1bcca1dfb" "GUID:aa06d4cc755c979489c256c1bcca1dfb",
"GUID:d020df1f2b63b444e8ca93c0d88597e2",
"GUID:ecba4a58c7f7a4842b72ce2c77aecf9b",
"GUID:d8b63aba1907145bea998dd612889d6b"
], ],
"includePlatforms": [], "includePlatforms": [],
"excludePlatforms": [], "excludePlatforms": [],

View File

@@ -1,27 +1,27 @@
{ {
"Export": { "Export": {
"ProtoBufTemplatePath": { "ProtoBufTemplatePath": {
"Value": "../Config/Template/ProtoTemplate.txt", "Value": "../../../Config/Template/ProtoTemplate.txt",
"Comment": "ProtoBuf生成代码模板的位置" "Comment": "ProtoBuf生成代码模板的位置"
}, },
"ProtoBufDirectory": { "ProtoBufDirectory": {
"Value": "../Config/ProtoBuf/", "Value": "../../../Config/ProtoBuf/",
"Comment": "ProtoBuf文件所在的位置文件夹位置" "Comment": "ProtoBuf文件所在的位置文件夹位置"
}, },
"ProtoBufServerDirectory": { "ProtoBufServerDirectory": {
"Value": "../../Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/", "Value": "../../../../Assets/GameScripts/DotNet/Logic/Generate~/NetworkProtocol/",
"Comment": "ProtoBuf生成到服务端的文件夹位置" "Comment": "ProtoBuf生成到服务端的文件夹位置"
}, },
"ProtoBufClientDirectory": { "ProtoBufClientDirectory": {
"Value": "../../Assets/GameScripts/HotFix/GameProto/GameProtocol/", "Value": "../../../../Assets/GameScripts/HotFix/GameProto/GameProtocol/",
"Comment": "ProtoBuf生成到客户端的文件夹位置" "Comment": "ProtoBuf生成到客户端的文件夹位置"
}, },
"ExcelProgramPath": { "ExcelProgramPath": {
"Value": "../Config/Excel/", "Value": "../../../Config/Excel/",
"Comment": "Excel配置文件根目录" "Comment": "Excel配置文件根目录"
}, },
"ExcelVersionFile": { "ExcelVersionFile": {
"Value": ".../Config/Excel/Version.txt", "Value": ".../../../Config/Excel/Version.txt",
"Comment": "Excel版本文件的位置" "Comment": "Excel版本文件的位置"
}, },
"ExcelServerFileDirectory": { "ExcelServerFileDirectory": {
@@ -33,7 +33,7 @@
"Comment": "Excel生成客户端代码文件夹位置" "Comment": "Excel生成客户端代码文件夹位置"
}, },
"ExcelServerBinaryDirectory": { "ExcelServerBinaryDirectory": {
"Value": "../Config/Binary/", "Value": "../../../Config/Binary/",
"Comment": "Excel生成服务器二进制数据文件夹位置" "Comment": "Excel生成服务器二进制数据文件夹位置"
}, },
"ExcelClientBinaryDirectory": { "ExcelClientBinaryDirectory": {
@@ -41,15 +41,15 @@
"Comment": "Excel生成客户端二进制数据文件夹位置" "Comment": "Excel生成客户端二进制数据文件夹位置"
}, },
"ExcelServerJsonDirectory": { "ExcelServerJsonDirectory": {
"Value": "../Config/Json/Server/", "Value": "../../../Config/Json/Server/",
"Comment": "Excel生成服务器Json数据文件夹位置" "Comment": "Excel生成服务器Json数据文件夹位置"
}, },
"ExcelClientJsonDirectory": { "ExcelClientJsonDirectory": {
"Value": "../Config/Json/Client/", "Value": "../../../Config/Json/Client/",
"Comment": "Excel生成客户端Json数据文件夹位置" "Comment": "Excel生成客户端Json数据文件夹位置"
}, },
"ExcelTemplatePath": { "ExcelTemplatePath": {
"Value": "../Config/Template/ExcelTemplate.txt", "Value": "../../../Config/Template/ExcelTemplate.txt",
"Comment": "Excel生成代码模板的位置" "Comment": "Excel生成代码模板的位置"
}, },
"ServerCustomExportDirectory": { "ServerCustomExportDirectory": {