27.10.20(2)

Cliker/MainWindow.xaml

@@ -9,22 +9,23 @@
     <Grid>
         <TabControl HorizontalAlignment="Left" Height="419" VerticalAlignment="Top" Width="550
                     " Margin="0,0,-241,0">
-            <TabItem Header="TabItem">
+            <TabItem Header="Clicker">
                 <Grid Background="#FFE5E5E5" Margin="0,4,-1,-4">
                     <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="6*"/>
-                        <ColumnDefinition Width="125*"/>
+                        <ColumnDefinition/>
+                        <ColumnDefinition Width="Auto"/>
+                        <ColumnDefinition Width="40*"/>
                     </Grid.ColumnDefinitions>
-                    <Image x:Name="Putin" HorizontalAlignment="Left" Height="199" Margin="25,55,0,0" VerticalAlignment="Top" Width="261" Source="IconCliker/gl_el.jpg" MouseDown="Image_MouseDown" Grid.ColumnSpan="2"/>
-                    <Label Content="OnlyYearsIsPower:" HorizontalAlignment="Left" Margin="301,119,0,0" VerticalAlignment="Top" Width="110" Grid.Column="1"/>
-                    <Label Content="YearsPerClick:" HorizontalAlignment="Left" Margin="301,199,0,0" VerticalAlignment="Top" Width="110" Grid.Column="1"/>
-                    <Label x:Name="OYIP" Content="0" Grid.Column="1" HorizontalAlignment="Left" Margin="416,119,0,0" VerticalAlignment="Top"/>
-                    <Label x:Name="YPC" Content="0" Grid.Column="1" HorizontalAlignment="Left" Margin="416,199,0,0" VerticalAlignment="Top" RenderTransformOrigin="1.923,0.594"/>
-                    <Button x:Name="IIPF_Click" Content="IncreaseInPoints+4" HorizontalAlignment="Left" Margin="25,291,0,0" VerticalAlignment="Top" Width="115" Height="70" Click="Upgrade4" Grid.ColumnSpan="2"/>
-                    <Button x:Name="IIPS_Click" Content="IncreaseInPoints + 6" HorizontalAlignment="Left" Margin="135,291,0,0" VerticalAlignment="Top" Width="115" Height="70" Click="Upgrade6" Grid.Column="1"/>
-                    <Button x:Name="EXIT_Click" Content="EXIT" Grid.Column="1" HorizontalAlignment="Left" Margin="445,0,0,0" VerticalAlignment="Top" Width="75" Height="65" RenderTransformOrigin="-0.222,0.102" Click="Button_Click"/>
-                    
-
+                    <Image x:Name="Putin" HorizontalAlignment="Left" Height="199" Margin="0,55,0,0" VerticalAlignment="Top" Width="261" Source="IconCliker/gl_el.jpg" MouseDown="Image_MouseDown" Grid.Column="2"/>
+                    <Label Content="OnlyYearsIsPower:" HorizontalAlignment="Left" Margin="301,119,0,0" VerticalAlignment="Top" Width="110" Grid.Column="2"/>
+                    <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"/>
+                    <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">

Cliker/MainWindow.xaml.cs

@@ -22,8 +22,8 @@ namespace Cliker
     {
         long point = 1;
         static int click = 1;
-        double sol_b1 = 10 + 10 * (30 + click * 0.2);
-        double sol_b2 = 20 + 20 * (60 + click * 0.4);
+        double sol_b1 = 25;
+        double sol_b2 = 50;
 
         public MainWindow()
         {
@@ -34,8 +34,8 @@ namespace Cliker
         {
             OYIP.Content = point;
             YPC.Content = click;
-            //OYIP.Content = (sol_b1).ToString();
-            ///YPC.Content = (sol_b2).ToString();
+            Price_IIPF.Content = (sol_b1).ToString();
+            Price_IIPS.Content = (sol_b2).ToString();
         }
 
         private void Image_MouseDown(object sender, MouseButtonEventArgs e)
@@ -56,7 +56,7 @@ namespace Cliker
 
         private void Upgrade6(object sender, RoutedEventArgs e)
         {
-            if (point >= (sol_b1))
+            if (point >= (sol_b2))
             {
                 point -= Convert.ToInt64(Math.Round(sol_b1));
                 click += 6;