Merge branch 'master' of http://git.legu.cc/liwei_3d/dfbattle

obj/Debug/net6.0/dfbattle.AssemblyInfo.cs

@@ -18,5 +18,5 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyTitleAttribute("dfbattle")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
 
-// 由 MSBuild WriteCodeFragment 类生成。
+// Generated by the MSBuild WriteCodeFragment class.
 

obj/Debug/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig

@@ -7,4 +7,8 @@ build_property.InvariantGlobalization =
 build_property.PlatformNeutralAssembly = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = dfbattle
+<<<<<<< HEAD
 build_property.ProjectDir = F:\work\c#\dfbattle\
+=======
+build_property.ProjectDir = /home/liwei/dfbattle/
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe

obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache

@@ -1 +1,5 @@
+<<<<<<< HEAD
 2b1963df72e0393b2f54a2f373236d9512a77a15
+=======
+043079b008ce5df4c13617bd2af47e214e500e6f
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe

obj/Debug/net6.0/dfbattle.csproj.FileListAbsolute.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 E:\c#\dfbattle\bin\Debug\net6.0\dfbattle.exe
 E:\c#\dfbattle\bin\Debug\net6.0\dfbattle.deps.json
 E:\c#\dfbattle\bin\Debug\net6.0\dfbattle.runtimeconfig.json
@@ -42,3 +43,47 @@ F:\work\c#\dfbattle\obj\Debug\net6.0\ref\dfbattle.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
+=======
+E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.exe
+E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.deps.json
+E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.runtimeconfig.json
+E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.dll
+E:/c#/dfbattle/bin/Debug/net6.0/dfbattle.pdb
+E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache
+E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig
+E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfoInputs.cache
+E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfo.cs
+E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache
+E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.dll
+E:/c#/dfbattle/obj/Debug/net6.0/refint/dfbattle.dll
+E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.pdb
+E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.genruntimeconfig.cache
+E:/c#/dfbattle/obj/Debug/net6.0/ref/dfbattle.dll
+E:/c#/dfbattle/bin/Debug/net6.0/Fleck.dll
+E:/c#/dfbattle/bin/Debug/net6.0/Google.Protobuf.dll
+E:/c#/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CopyComplete
+E:/c#/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll
+E:/c#/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
+E:/c#/dfbattle/bin/Debug/net6.0/battle.dll
+/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle
+/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle.deps.json
+/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle.runtimeconfig.json
+/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle.dll
+/home/liwei/dfbattle/bin/Debug/net6.0/dfbattle.pdb
+/home/liwei/dfbattle/bin/Debug/net6.0/Fleck.dll
+/home/liwei/dfbattle/bin/Debug/net6.0/Google.Protobuf.dll
+/home/liwei/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.dll
+/home/liwei/dfbattle/bin/Debug/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
+/home/liwei/dfbattle/bin/Debug/net6.0/battle.dll
+/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.csproj.AssemblyReference.cache
+/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig
+/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfoInputs.cache
+/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.AssemblyInfo.cs
+/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CoreCompileInputs.cache
+/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.csproj.CopyComplete
+/home/liwei/dfbattle/obj/Debug/net6.0/dfbattle.dll
+/home/liwei/dfbattle/obj/Debug/net6.0/refint/dfbattle.dll
+/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/ref/dfbattle.dll
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe

obj/Debug/net6.0/dfbattle.genruntimeconfig.cache

@@ -1 +1,5 @@
+<<<<<<< HEAD
 e467f67f7c05efce451b802592739e7f55c06ec5
+=======
+ce008eecd25694de187e069485ceb927ba88ca04
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe

obj/dfbattle.csproj.nuget.dgspec.json

