From aa8a3dcb1cb921c9f721aac4c9c87c696ce8a354 Mon Sep 17 00:00:00 2001
From: wxr <464027401@qq.com>
Date: 星期二, 30 三月 2021 09:19:10 +0800
Subject: [PATCH] Merge branch 'dev-tzy' into temp-wxr
---
HDL-ON_Android/HDL-ON_Android.csproj | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/HDL-ON_Android/HDL-ON_Android.csproj b/HDL-ON_Android/HDL-ON_Android.csproj
index 08a3a02..b85e077 100644
--- a/HDL-ON_Android/HDL-ON_Android.csproj
+++ b/HDL-ON_Android/HDL-ON_Android.csproj
@@ -336,6 +336,7 @@
<Folder Include="Assets\Phone\FunctionIcon\Electrical\ClothesHanger\" />
<Folder Include="Assets\Phone\PirIcon\" />
<Folder Include="Assets\Phone\VideoIcon\" />
+ <Folder Include="Assets\Phone\FunctionIcon\Energy\" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
@@ -1076,6 +1077,7 @@
<AndroidAsset Include="Assets\Phone\FunctionIcon\EnvirSensor\0.png" />
<AndroidAsset Include="Assets\Phone\PirIcon\add.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AC\More.png" />
+ <AndroidAsset Include="Assets\Phone\FunctionIcon\Energy\EnergyDrodDownIcon.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\VentilateSelect.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\EnergySelect.png" />
<AndroidAsset Include="Assets\Phone\FunctionIcon\AirFresh\Fan2Select.png" />
@@ -1099,12 +1101,6 @@
<ItemGroup>
<AndroidNativeLibrary Include="libs\armeabi-v7a\libelianjni.so" />
<AndroidNativeLibrary Include="libs\armeabi-v7a\libjcore127.so" />
- </ItemGroup>
- <ItemGroup>
- <ProjectReference Include="..\ys\ys.csproj">
- <Project>{DF065E3F-C3A1-4908-9582-000974B7C290}</Project>
- <Name>ys</Name>
- </ProjectReference>
</ItemGroup>
<Import Project="..\HDL_ON\HDL_ON.projitems" Label="Shared" Condition="Exists('..\HDL_ON\HDL_ON.projitems')" />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
--
Gitblit v1.8.0