Merge pull request #3 from plumsoftware/feature/skuf-update

Добавил шрека-скуфа и новый фон.
plumsoftware · Oct 31, 2024 · baf9df7 · baf9df7
2 parents a91e9f2 + 18357a6
commit baf9df7
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "ru.plumsoftware.robloxclicker"
         minSdk 22
         targetSdk 34
-        versionCode 13
-        versionName "13.0.0 - Tools update"
+        versionCode 14
+        versionName "14.0.0 - Skuf update"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
@@ -36,10 +36,10 @@ dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.7.0'
     implementation 'com.google.android.material:material:1.12.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.constraintlayout:constraintlayout:2.2.0'
     testImplementation 'junit:junit:4.13.2'
 //    androidTestImplementation 'androidx.test.ext:junit:1.2.1'
 //    androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
 
-    implementation 'com.yandex.android:mobileads:7.5.0'
+    implementation 'com.yandex.android:mobileads:7.6.0'
 }
diff --git a/app/src/main/java/ru/plumsoftware/robloxclicker/data/Data.java b/app/src/main/java/ru/plumsoftware/robloxclicker/data/Data.java
@@ -33,7 +33,8 @@ public abstract class Data {
             "skibidi",
             "shrec",
             "spider",
-            "brick"
+            "brick",
+            "skuf_srek_1"
     };
 
     public static final String[] SP_BACK_IS_BUY = new String[]{
@@ -42,6 +43,7 @@ public abstract class Data {
             "back_4",
             "back_5",
             "back_6",
-            "back_7"
+            "back_7",
+            "back_8"
     };
 }
diff --git a/app/src/main/java/ru/plumsoftware/robloxclicker/heroes/Backs.java b/app/src/main/java/ru/plumsoftware/robloxclicker/heroes/Backs.java
@@ -12,23 +12,26 @@ public abstract class Backs {
             "Морской порт",
             "Секретный задний фон",
             "Скибиди задний фон",
-            "Современный город"
+            "Современный город",
+            "Болото"
     };
     public static final int[] BACKS_RES_ID = new int[]{
             R.drawable.back_2,
             R.drawable.back_3,
             R.drawable.back_4,
             R.drawable.back_5,
             R.drawable.skibidi_toilet_nackground_1,
-            R.drawable.back_7
+            R.drawable.back_7,
+            R.drawable.back_8
     };
     public static final int[] BACKS_PRICES = new int[]{
             5000,
             100000,
             2000000,
             5500000,
             8500000,
-            1500000
+            1500000,
+            3000000
     };
 
     public static List<Back> buildHeroes() {

diff --git a/app/src/main/java/ru/plumsoftware/robloxclicker/heroes/Heroes.java b/app/src/main/java/ru/plumsoftware/robloxclicker/heroes/Heroes.java
@@ -30,7 +30,8 @@ public abstract class Heroes {
             "Элитный секретный персонаж",
             "Шрекус",
             "Человек паук Роблокс",
-            "Строитель Роблокс"
+            "Строитель Роблокс",
+            "Скуф - брокколи"
     };
     public static final int[] HEROES_RES_ID = new int[]{
             R.drawable.capitan_roblox_1,
@@ -56,7 +57,8 @@ public abstract class Heroes {
             R.drawable.skibidi_touilet_1,
             R.drawable.shrecus,
             R.drawable.spider,
-            R.drawable.builder_1
+            R.drawable.builder_1,
+            R.drawable.skuf_shek
     };
     public static final int[] HEROES_CLICKS = new int[]{
             1,
@@ -82,7 +84,8 @@ public abstract class Heroes {
             50000,
             60000,
             70000,
-            80000
+            80000,
+            95000
     };
     public static final int[] HEROES_PRICES = new int[]{
             0,
@@ -108,7 +111,8 @@ public abstract class Heroes {
             25000000,
             30000000,
             35000000,
-            40000000
+            40000000,
+            55000000
     };
 
     public static List<Hero> buildHeroes() {

diff --git a/app/src/main/res/drawable/back_8.png b/app/src/main/res/drawable/back_8.png
diff --git a/app/src/main/res/drawable/skuf_shek.png b/app/src/main/res/drawable/skuf_shek.png