Merge branch 'master' of http://www.scserverddns.top:13000/sc/DyeingComputer

DyeingComputer.csproj

@@ -400,6 +400,28 @@
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.css" />
     <Content Include="Fonts\font-awesome-4.7.0\css\font-awesome.min.css" />
     <Content Include="Fonts\font-awesome-4.7.0\fonts\fontawesome-webfont.svg" />
+    <Resource Include="Lmage\guandao %2812%29.png" />
+    <Resource Include="Lmage\guandao %2813%29.png" />
+    <Resource Include="Lmage\guandao %2814%29.png" />
+    <Resource Include="Lmage\guandao %2815%29.png" />
+    <Resource Include="Lmage\guandao %2816%29.png" />
+    <Resource Include="Lmage\guandao %282%29.png" />
+    <Resource Include="Lmage\guandao %283%29.png" />
+    <Resource Include="Lmage\guandao %284%29.png" />
+    <Resource Include="Lmage\guandao %285%29.png" />
+    <Resource Include="Lmage\guandao %286%29.png" />
+    <Resource Include="Lmage\guandao %287%29.png" />
+    <Resource Include="Lmage\guandao %288%29.png" />
+    <Resource Include="Lmage\guandao %289%29.png" />
+    <Resource Include="Lmage\tong.png" />
+    <Resource Include="Lmage\beng_err.png" />
+    <Resource Include="Lmage\beng_run.png" />
+    <Resource Include="Lmage\beng_stop.png" />
+    <Resource Include="Lmage\fa_bili.png" />
+    <Resource Include="Lmage\guamaoqi.png" />
+    <Resource Include="Lmage\guandao %281%29.png" />
+    <Resource Include="Lmage\guandao %2810%29.png" />
+    <Resource Include="Lmage\guandao %2811%29.png" />
     <Resource Include="Lmage\10001.gif" />
     <Resource Include="Lmage\10000.png" />
     <Resource Include="Lmage\1000-3.png" />

View/EquipmentSimulationView.xaml

@@ -13,6 +13,9 @@
                    HorizontalAlignment="Left" VerticalAlignment="Top" Canvas.Left="100" Canvas.Top="125"/>
             <Image Width="300" Height="300" gif:ImageBehavior.AnimatedSource="/Lmage/10001.gif"
                gif:ImageBehavior.RepeatBehavior="Forever" HorizontalAlignment="Left" Canvas.Left="20" Canvas.Top="180"/>
+
+            <Image Width="186" Height="154" gif:ImageBehavior.AnimatedSource="/Lmage/tong.png"
+               gif:ImageBehavior.RepeatBehavior="Forever" HorizontalAlignment="Left" Canvas.Left="930" Canvas.Top="79" VerticalAlignment="Top"/>
         </Canvas>
         <TextBlock x:Name="M_T" HorizontalAlignment="Left" Height="30" Margin="260,180,0,0" TextWrapping="Wrap" Text="C" TextAlignment="Right"
                    VerticalAlignment="Top" Width="100" FontSize="20" Background="White" Padding="5,0,5,0"/>