@@ -1,6 +1,7 @@
 {
   "format": 1,
   "restore": {
+<<<<<<< HEAD
     "F:\\work\\c#\\dfbattle\\dfbattle.csproj": {}
   },
   "projects": {
@@ -15,6 +16,22 @@
         "projectStyle": "PackageReference",
         "configFilePaths": [
           "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config"
+=======
+    "/home/liwei/dfbattle/dfbattle.csproj": {}
+  },
+  "projects": {
+    "/home/liwei/dfbattle/dfbattle.csproj": {
+      "version": "1.0.0",
+      "restore": {
+        "projectUniqueName": "/home/liwei/dfbattle/dfbattle.csproj",
+        "projectName": "dfbattle",
+        "projectPath": "/home/liwei/dfbattle/dfbattle.csproj",
+        "packagesPath": "/root/.nuget/packages/",
+        "outputPath": "/home/liwei/dfbattle/obj/",
+        "projectStyle": "PackageReference",
+        "configFilePaths": [
+          "/root/.nuget/NuGet/NuGet.Config"
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
         ],
         "originalTargetFrameworks": [
           "net6.0"
@@ -81,7 +98,11 @@
               "privateAssets": "all"
             }
           },
+<<<<<<< HEAD
           "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"
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
         }
       }
     }

obj/dfbattle.csproj.nuget.g.props

@@ -4,6 +4,7 @@
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
+<<<<<<< HEAD
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
@@ -11,5 +12,14 @@
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" />
+=======
+    <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">/root/.nuget/packages/</NuGetPackageRoot>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">/root/.nuget/packages/</NuGetPackageFolders>
+    <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.3.1</NuGetToolVersion>
+  </PropertyGroup>
+  <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
+    <SourceRoot Include="/root/.nuget/packages/" />
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
   </ItemGroup>
 </Project>

obj/project.assets.json

@@ -11,6 +11,22 @@
           "lib/netcoreapp2.0/Fleck.dll": {}
         }
       },
+<<<<<<< HEAD
+=======
+      "Google.Protobuf/3.21.9": {
+        "type": "package",
+        "compile": {
+          "lib/net5.0/Google.Protobuf.dll": {
+            "related": ".pdb;.xml"
+          }
+        },
+        "runtime": {
+          "lib/net5.0/Google.Protobuf.dll": {
+            "related": ".pdb;.xml"
+          }
+        }
+      },
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
       "Microsoft.Extensions.DependencyInjection/2.1.1": {
         "type": "package",
         "dependencies": {
@@ -96,11 +112,16 @@
     ]
   },
   "packageFolders": {
+<<<<<<< HEAD
     "C:\\Users\\Administrator\\.nuget\\packages\\": {}
+=======
+    "/root/.nuget/packages/": {}
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
   },
   "project": {
     "version": "1.0.0",
     "restore": {
+<<<<<<< HEAD
       "projectUniqueName": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
       "projectName": "dfbattle",
       "projectPath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
@@ -109,6 +130,16 @@
       "projectStyle": "PackageReference",
       "configFilePaths": [
         "C:\\Users\\Administrator\\AppData\\Roaming\\NuGet\\NuGet.Config"
+=======
+      "projectUniqueName": "/home/liwei/dfbattle/dfbattle.csproj",
+      "projectName": "dfbattle",
+      "projectPath": "/home/liwei/dfbattle/dfbattle.csproj",
+      "packagesPath": "/root/.nuget/packages/",
+      "outputPath": "/home/liwei/dfbattle/obj/",
+      "projectStyle": "PackageReference",
+      "configFilePaths": [
+        "/root/.nuget/NuGet/NuGet.Config"
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
       ],
       "originalTargetFrameworks": [
         "net6.0"
@@ -175,7 +206,11 @@
             "privateAssets": "all"
           }
         },
+<<<<<<< HEAD
         "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"
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
       }
     }
   }

obj/project.nuget.cache

@@ -1,5 +1,6 @@
 {
   "version": 2,
+<<<<<<< HEAD
   "dgSpecHash": "BBp5wqZ2XAQY794M4tYkeLMy/p0T1Mmgp2CSpUhLV3NZACcr6Wh9QxvKSK1zJ6lQ74nVyW6X3SfX2hATVqkvfQ==",
   "success": true,
   "projectFilePath": "F:\\work\\c#\\dfbattle\\dfbattle.csproj",
@@ -11,6 +12,16 @@
     "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"
+=======
+  "dgSpecHash": "zBovY5NBf0c1R/WPihpnHEfJMjRwvylLUCWpeIn14fvCWbKy0J5NOisGvz90yskeRxteThXft7l9+5VrPTHd3Q==",
+  "success": true,
+  "projectFilePath": "/home/liwei/dfbattle/dfbattle.csproj",
+  "expectedPackageFiles": [
+    "/root/.nuget/packages/fleck/1.2.0/fleck.1.2.0.nupkg.sha512",
+    "/root/.nuget/packages/google.protobuf/3.21.9/google.protobuf.3.21.9.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"
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe
   ],
   "logs": []
 }

