From 09b864e0e3b793187a606ffd0d829aef9511653a Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期二, 18 三月 2025 13:55:51 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
index cc5bd6b..652fba9 100644
--- a/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
+++ b/WinFrmUI/Yw.WinFrmUI.Bimface.Core/Yw.WinFrmUI.Bimface.Core.csproj
@@ -40,6 +40,8 @@
<None Remove="bimface\imgs\CalcuQ.png" />
<None Remove="bimface\imgs\CalcuVelocity.png" />
<None Remove="bimface\imgs\flowEffect.png" />
+ <None Remove="bimface\imgs\monitor_analyse.png" />
+ <None Remove="bimface\imgs\monitor_docking.png" />
<None Remove="bimface\js\Background.js" />
<None Remove="bimface\js\Base64.js" />
<None Remove="bimface\js\CameraStatus.js" />
@@ -52,10 +54,12 @@
<None Remove="bimface\js\DrawableContainer.js" />
<None Remove="bimface\js\GetComponents.js" />
<None Remove="bimface\js\Layer.js" />
+ <None Remove="bimface\js\LogicBodyGlowEffect.js" />
<None Remove="bimface\js\LogicCalcuCustomLabel.js" />
<None Remove="bimface\js\LogicFlowEffect.js" />
<None Remove="bimface\js\LogicMarkLeadLabel.js" />
<None Remove="bimface\js\LogicMonitor.js" />
+ <None Remove="bimface\js\LogicOutlineGlowEffect.js" />
<None Remove="bimface\js\Marker3dContainer.js" />
<None Remove="bimface\js\Panel.js" />
<None Remove="bimface\js\SelectedComponents.js" />
@@ -110,6 +114,12 @@
<Content Include="bimface\imgs\flowEffect.png">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="bimface\imgs\monitor_analyse.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="bimface\imgs\monitor_docking.png">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="bimface\js\Background.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -149,6 +159,12 @@
<Content Include="bimface\js\Layer.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
+ <Content Include="bimface\js\LogicBodyGlowEffect.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
+ <Content Include="bimface\js\LogicOutlineGlowEffect.js">
+ <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+ </Content>
<Content Include="bimface\js\LogicMonitor.js">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
@@ -178,7 +194,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Yw.BIMFace.SDK.Core" Version="3.0.5" />
- <PackageReference Include="Yw.BLL.Bimface.Core" Version="3.0.9" />
+ <PackageReference Include="Yw.BLL.Bimface.Core" Version="3.1.0" />
<PackageReference Include="Yw.WebBrower.Core" Version="3.0.2" />
<PackageReference Include="Yw.WebView2.WinFrmUI.Core" Version="3.0.1" />
</ItemGroup>
--
Gitblit v1.9.3