Merge branch 'master' of http://git.legu.cc/liwei_3d/dfbattle
This commit is contained in:
commit
bd5d30b16c
@ -7,4 +7,4 @@ build_property.InvariantGlobalization =
|
|||||||
build_property.PlatformNeutralAssembly =
|
build_property.PlatformNeutralAssembly =
|
||||||
build_property._SupportedPlatformList = Linux,macOS,Windows
|
build_property._SupportedPlatformList = Linux,macOS,Windows
|
||||||
build_property.RootNamespace = dfbattle
|
build_property.RootNamespace = dfbattle
|
||||||
build_property.ProjectDir = F:\work\c#\dfbattle\
|
build_property.ProjectDir = /home/liwei/dfbattle/
|
||||||
|
Binary file not shown.
Binary file not shown.
@ -1 +1 @@
|
|||||||
60cbd222e33b4c1b3bcd5f3d4c821bfd2dd0c6d8
|
429e9f4848e0766a3e78a9047d2ec22e3e5acd55
|
||||||
|
@ -6,7 +6,6 @@
|
|||||||
/home/liwei/dfbattle/output/Fleck.dll
|
/home/liwei/dfbattle/output/Fleck.dll
|
||||||
/home/liwei/dfbattle/output/Microsoft.Extensions.DependencyInjection.dll
|
/home/liwei/dfbattle/output/Microsoft.Extensions.DependencyInjection.dll
|
||||||
/home/liwei/dfbattle/output/Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
/home/liwei/dfbattle/output/Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
||||||
/home/liwei/dfbattle/output/battle.dll
|
|
||||||
/home/liwei/dfbattle/output/FightRunner.dll
|
/home/liwei/dfbattle/output/FightRunner.dll
|
||||||
/home/liwei/dfbattle/output/GameFight.dll
|
/home/liwei/dfbattle/output/GameFight.dll
|
||||||
/home/liwei/dfbattle/output/GameProto.dll
|
/home/liwei/dfbattle/output/GameProto.dll
|
||||||
@ -21,25 +20,25 @@
|
|||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.pdb
|
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.pdb
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.genruntimeconfig.cache
|
/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.genruntimeconfig.cache
|
||||||
/home/liwei/dfbattle/obj/Debug/net6.0/ref/dfbattle.dll
|
/home/liwei/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.exe
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.deps.json
|
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.runtimeconfig.json
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\dfbattle.dll
|
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/dfbattle.pdb
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\Fleck.dll
|
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.dll
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
F:/work/c#/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\FightRunner.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/GameFight.dll
|
||||||
F:\work\c#\dfbattle\bin\Debug\net6.0\GameProto.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.csproj.AssemblyReference.cache
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.GeneratedMSBuildEditorConfig.editorconfig
|
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.AssemblyInfoInputs.cache
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.AssemblyInfo.cs
|
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.CoreCompileInputs.cache
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.csproj.CopyComplete
|
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/dfbattle.dll
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\refint\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.pdb
|
||||||
F:\work\c#\dfbattle\obj\Debug\net6.0\dfbattle.genruntimeconfig.cache
|
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/obj/Debug/net6.0/ref/dfbattle.dll
|
||||||
|
Binary file not shown.
@ -1 +1 @@
|
|||||||
e467f67f7c05efce451b802592739e7f55c06ec5
|
ce008eecd25694de187e069485ceb927ba88ca04
|
||||||
|
Binary file not shown.
@ -1,20 +1,20 @@
|
|||||||
{
|
{
|
||||||
"format": 1,
|
"format": 1,
|
||||||
"restore": {
|
"restore": {
|
||||||
"F:\\work\\c#\\dfbattle\\dfbattle.csproj": {}
|
"/home/liwei/dfbattle/dfbattle.csproj": {}
|
||||||
},
|
},
|
||||||
"projects": {
|
"projects": {
|
||||||
"F:\\work\\c#\\dfbattle\\dfbattle.csproj": {
|
"/home/liwei/dfbattle/dfbattle.csproj": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
"projectUniqueName": "/home/liwei/dfbattle/dfbattle.csproj",
|
||||||
"projectName": "dfbattle",
|
"projectName": "dfbattle",
|
||||||
"projectPath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
"projectPath": "/home/liwei/dfbattle/dfbattle.csproj",
|
||||||
"packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
|
"packagesPath": "/root/.nuget/packages/",
|
||||||
"outputPath": "F:\\work\\c#\\dfbattle\\obj\\",
|
"outputPath": "/home/liwei/dfbattle/obj/",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config"
|
"/root/.nuget/NuGet/NuGet.Config"
|
||||||
],
|
],
|
||||||
"originalTargetFrameworks": [
|
"originalTargetFrameworks": [
|
||||||
"net6.0"
|
"net6.0"
|
||||||
@ -58,30 +58,12 @@
|
|||||||
],
|
],
|
||||||
"assetTargetFallback": true,
|
"assetTargetFallback": true,
|
||||||
"warn": 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": {
|
"frameworkReferences": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"privateAssets": "all"
|
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -4,12 +4,12 @@
|
|||||||
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
|
<RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
|
||||||
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
<RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
|
||||||
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
<ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
|
||||||
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
|
<NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/root/.nuget/packages/</NuGetPackageRoot>
|
||||||
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
|
<NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/root/.nuget/packages/</NuGetPackageFolders>
|
||||||
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
<NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
|
||||||
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.3.0</NuGetToolVersion>
|
<NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.3.1</NuGetToolVersion>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
<ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
|
||||||
<SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
|
<SourceRoot Include="/root/.nuget/packages/" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
</Project>
|
</Project>
|
@ -96,19 +96,19 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"packageFolders": {
|
"packageFolders": {
|
||||||
"C:\\Users\\Administrator\\.nuget\\packages\\": {}
|
"/root/.nuget/packages/": {}
|
||||||
},
|
},
|
||||||
"project": {
|
"project": {
|
||||||
"version": "1.0.0",
|
"version": "1.0.0",
|
||||||
"restore": {
|
"restore": {
|
||||||
"projectUniqueName": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
"projectUniqueName": "/home/liwei/dfbattle/dfbattle.csproj",
|
||||||
"projectName": "dfbattle",
|
"projectName": "dfbattle",
|
||||||
"projectPath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
"projectPath": "/home/liwei/dfbattle/dfbattle.csproj",
|
||||||
"packagesPath": "C:\\Users\\Administrator\\.nuget\\packages\\",
|
"packagesPath": "/root/.nuget/packages/",
|
||||||
"outputPath": "F:\\work\\c#\\dfbattle\\obj\\",
|
"outputPath": "/home/liwei/dfbattle/obj/",
|
||||||
"projectStyle": "PackageReference",
|
"projectStyle": "PackageReference",
|
||||||
"configFilePaths": [
|
"configFilePaths": [
|
||||||
"C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config"
|
"/root/.nuget/NuGet/NuGet.Config"
|
||||||
],
|
],
|
||||||
"originalTargetFrameworks": [
|
"originalTargetFrameworks": [
|
||||||
"net6.0"
|
"net6.0"
|
||||||
@ -152,30 +152,12 @@
|
|||||||
],
|
],
|
||||||
"assetTargetFallback": true,
|
"assetTargetFallback": true,
|
||||||
"warn": 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": {
|
"frameworkReferences": {
|
||||||
"Microsoft.NETCore.App": {
|
"Microsoft.NETCore.App": {
|
||||||
"privateAssets": "all"
|
"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"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -1,16 +1,12 @@
|
|||||||
{
|
{
|
||||||
"version": 2,
|
"version": 2,
|
||||||
"dgSpecHash": "BBp5wqZ2XAQY794M4tYkeLMy/p0T1Mmgp2CSpUhLV3NZACcr6Wh9QxvKSK1zJ6lQ74nVyW6X3SfX2hATVqkvfQ==",
|
"dgSpecHash": "U7iSCXM95oW+n/qf9XI0Hrk5P/my9bkBH1g1hrCNoo+nc9qgCACaMeVRMcFAsJF7LJfWECsisUMcT4TuExRmUQ==",
|
||||||
"success": true,
|
"success": true,
|
||||||
"projectFilePath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
|
"projectFilePath": "/home/liwei/dfbattle/dfbattle.csproj",
|
||||||
"expectedPackageFiles": [
|
"expectedPackageFiles": [
|
||||||
"C:\\Users\\Administrator\\.nuget\\packages\\fleck\\1.2.0\\fleck.1.2.0.nupkg.sha512",
|
"/root/.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",
|
"/root/.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",
|
"/root/.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"
|
|
||||||
],
|
],
|
||||||
"logs": []
|
"logs": []
|
||||||
}
|
}
|
Loading…
Reference in New Issue
Block a user