obj/release/net6.0/dfbattle.AssemblyInfo.cs

@@ -18,5 +18,5 @@ using System.Reflection;
 [assembly: System.Reflection.AssemblyTitleAttribute("dfbattle")]
 [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
 
-// 由 MSBuild WriteCodeFragment 类生成。
+// Generated by the MSBuild WriteCodeFragment class.
 

obj/release/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig

@@ -7,4 +7,8 @@ build_property.InvariantGlobalization =
 build_property.PlatformNeutralAssembly = 
 build_property._SupportedPlatformList = Linux,macOS,Windows
 build_property.RootNamespace = dfbattle
+<<<<<<< HEAD
 build_property.ProjectDir = F:\work\c#\dfbattle\
+=======
+build_property.ProjectDir = /home/liwei/dfbattle/
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe

obj/release/net6.0/dfbattle.csproj.CoreCompileInputs.cache

@@ -1 +1,5 @@
+<<<<<<< HEAD
 cdb420ed9d2cd23254dbcdf062ae3dab201b3fa5
+=======
+88be5f3aedb4327d1960419193f5964d1643dce7
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe

obj/release/net6.0/dfbattle.csproj.FileListAbsolute.txt

@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 E:\c#\dfbattle\bin\release\net6.0\dfbattle.exe
 E:\c#\dfbattle\bin\release\net6.0\dfbattle.deps.json
 E:\c#\dfbattle\bin\release\net6.0\dfbattle.runtimeconfig.json
@@ -40,3 +41,26 @@ F:\work\c#\dfbattle\obj\release\net6.0\refint\dfbattle.dll
 F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.pdb
 F:\work\c#\dfbattle\obj\release\net6.0\dfbattle.genruntimeconfig.cache
 F:\work\c#\dfbattle\obj\release\net6.0\ref\dfbattle.dll
+=======
+/home/liwei/dfbattle/bin/release/net6.0/dfbattle
+/home/liwei/dfbattle/bin/release/net6.0/dfbattle.deps.json
+/home/liwei/dfbattle/bin/release/net6.0/dfbattle.runtimeconfig.json
+/home/liwei/dfbattle/bin/release/net6.0/dfbattle.dll
+/home/liwei/dfbattle/bin/release/net6.0/dfbattle.pdb
+/home/liwei/dfbattle/bin/release/net6.0/Fleck.dll
+/home/liwei/dfbattle/bin/release/net6.0/Google.Protobuf.dll
+/home/liwei/dfbattle/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.dll
+/home/liwei/dfbattle/bin/release/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll
+/home/liwei/dfbattle/bin/release/net6.0/battle.dll
+/home/liwei/dfbattle/obj/release/net6.0/dfbattle.csproj.AssemblyReference.cache
+/home/liwei/dfbattle/obj/release/net6.0/dfbattle.GeneratedMSBuildEditorConfig.editorconfig
+/home/liwei/dfbattle/obj/release/net6.0/dfbattle.AssemblyInfoInputs.cache
+/home/liwei/dfbattle/obj/release/net6.0/dfbattle.AssemblyInfo.cs
+/home/liwei/dfbattle/obj/release/net6.0/dfbattle.csproj.CoreCompileInputs.cache
+/home/liwei/dfbattle/obj/release/net6.0/dfbattle.csproj.CopyComplete
+/home/liwei/dfbattle/obj/release/net6.0/dfbattle.dll
+/home/liwei/dfbattle/obj/release/net6.0/refint/dfbattle.dll
+/home/liwei/dfbattle/obj/release/net6.0/dfbattle.pdb
+/home/liwei/dfbattle/obj/release/net6.0/dfbattle.genruntimeconfig.cache
+/home/liwei/dfbattle/obj/release/net6.0/ref/dfbattle.dll
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe

obj/release/net6.0/dfbattle.genruntimeconfig.cache

@@ -1 +1,5 @@
+<<<<<<< HEAD
 16fd2c759a11de13b6ae27331c561236ddac0ac6
+=======
+1325482b98face973291ed3e9a15254102c923dc
+>>>>>>> 0c89ce8f57574a79be05318b25837c9e2457d2fe