gr682_ggi 4 лет назад
Родитель
Сommit
94c3ebd146
2 измененных файлов с 36 добавлено и 5 удалено
  1. 11 4
      Cliker/MainWindow.xaml
  2. 25 1
      Cliker/MainWindow.xaml.cs

+ 11 - 4
Cliker/MainWindow.xaml

@@ -21,16 +21,23 @@
                     <Label Content="YearsPerClick:" HorizontalAlignment="Left" Margin="301,199,0,0" VerticalAlignment="Top" Width="110" Grid.Column="2"/>
                     <Label x:Name="OYIP" Content="0" Grid.Column="2" HorizontalAlignment="Left" Margin="416,119,0,0" VerticalAlignment="Top"/>
                     <Label x:Name="YPC" Content="0" Grid.Column="2" HorizontalAlignment="Left" Margin="416,199,0,0" VerticalAlignment="Top" RenderTransformOrigin="1.923,0.594"/>
-                    <Label x:Name="Price_IIPF" Content="25" Grid.Column="2" HorizontalAlignment="Left" Margin="43,355,0,0" VerticalAlignment="Top" Width="24" RenderTransformOrigin="0.948,0.416"/>
-                    <Label x:Name="Price_IIPS" Content="50" Grid.Column="2" HorizontalAlignment="Left" Margin="189,355,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.497,0.104"/>
-                    <Button x:Name="IIPF_Click" Content="IncreaseInPoints + 4" HorizontalAlignment="Left" Margin="0,285,0,0" VerticalAlignment="Top" Width="115" Height="70" Click="Upgrade4" Grid.Column="2"/>
-                    <Button x:Name="IIPS_Click" Content="IncreaseInPoints + 6" HorizontalAlignment="Left" Margin="146,285,0,0" VerticalAlignment="Top" Width="115" Height="70" Click="Upgrade6" Grid.Column="2"/>
+                    <Label x:Name="Price_IIPF" Content="25" Grid.Column="2" HorizontalAlignment="Left" Margin="39,355,0,0" VerticalAlignment="Top" Width="24" RenderTransformOrigin="0.948,0.416"/>
+                    <Label x:Name="Price_IIPS" Content="50" Grid.Column="2" HorizontalAlignment="Left" Margin="174,355,0,0" VerticalAlignment="Top" RenderTransformOrigin="0.497,0.104"/>
+                    <Label x:Name="Price_IIPE" Content="75" Grid.Column="2" HorizontalAlignment="Left" Margin="313,355,0,0" VerticalAlignment="Top"/>
+                    <Label x:Name="Price_IIPT" Content="100" Grid.Column="2" HorizontalAlignment="Left" Margin="445,355,0,0" VerticalAlignment="Top"/>
+                    <Button x:Name="IIPF_Click" Content="IncreaseInPoints+4" HorizontalAlignment="Left" Margin="0,285,0,0" VerticalAlignment="Top" Width="108" Height="70" Click="Upgrade4" Grid.Column="2"/>
+                    <Button x:Name="IIPS_Click" Content="IncreaseInPoints+6" HorizontalAlignment="Left" Margin="134,285,0,0" VerticalAlignment="Top" Width="105" Height="70" Click="Upgrade6" Grid.Column="2"/>
+                    <Button x:Name="IIPE_Click" Content="IncreaseInPoints+8" Grid.Column="2" HorizontalAlignment="Left" Margin="266,285,0,0" VerticalAlignment="Top" Width="105" Height="70" Click="Upgrade6"/>
+                    <Button x:Name="IIPT_Click" Content="IncreaseInPoints+10" Grid.Column="2" HorizontalAlignment="Left" Margin="401,285,0,0" VerticalAlignment="Top" Width="119" Height="70" Click="Upgrade10"/>
                     <Button x:Name="EXIT_Click" Content="EXIT" Grid.Column="2" HorizontalAlignment="Left" Margin="445,0,0,0" VerticalAlignment="Top" Width="75" Height="65" RenderTransformOrigin="-0.222,0.102" Click="Button_Click"/>
+                 
+                  
                 </Grid>
             </TabItem>
             <TabItem Header="TabItem">
                 <Grid Background="#FFE5E5E5"/>
             </TabItem>
+            <Button Content="Button" Height="100" Width="75"/>
         </TabControl>
 
     </Grid>

+ 25 - 1
Cliker/MainWindow.xaml.cs

@@ -24,6 +24,8 @@ namespace Cliker
         static int click = 1;
         double sol_b1 = 25;
         double sol_b2 = 50;
+        double sol_b3 = 75;
+        double sol_b4 = 100;
 
         public MainWindow()
         {
@@ -36,6 +38,8 @@ namespace Cliker
             YPC.Content = click;
             Price_IIPF.Content = (sol_b1).ToString();
             Price_IIPS.Content = (sol_b2).ToString();
+            Price_IIPE.Content = (sol_b3).ToString();
+            Price_IIPT.Content = (sol_b4).ToString();
         }
 
         private void Image_MouseDown(object sender, MouseButtonEventArgs e)
@@ -58,12 +62,32 @@ namespace Cliker
         {
             if (point >= (sol_b2))
             {
-                point -= Convert.ToInt64(Math.Round(sol_b1));
+                point -= Convert.ToInt64(Math.Round(sol_b2));
                 click += 6;
                 Update();
             }
         }
 
+        private void Upgrade8(object sender, RoutedEventArgs e)
+        {
+            if (point >= (sol_b3))
+            {
+                point -= Convert.ToInt64(Math.Round(sol_b3));
+                click += 8;
+                Update();
+            }
+        }
+
+        private void Upgrade10(object sender, RoutedEventArgs e)
+        {
+            if (point >= (sol_b4))
+            {
+                point -= Convert.ToInt64(Math.Round(sol_b4));
+                click += 10;
+                Update();
+            }
+        }
+
         private void Button_Click(object sender, RoutedEventArgs e)
         {
             Application.Current.Shutdown();