From c2fa168aff53d879f72412c94baa7be4998dae5e Mon Sep 17 00:00:00 2001
From: qinjie <qinjie@163.com>
Date: 星期六, 02 十二月 2023 12:56:28 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/Yw/Hydro.V1.0

---
 Hydro.MapView/Hydro.MapView.csproj |   10 +++++++---
 1 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Hydro.MapView/Hydro.MapView.csproj b/Hydro.MapView/Hydro.MapView.csproj
index 7aa8d0d..09f559b 100644
--- a/Hydro.MapView/Hydro.MapView.csproj
+++ b/Hydro.MapView/Hydro.MapView.csproj
@@ -21,7 +21,7 @@
     <OutputPath>bin\Debug\</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <WarningLevel>0</WarningLevel>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -53,6 +53,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Base\AreaViewModel.cs" />
     <Compile Include="Base\IBaseViewModel.cs" />
     <Compile Include="Base\LinkViewModel.cs" />
     <Compile Include="Base\NodeViewModel.cs" />
@@ -60,13 +61,15 @@
     <Compile Include="Common\Copy.cs" />
     <Compile Include="Common\Dataset.cs" />
     <Compile Include="Common\Default.cs" />
-    <Compile Include="Common\dict.cs" />
+    <Compile Include="Common\Global.cs" />
+    <Compile Include="Common\MapObjectExtensions.cs" />
     <Compile Include="Common\MapOption.cs" />
-    <Compile Include="Common\MapView.cs" />
+    <Compile Include="Common\MapDimensions.cs" />
     <Compile Include="Common\ShouldSerializeContractResolver.cs" />
     <Compile Include="Common\TempForEnum.cs" />
     <Compile Include="Enum\MapViewEnum.cs" />
     <Compile Include="MapViewNetWork.cs" />
+    <Compile Include="MapViewNetWork2Inp.cs" />
     <Compile Include="Model\AreaViewModel.cs" />
     <Compile Include="Model\Factory.cs" />
     <Compile Include="Model\FactoryList.cs" />
@@ -83,6 +86,7 @@
     <Compile Include="Model\ValveNodeViewModel.cs" />
     <Compile Include="Model\ValveViewModel.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="Template\Floor.cs" />
     <Compile Include="Template\Template.cs" />
     <Compile Include="Template\TemplateList.cs" />
   </ItemGroup>

--
Gitblit v1.9.3