diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..920974e --- /dev/null +++ b/.gitignore @@ -0,0 +1,13 @@ +# ---> Go +# Binaries for programs and plugins +*.exe +*.exe~ + +# Test binary, built with `go test -c` +*.test + +# Output of the go coverage tool, specifically when used with LiteIDE +*.out + +*.log +/output \ No newline at end of file diff --git a/Program.cs b/Program.cs index d1e5cb1..6e3f986 100644 --- a/Program.cs +++ b/Program.cs @@ -10,10 +10,13 @@ namespace BattleServer { HotUpdateScripts.FightRunnerMgr.Instance.Init("./GameConfig/"); cfg.Game.HeroData data = HotUpdateScripts.FightBase.GC.Hero.Get("25001"); - HotUpdateScripts.FightDebug.Log("测试读取配置 name:"+data.Name); + Console.WriteLine("测试读取配置 name:"+data.Name); Console.WriteLine("BattleServer Start!"); Service service = new Service(); - Console.ReadKey(); + while(true){ + + } + Console.WriteLine("BattleServer End!"); } } } \ No newline at end of file diff --git a/bin/Debug/net6.0/FightRunner.dll b/bin/Debug/net6.0/FightRunner.dll deleted file mode 100644 index c24270b..0000000 Binary files a/bin/Debug/net6.0/FightRunner.dll and /dev/null differ diff --git a/bin/Debug/net6.0/Fleck.dll b/bin/Debug/net6.0/Fleck.dll deleted file mode 100755 index bc0b959..0000000 Binary files a/bin/Debug/net6.0/Fleck.dll and /dev/null differ diff --git a/bin/Debug/net6.0/GameFight.dll b/bin/Debug/net6.0/GameFight.dll deleted file mode 100644 index febae82..0000000 Binary files a/bin/Debug/net6.0/GameFight.dll and /dev/null differ diff --git a/bin/Debug/net6.0/GameProto.dll b/bin/Debug/net6.0/GameProto.dll deleted file mode 100644 index 1de9c27..0000000 Binary files a/bin/Debug/net6.0/GameProto.dll and /dev/null differ diff --git a/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll b/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll deleted file mode 100755 index 7d8769b..0000000 Binary files a/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll and /dev/null differ diff --git a/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll b/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll deleted file mode 100755 index cdcb266..0000000 Binary files a/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll and /dev/null differ diff --git a/bin/Debug/net6.0/battle.dll b/bin/Debug/net6.0/battle.dll deleted file mode 100644 index c2bb95b..0000000 Binary files a/bin/Debug/net6.0/battle.dll and /dev/null differ diff --git a/bin/Debug/net6.0/dfbattle b/bin/Debug/net6.0/dfbattle deleted file mode 100755 index a201475..0000000 Binary files a/bin/Debug/net6.0/dfbattle and /dev/null differ diff --git a/bin/Debug/net6.0/dfbattle.deps.json b/bin/Debug/net6.0/dfbattle.deps.json deleted file mode 100644 index 4a392fc..0000000 --- a/bin/Debug/net6.0/dfbattle.deps.json +++ /dev/null @@ -1,131 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "dfbattle/1.0.0": { - "dependencies": { - "Fleck": "1.2.0", - "Microsoft.Extensions.DependencyInjection": "2.1.1", - "battle": "1.0.0.0", - "FightRunner": "1.0.0.0", - "GameFight": "1.0.0.0", - "GameProto": "1.0.0.0" - }, - "runtime": { - "dfbattle.dll": {} - } - }, - "Fleck/1.2.0": { - "runtime": { - "lib/netcoreapp2.0/Fleck.dll": { - "assemblyVersion": "1.2.0.0", - "fileVersion": "1.2.0.0" - } - } - }, - "Microsoft.Extensions.DependencyInjection/2.1.1": { - "dependencies": { - "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.1" - }, - "runtime": { - "lib/netcoreapp2.0/Microsoft.Extensions.DependencyInjection.dll": { - "assemblyVersion": "2.1.1.0", - "fileVersion": "2.1.1.18157" - } - } - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": { - "runtime": { - "lib/netstandard2.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll": { - "assemblyVersion": "2.1.1.0", - "fileVersion": "2.1.1.18157" - } - } - }, - "battle/1.0.0.0": { - "runtime": { - "battle.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "1.0.0.0" - } - } - }, - "FightRunner/1.0.0.0": { - "runtime": { - "FightRunner.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "1.0.0.0" - } - } - }, - "GameFight/1.0.0.0": { - "runtime": { - "GameFight.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "1.0.0.0" - } - } - }, - "GameProto/1.0.0.0": { - "runtime": { - "GameProto.dll": { - "assemblyVersion": "1.0.0.0", - "fileVersion": "1.0.0.0" - } - } - } - } - }, - "libraries": { - "dfbattle/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Fleck/1.2.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-bPLXn6QbLAFoviur6XbrKB0Zn6x04E8VibHXyHZeJsoC7bkUl5DVtzM5cZgDuqHkIrBqAXJyTNJwSNIc6wBJ2Q==", - "path": "fleck/1.2.0", - "hashPath": "fleck.1.2.0.nupkg.sha512" - }, - "Microsoft.Extensions.DependencyInjection/2.1.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-RVdgNWT/73M0eCpreGpWv5NmbHFGQzzW+G7nChK8ej84m+d1nzeWrtqcRYnEpKNx3B8V/Uek4tNP0WCaCNjYnQ==", - "path": "microsoft.extensions.dependencyinjection/2.1.1", - "hashPath": "microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512" - }, - "Microsoft.Extensions.DependencyInjection.Abstractions/2.1.1": { - "type": "package", - "serviceable": true, - "sha512": "sha512-MgYpU5cwZohUMKKg3sbPhvGG+eAZ/59E9UwPwlrUkyXU+PGzqwZg9yyQNjhxuAWmoNoFReoemeCku50prYSGzA==", - "path": "microsoft.extensions.dependencyinjection.abstractions/2.1.1", - "hashPath": "microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512" - }, - "battle/1.0.0.0": { - "type": "reference", - "serviceable": false, - "sha512": "" - }, - "FightRunner/1.0.0.0": { - "type": "reference", - "serviceable": false, - "sha512": "" - }, - "GameFight/1.0.0.0": { - "type": "reference", - "serviceable": false, - "sha512": "" - }, - "GameProto/1.0.0.0": { - "type": "reference", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/bin/Debug/net6.0/dfbattle.dll b/bin/Debug/net6.0/dfbattle.dll deleted file mode 100644 index a4594b6..0000000 Binary files a/bin/Debug/net6.0/dfbattle.dll and /dev/null differ diff --git a/bin/Debug/net6.0/dfbattle.pdb b/bin/Debug/net6.0/dfbattle.pdb deleted file mode 100644 index f37a692..0000000 Binary files a/bin/Debug/net6.0/dfbattle.pdb and /dev/null differ diff --git a/bin/Debug/net6.0/dfbattle.runtimeconfig.json b/bin/Debug/net6.0/dfbattle.runtimeconfig.json deleted file mode 100644 index 4986d16..0000000 --- a/bin/Debug/net6.0/dfbattle.runtimeconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net6.0", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "6.0.0" - } - } -} \ No newline at end of file diff --git a/bin/release/net6.0/dfbattle.deps.json b/bin/release/net6.0/dfbattle.deps.json index 81b1f7b..4a392fc 100644 --- a/bin/release/net6.0/dfbattle.deps.json +++ b/bin/release/net6.0/dfbattle.deps.json @@ -9,9 +9,11 @@ "dfbattle/1.0.0": { "dependencies": { "Fleck": "1.2.0", - "Google.Protobuf": "3.21.9", "Microsoft.Extensions.DependencyInjection": "2.1.1", - "battle": "1.0.0.0" + "battle": "1.0.0.0", + "FightRunner": "1.0.0.0", + "GameFight": "1.0.0.0", + "GameProto": "1.0.0.0" }, "runtime": { "dfbattle.dll": {} @@ -25,14 +27,6 @@ } } }, - "Google.Protobuf/3.21.9": { - "runtime": { - "lib/net5.0/Google.Protobuf.dll": { - "assemblyVersion": "3.21.9.0", - "fileVersion": "3.21.9.0" - } - } - }, "Microsoft.Extensions.DependencyInjection/2.1.1": { "dependencies": { "Microsoft.Extensions.DependencyInjection.Abstractions": "2.1.1" @@ -59,6 +53,30 @@ "fileVersion": "1.0.0.0" } } + }, + "FightRunner/1.0.0.0": { + "runtime": { + "FightRunner.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "GameFight/1.0.0.0": { + "runtime": { + "GameFight.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } + }, + "GameProto/1.0.0.0": { + "runtime": { + "GameProto.dll": { + "assemblyVersion": "1.0.0.0", + "fileVersion": "1.0.0.0" + } + } } } }, @@ -75,13 +93,6 @@ "path": "fleck/1.2.0", "hashPath": "fleck.1.2.0.nupkg.sha512" }, - "Google.Protobuf/3.21.9": { - "type": "package", - "serviceable": true, - "sha512": "sha512-OTpFujTgkmqMLbg3KT7F/iuKi1rg6s5FCS2M9XcVLDn40zL8wgXm37CY/F6MeOEXKjdcnXGCN/h7oyMkVydVsg==", - "path": "google.protobuf/3.21.9", - "hashPath": "google.protobuf.3.21.9.nupkg.sha512" - }, "Microsoft.Extensions.DependencyInjection/2.1.1": { "type": "package", "serviceable": true, @@ -100,6 +111,21 @@ "type": "reference", "serviceable": false, "sha512": "" + }, + "FightRunner/1.0.0.0": { + "type": "reference", + "serviceable": false, + "sha512": "" + }, + "GameFight/1.0.0.0": { + "type": "reference", + "serviceable": false, + "sha512": "" + }, + "GameProto/1.0.0.0": { + "type": "reference", + "serviceable": false, + "sha512": "" } } } \ No newline at end of file diff --git a/bin/release/net6.0/dfbattle.dll b/bin/release/net6.0/dfbattle.dll index 1a29fa0..3f1d3ab 100644 Binary files a/bin/release/net6.0/dfbattle.dll and b/bin/release/net6.0/dfbattle.dll differ diff --git a/bin/release/net6.0/dfbattle.pdb b/bin/release/net6.0/dfbattle.pdb index 147dac1..70bfb7b 100644 Binary files a/bin/release/net6.0/dfbattle.pdb and b/bin/release/net6.0/dfbattle.pdb differ diff --git a/obj/Debug/net6.0/dfbattle.AssemblyInfo.cs b/obj/Debug/net6.0/dfbattle.AssemblyInfo.cs deleted file mode 100644 index a36a3c4..0000000 --- a/obj/Debug/net6.0/dfbattle.AssemblyInfo.cs +++ /dev/null @@ -1,22 +0,0 @@ -//------------------------------------------------------------------------------ -// -// This code was generated by a tool. -// -// Changes to this file may cause incorrect behavior and will be lost if -// the code is regenerated. -// -//------------------------------------------------------------------------------ - -using System; -using System.Reflection; - -[assembly: System.Reflection.AssemblyCompanyAttribute("dfbattle")] -[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] -[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")] -[assembly: System.Reflection.AssemblyProductAttribute("dfbattle")] -[assembly: System.Reflection.AssemblyTitleAttribute("dfbattle")] -[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] - -// 由 MSBuild WriteCodeFragment 类生成。 - diff --git a/obj/Debug/net6.0/dfbattle.AssemblyInfoInputs.cache b/obj/Debug/net6.0/dfbattle.AssemblyInfoInputs.cache deleted file mode 100644 index 1720c65..0000000 --- a/obj/Debug/net6.0/dfbattle.AssemblyInfoInputs.cache +++ /dev/null @@ -1 +0,0 @@ -1c0b81c852e44cc253216ba4ce98894e13df5491 diff --git a/obj/Debug/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig b/obj/Debug/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig deleted file mode 100644 index 31327a7..0000000 --- a/obj/Debug/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig +++ /dev/null @@ -1,10 +0,0 @@ -is_global = true -build_property.TargetFramework = net6.0 -build_property.TargetPlatformMinVersion = -build_property.UsingMicrosoftNETSdkWeb = -build_property.ProjectTypeGuids = -build_property.InvariantGlobalization = -build_property.PlatformNeutralAssembly = -build_property._SupportedPlatformList = Linux,macOS,Windows -build_property.RootNamespace = dfbattle -build_property.ProjectDir = F:\work\c#\dfbattle\ diff --git a/obj/Debug/net6.0/dfbattle.assets.cache b/obj/Debug/net6.0/dfbattle.assets.cache index 21832a2..27b23bb 100644 Binary files a/obj/Debug/net6.0/dfbattle.assets.cache and b/obj/Debug/net6.0/dfbattle.assets.cache differ diff --git a/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache b/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache deleted file mode 100644 index f923ebd..0000000 Binary files a/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache and /dev/null differ diff --git a/obj/Debug/net6.0/dfbattle.csproj.CopyComplete b/obj/Debug/net6.0/dfbattle.csproj.CopyComplete deleted file mode 100644 index e69de29..0000000 diff --git a/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache b/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache deleted file mode 100644 index d15e074..0000000 --- a/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -2b1963df72e0393b2f54a2f373236d9512a77a15 diff --git a/obj/Debug/net6.0/dfbattle.csproj.FileListAbsolute.txt b/obj/Debug/net6.0/dfbattle.csproj.FileListAbsolute.txt index a4f6892..f9a5984 100644 --- a/obj/Debug/net6.0/dfbattle.csproj.FileListAbsolute.txt +++ b/obj/Debug/net6.0/dfbattle.csproj.FileListAbsolute.txt @@ -1,23 +1,23 @@ -F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.exe -F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.deps.json -F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.runtimeconfig.json -F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.dll -F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.pdb -F:\work\c#\dfbattle\bin\Debug\net6.0\Fleck.dll -F:\work\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.dll -F:\work\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll -F:\work\c#\dfbattle\bin\Debug\net6.0\battle.dll -F:\work\c#\dfbattle\bin\Debug\net6.0\FightRunner.dll -F:\work\c#\dfbattle\bin\Debug\net6.0\GameFight.dll -F:\work\c#\dfbattle\bin\Debug\net6.0\GameProto.dll -F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.AssemblyReference.cache -F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.GeneratedMSBuildEditorConfig.editorconfig -F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.AssemblyInfoInputs.cache -F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.AssemblyInfo.cs -F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.CoreCompileInputs.cache -F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.CopyComplete -F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.dll -F:\work\c#\dfbattle\obj\Debug\net6.0\refint\dfbattle.dll -F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.pdb -F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.genruntimeconfig.cache -F:\work\c#\dfbattle\obj\Debug\net6.0\ref\dfbattle.dll +F:/work/c#/dfbattle/bin/Debug/net6.0/dfbattle.exe +F:/work/c#/dfbattle/bin/Debug/net6.0/dfbattle.deps.json +F:/work/c#/dfbattle/bin/Debug/net6.0/dfbattle.runtimeconfig.json +F:/work/c#/dfbattle/bin/Debug/net6.0/dfbattle.dll +F:/work/c#/dfbattle/bin/Debug/net6.0/dfbattle.pdb +F:/work/c#/dfbattle/bin/Debug/net6.0/Fleck.dll +F:/work/c#/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll +F:/work/c#/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll +F:/work/c#/dfbattle/bin/Debug/net6.0/battle.dll +F:/work/c#/dfbattle/bin/Debug/net6.0/FightRunner.dll +F:/work/c#/dfbattle/bin/Debug/net6.0/GameFight.dll +F:/work/c#/dfbattle/bin/Debug/net6.0/GameProto.dll +F:/work/c#/dfbattle/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache +F:/work/c#/dfbattle/obj/Debug/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig +F:/work/c#/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfoInputs.cache +F:/work/c#/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfo.cs +F:/work/c#/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache +F:/work/c#/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CopyComplete +F:/work/c#/dfbattle/obj/Debug/net6.0/dfbattle.dll +F:/work/c#/dfbattle/obj/Debug/net6.0/refint/dfbattle.dll +F:/work/c#/dfbattle/obj/Debug/net6.0/dfbattle.pdb +F:/work/c#/dfbattle/obj/Debug/net6.0/dfbattle.genruntimeconfig.cache +F:/work/c#/dfbattle/obj/Debug/net6.0/ref/dfbattle.dll diff --git a/obj/Debug/net6.0/dfbattle.dll b/obj/Debug/net6.0/dfbattle.dll deleted file mode 100644 index a4594b6..0000000 Binary files a/obj/Debug/net6.0/dfbattle.dll and /dev/null differ diff --git a/obj/Debug/net6.0/dfbattle.genruntimeconfig.cache b/obj/Debug/net6.0/dfbattle.genruntimeconfig.cache deleted file mode 100644 index 085d1f4..0000000 --- a/obj/Debug/net6.0/dfbattle.genruntimeconfig.cache +++ /dev/null @@ -1 +0,0 @@ -e467f67f7c05efce451b802592739e7f55c06ec5 diff --git a/obj/Debug/net6.0/dfbattle.pdb b/obj/Debug/net6.0/dfbattle.pdb deleted file mode 100644 index f37a692..0000000 Binary files a/obj/Debug/net6.0/dfbattle.pdb and /dev/null differ diff --git a/obj/Debug/net6.0/ref/dfbattle.dll b/obj/Debug/net6.0/ref/dfbattle.dll deleted file mode 100644 index ff8e6d1..0000000 Binary files a/obj/Debug/net6.0/ref/dfbattle.dll and /dev/null differ diff --git a/obj/Debug/net6.0/refint/dfbattle.dll b/obj/Debug/net6.0/refint/dfbattle.dll deleted file mode 100644 index ff8e6d1..0000000 Binary files a/obj/Debug/net6.0/refint/dfbattle.dll and /dev/null differ diff --git a/obj/dfbattle.csproj.nuget.dgspec.json b/obj/dfbattle.csproj.nuget.dgspec.json index 14e7623..c9496b7 100644 --- a/obj/dfbattle.csproj.nuget.dgspec.json +++ b/obj/dfbattle.csproj.nuget.dgspec.json @@ -1,20 +1,20 @@ { "format": 1, "restore": { - "F:\\work\\c#\\dfbattle\\dfbattle.csproj": {} + "/home/liwei/dfbattle/dfbattle.csproj": {} }, "projects": { - "F:\\work\\c#\\dfbattle\\dfbattle.csproj": { + "/home/liwei/dfbattle/dfbattle.csproj": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\work\\c#\\dfbattle\\dfbattle.csproj", + "projectUniqueName": "/home/liwei/dfbattle/dfbattle.csproj", "projectName": "dfbattle", - "projectPath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj", - "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", - "outputPath": "F:\\work\\c#\\dfbattle\\obj\\", + "projectPath": "/home/liwei/dfbattle/dfbattle.csproj", + "packagesPath": "/root/.nuget/packages/", + "outputPath": "/home/liwei/dfbattle/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config" + "/root/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ "net6.0" @@ -58,30 +58,12 @@ ], "assetTargetFallback": true, "warn": true, - "downloadDependencies": [ - { - "name": "Microsoft.AspNetCore.App.Ref", - "version": "[6.0.7, 6.0.7]" - }, - { - "name": "Microsoft.NETCore.App.Host.win-x64", - "version": "[6.0.7, 6.0.7]" - }, - { - "name": "Microsoft.NETCore.App.Ref", - "version": "[6.0.7, 6.0.7]" - }, - { - "name": "Microsoft.WindowsDesktop.App.Ref", - "version": "[6.0.7, 6.0.7]" - } - ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.100-preview.7.22377.5\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/6.0.403/RuntimeIdentifierGraph.json" } } } diff --git a/obj/dfbattle.csproj.nuget.g.props b/obj/dfbattle.csproj.nuget.g.props index b9ec79b..7414b8a 100644 --- a/obj/dfbattle.csproj.nuget.g.props +++ b/obj/dfbattle.csproj.nuget.g.props @@ -4,12 +4,12 @@ True NuGet $(MSBuildThisFileDirectory)project.assets.json - $(UserProfile)\.nuget\packages\ - C:\Users\Administrator\.nuget\packages\ + /root/.nuget/packages/ + /root/.nuget/packages/ PackageReference - 6.3.0 + 6.3.1 - + \ No newline at end of file diff --git a/obj/project.assets.json b/obj/project.assets.json index 3741c4a..e264685 100644 --- a/obj/project.assets.json +++ b/obj/project.assets.json @@ -96,19 +96,19 @@ ] }, "packageFolders": { - "C:\\Users\\Administrator\\.nuget\\packages\\": {} + "/root/.nuget/packages/": {} }, "project": { "version": "1.0.0", "restore": { - "projectUniqueName": "F:\\work\\c#\\dfbattle\\dfbattle.csproj", + "projectUniqueName": "/home/liwei/dfbattle/dfbattle.csproj", "projectName": "dfbattle", - "projectPath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj", - "packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\", - "outputPath": "F:\\work\\c#\\dfbattle\\obj\\", + "projectPath": "/home/liwei/dfbattle/dfbattle.csproj", + "packagesPath": "/root/.nuget/packages/", + "outputPath": "/home/liwei/dfbattle/obj/", "projectStyle": "PackageReference", "configFilePaths": [ - "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config" + "/root/.nuget/NuGet/NuGet.Config" ], "originalTargetFrameworks": [ "net6.0" @@ -152,30 +152,12 @@ ], "assetTargetFallback": true, "warn": true, - "downloadDependencies": [ - { - "name": "Microsoft.AspNetCore.App.Ref", - "version": "[6.0.7, 6.0.7]" - }, - { - "name": "Microsoft.NETCore.App.Host.win-x64", - "version": "[6.0.7, 6.0.7]" - }, - { - "name": "Microsoft.NETCore.App.Ref", - "version": "[6.0.7, 6.0.7]" - }, - { - "name": "Microsoft.WindowsDesktop.App.Ref", - "version": "[6.0.7, 6.0.7]" - } - ], "frameworkReferences": { "Microsoft.NETCore.App": { "privateAssets": "all" } }, - "runtimeIdentifierGraphPath": "C:\\Program Files\\dotnet\\sdk\\7.0.100-preview.7.22377.5\\RuntimeIdentifierGraph.json" + "runtimeIdentifierGraphPath": "/usr/share/dotnet/sdk/6.0.403/RuntimeIdentifierGraph.json" } } } diff --git a/obj/project.nuget.cache b/obj/project.nuget.cache index ceb55f9..7216ffa 100644 --- a/obj/project.nuget.cache +++ b/obj/project.nuget.cache @@ -1,16 +1,12 @@ { "version": 2, - "dgSpecHash": "BBp5wqZ2XAQY794M4tYkeLMy/p0T1Mmgp2CSpUhLV3NZACcr6Wh9QxvKSK1zJ6lQ74nVyW6X3SfX2hATVqkvfQ==", + "dgSpecHash": "U7iSCXM95oW+n/qf9XI0Hrk5P/my9bkBH1g1hrCNoo+nc9qgCACaMeVRMcFAsJF7LJfWECsisUMcT4TuExRmUQ==", "success": true, - "projectFilePath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj", + "projectFilePath": "/home/liwei/dfbattle/dfbattle.csproj", "expectedPackageFiles": [ - "C:\\Users\\Administrator\\.nuget\\packages\\fleck\\1.2.0\\fleck.1.2.0.nupkg.sha512", - "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.dependencyinjection\\2.1.1\\microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512", - "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.extensions.dependencyinjection.abstractions\\2.1.1\\microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512", - "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.app.ref\\6.0.7\\microsoft.netcore.app.ref.6.0.7.nupkg.sha512", - "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.windowsdesktop.app.ref\\6.0.7\\microsoft.windowsdesktop.app.ref.6.0.7.nupkg.sha512", - "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.aspnetcore.app.ref\\6.0.7\\microsoft.aspnetcore.app.ref.6.0.7.nupkg.sha512", - "C:\\Users\\Administrator\\.nuget\\packages\\microsoft.netcore.app.host.win-x64\\6.0.7\\microsoft.netcore.app.host.win-x64.6.0.7.nupkg.sha512" + "/root/.nuget/packages/fleck/1.2.0/fleck.1.2.0.nupkg.sha512", + "/root/.nuget/packages/microsoft.extensions.dependencyinjection/2.1.1/microsoft.extensions.dependencyinjection.2.1.1.nupkg.sha512", + "/root/.nuget/packages/microsoft.extensions.dependencyinjection.abstractions/2.1.1/microsoft.extensions.dependencyinjection.abstractions.2.1.1.nupkg.sha512" ], "logs": [] } \ No newline at end of file diff --git a/start.sh b/start.sh new file mode 100755 index 0000000..2c900a1 --- /dev/null +++ b/start.sh @@ -0,0 +1,3 @@ +./stup.sh start dfbattle.dll +sleep 1 +exit \ No newline at end of file diff --git a/stop.sh b/stop.sh new file mode 100755 index 0000000..2977c26 --- /dev/null +++ b/stop.sh @@ -0,0 +1 @@ +./stup.sh stop dfbattle.dll \ No newline at end of file diff --git a/stup.sh b/stup.sh new file mode 100755 index 0000000..e8203a7 --- /dev/null +++ b/stup.sh @@ -0,0 +1,60 @@ + #!/bin/sh + SERVICE=$2 + CMD="dotnet $2" + + start(){ + echo "starting $SERVICE..." + num=`ps -ef | grep dotnet | grep $SERVICE | grep -v grep | grep -v /bin/bash | wc -l` + if [ $num -eq 0 ] + then + # nohup $CMD > /dev/null 2>&1 & + nohup $CMD > $SERVICE.log 2>&1 & + if [ $? -ne 0 ] + then + echo "start failed, please check the log!" + exit $? + else + + # echo $! > $SERVICE.pid + echo "start success" + fi + else + echo "$SERVICE is already running" + fi + + + } + stop(){ + echo "stopping $SERVICE..." + #kill -9 `cat $SERVICE.pid` + kill -9 `ps -ef | grep dotnet | grep $SERVICE | awk '{print $2}'` + if [ $? -ne 0 ] + then + echo "stop failed, may be $SERVICE isn't running" + exit $? + else + #rm -rf $SERVICE.pid + echo "stop success" + fi + } + restart(){ + stop&&start + } + status(){ + num=`ps -ef | grep dotnet | grep $SERVICE | grep -v grep | wc -l` + if [ $num -eq 0 ] + then + echo "$SERVICE isn't running" + else + echo "$SERVICE is running" + fi + } + case $1 in + start) start ;; + stop) stop ;; + restart) restart ;; + status) status ;; + *) echo "Usage: $0 {start|stop|restart|status}" ;; + esac + + exit 0