Skip to content

Commit 9690cfb

Browse files
authored
Merge pull request #5 from plumsoftware/patch-1
Добавил персов из игры в кальмара
2 parents 69ccb67 + ec4ed6e commit 9690cfb

File tree

17 files changed

+97
-60
lines changed

17 files changed

+97
-60
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/gradle.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ android {
1010
applicationId "ru.plumsoftware.robloxclicker"
1111
minSdk 22
1212
targetSdk 35
13-
versionCode 15
14-
versionName "14.0.1"
13+
versionCode 16
14+
versionName "15.0.0"
1515

1616
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
1717
}
@@ -41,5 +41,5 @@ dependencies {
4141
// androidTestImplementation 'androidx.test.ext:junit:1.2.1'
4242
// androidTestImplementation 'androidx.test.espresso:espresso-core:3.6.1'
4343

44-
implementation 'com.yandex.android:mobileads:7.7.0'
44+
implementation 'com.yandex.android:mobileads:7.8.1'
4545
}

app/src/main/java/ru/plumsoftware/robloxclicker/data/Data.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,13 @@ public abstract class Data {
1616
"c",
1717
"d",
1818
"no",
19+
"hl",
1920
"o",
2021
"chr",
2122
"sr",
2223
"t",
2324
"sr",
25+
"sqgg",
2426
"br",
2527
"fl",
2628
"nj",
@@ -31,6 +33,7 @@ public abstract class Data {
3133
"darkm",
3234
"atow",
3335
"skibidi",
36+
"mm",
3437
"shrec",
3538
"spider",
3639
"brick",
@@ -41,9 +44,10 @@ public abstract class Data {
4144
"back_2",
4245
"back_3",
4346
"back_4",
47+
"back_9",
4448
"back_5",
4549
"back_6",
4650
"back_7",
47-
"back_8"
51+
"back_8",
4852
};
4953
}

app/src/main/java/ru/plumsoftware/robloxclicker/heroes/Backs.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ public abstract class Backs {
1010
"Современный задний фон",
1111
"Лес",
1212
"Морской порт",
13+
"Игровая площадка",
1314
"Секретный задний фон",
1415
"Скибиди задний фон",
1516
"Современный город",
@@ -19,6 +20,7 @@ public abstract class Backs {
1920
R.drawable.back_2,
2021
R.drawable.back_3,
2122
R.drawable.back_4,
23+
R.drawable.back_9,
2224
R.drawable.back_5,
2325
R.drawable.skibidi_toilet_nackground_1,
2426
R.drawable.back_7,
@@ -28,6 +30,7 @@ public abstract class Backs {
2830
5000,
2931
100000,
3032
2000000,
33+
3500000,
3134
5500000,
3235
8500000,
3336
1500000,

app/src/main/java/ru/plumsoftware/robloxclicker/heroes/Heroes.java

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,13 @@ public abstract class Heroes {
1313
"Косминус",
1414
"Динамо",
1515
"Неоновый овердрайв",
16+
"Бедный Роблокс",
1617
"Овердрайв",
1718
"Человек-Роблокс",
1819
"Супер Роблокс",
1920
"Тигрис",
2021
"Секретный Роблокс",
22+
"Страж Игры в Кальмара",
2123
"???",
2224
"Ниндзя",
2325
"Ниндзя в смокинге",
@@ -28,6 +30,7 @@ public abstract class Heroes {
2830
"Тёмный лорд",
2931
"Атомные отходы",
3032
"Элитный секретный персонаж",
33+
"Маска Игры в Кальмара",
3134
"Шрекус",
3235
"Человек паук Роблокс",
3336
"Строитель Роблокс",
@@ -40,11 +43,13 @@ public abstract class Heroes {
4043
R.drawable.cosminus_5,
4144
R.drawable.dinamo_3,
4245
R.drawable.neon_overdrive_roblox_11,
46+
R.drawable.homeless,
4347
R.drawable.overdrive_4,
4448
R.drawable.roblox_9,
4549
R.drawable.super_roblox_6,
4650
R.drawable.tigris_roblox_10,
4751
R.drawable.secret_roblox_7,
52+
R.drawable.squid_game_guardian,
4853
R.drawable.bird,
4954
R.drawable.ninja,
5055
R.drawable.ninja_smoking,
@@ -55,6 +60,7 @@ public abstract class Heroes {
5560
R.drawable.darkmatter,
5661
R.drawable.atomic_waste,
5762
R.drawable.skibidi_touilet_1,
63+
R.drawable.mistic_mask_squid_game,
5864
R.drawable.shrecus,
5965
R.drawable.spider,
6066
R.drawable.builder_1,
@@ -67,11 +73,13 @@ public abstract class Heroes {
6773
15,
6874
25,
6975
50,
76+
70,
7077
100,
7178
150,
7279
300,
7380
500,
7481
1000,
82+
1100,
7583
1250,
7684
1500,
7785
2000,
@@ -82,6 +90,7 @@ public abstract class Heroes {
8290
30000,
8391
45000,
8492
50000,
93+
55000,
8594
60000,
8695
70000,
8796
80000,
@@ -94,11 +103,13 @@ public abstract class Heroes {
94103
3000,
95104
10000,
96105
25000,
106+
40000,
97107
50000,
98108
100000,
99109
150000,
100110
300000,
101111
500000,
112+
750000,
102113
850000,
103114
1000000,
104115
1500000,
@@ -110,9 +121,11 @@ public abstract class Heroes {
110121
15000000,
111122
25000000,
112123
30000000,
113-
35000000,
114124
40000000,
115-
55000000
125+
45000000,
126+
55000000,
127+
60000000,
128+
75000000
116129
};
117130

118131
public static List<Hero> buildHeroes() {
4.05 MB
Loading
360 KB
Loading
149 KB
Loading

0 commit comments

Comments
 (0)