QuasarApp/Hanoi-Towers
4
0
Fork 0
mirror of https://github.com/QuasarApp/Hanoi-Towers.git synced 2025-05-09 16:09:34 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Andrei Yankovich 2021-07-23 15:09:00 +03:00
commit 8b8f145dad
20 changed files with 251 additions and 25 deletions

6
CMakeLists.txt

@ -83,6 +83,11 @@ initAll()
addDoc(${PROJECT_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/doxygen.conf)
find_package(QT NAMES Qt6 Qt5 COMPONENTS Core REQUIRED)
if(${QT_VERSION_MAJOR} GREATER 5)
message("This project not support qt6 libraries. Please use the qt5 libraries for building.")
return()
endif()
find_package(Qt${QT_VERSION_MAJOR} COMPONENTS Core REQUIRED)
# Add sub directories
@ -145,4 +150,3 @@ if (HANOI_SERVER)
add_subdirectory(submodules/Patronum)
add_subdirectory(HanoiTowers/Server)
endif()

6
HanoiTowers/Protockol/src/gamestate.cpp

@ -5,6 +5,7 @@
* of this license document, but changing it is not allowed.
*/
#include "gamestate.h"
#include "gamestate.h"
int GameState::getMaxValueOfLoadedSaves() {
@ -28,6 +29,11 @@ void GameState::unlockNextLvl() {
_lvl = static_cast<short>(maxValueOfLoadedSave);
}
void GameState::unlockLvlTo(int toLevel) {
maxValueOfLoadedSave = toLevel;
_lvl = static_cast<short>(maxValueOfLoadedSave);
}
bool GameState::fSavedGame() const {
for (const auto &tower: qAsConst(save) ) {
if (tower.size()) {

1
HanoiTowers/Protockol/src/gamestate.h

@ -33,6 +33,7 @@ public:
Q_INVOKABLE void setStep(int value);
Q_INVOKABLE void unlockNextLvl();
Q_INVOKABLE void unlockLvlTo(int toLevel);
friend bool operator == (const GameState& left, const GameState& right);

2
HanoiTowers/client/android/AndroidManifest.xml

@ -1,5 +1,5 @@
<?xml version="1.0"?>
<manifest package="df.mobily.hanoi_towers" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.1.1" android:versionCode="27" android:installLocation="auto">
<manifest package="df.mobily.hanoi_towers" xmlns:android="http://schemas.android.com/apk/res/android" android:versionName="1.6.1.2" android:versionCode="28" android:installLocation="auto">
<!-- The following comment will be replaced upon deployment with default permissions based on the dependencies of the application.
Remove the comment if you do not require these default permissions. -->
<!-- %%INSERT_PERMISSIONS -->

10
HanoiTowers/client/hanoitowers.cpp

@ -317,6 +317,16 @@ void HanoiTowers::handleAcceptUserData(QSharedPointer<LocalUser> data) {
loadOldSaves();
#ifdef Q_OS_ANDROID
#ifndef HANOI_ADMOD
if (_profile.gameState()->lvl() < 15) {
_profile.gameState()->unlockLvlTo(15);
}
#endif
#endif
emit profileChanged();
}

16
HanoiTowers/client/languages/de.ts

@ -314,6 +314,10 @@
<source>Do not show again </source>
<translation>Nicht mehr anzeigen </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>Jetzt stehen dir Level von 1 bis 15 zur Verfügung. Viel Spaß beim Spielen!</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -413,5 +417,17 @@
<source>Hanoi Towers</source>
<translation>Hanoi-Türme</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">Danke für deine Unterstützung!</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">Sie sind jetzt unser Premium-Nutzer und wir werden es nicht mehr wagen, Sie mit Werbung zu belästigen.</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">Nicht mehr anzeigen</translation>
</message>
</context>
</TS>

16
HanoiTowers/client/languages/en.ts

@ -543,6 +543,10 @@
<source>Do not show again </source>
<translation>Do not show again </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>Now levels from 1 to 15 are available to you. Enjoy your game!</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -666,5 +670,17 @@
<source>Examples of View Solutions</source>
<translation type="vanished">Examples of View solutions</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">Thanks for your support!</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">You are now our premium user and we won&apos;t dare bother you with ads anymore.</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">Do not show again </translation>
</message>
</context>
</TS>

16
HanoiTowers/client/languages/es.ts

@ -315,6 +315,10 @@
<source>Do not show again </source>
<translation>No mostrar de nuevo </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>Ahora los niveles del 1 al 15. ¡Disfruta tu juego!</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -414,5 +418,17 @@
<source>Hanoi Towers</source>
<translation>Torres de Hanoi</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">¡Gracias por su apoyo!</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">Ahora eres nuestro usuario premium y ya no nos atreveremos a molestarlo con anuncios.</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">No mostrar de nuevo</translation>
</message>
</context>
</TS>

16
HanoiTowers/client/languages/fr.ts

@ -315,6 +315,10 @@
<source>Do not show again </source>
<translation>Ne pas montrer de nouveau </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>Vous disposez désormais de niveaux de 1 à 15. Amusez-vous bien!</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -414,5 +418,17 @@
<source>Hanoi Towers</source>
<translation>Tours de Hanoi</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">Merci pour votre aide!</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">Vous êtes maintenant notre utilisateur premium et nous n&apos;oserons plus vous déranger avec des publicités.</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">Ne pas montrer de nouveau </translation>
</message>
</context>
</TS>

18
HanoiTowers/client/languages/ja.ts

@ -64,7 +64,7 @@
<name>AdLoadScrean</name>
<message>
<source>Loading ...</source>
<translation>読み込み中 。。。</translation>
<translation>読み込み中...</translation>
</message>
</context>
<context>
@ -585,6 +585,10 @@
<source>Do not show again </source>
<translation>再び表示しない </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>1から15までのレベルが利用可能になりました。ゲームをお楽しみください！</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -789,5 +793,17 @@ Minimum steps for this lvl: %1</source>
<source>Hanoi Towers</source>
<translation>ハノイタワーズ</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">ご協力ありがとうございました！</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">あなたは今や私たちのプレミアムユーザーであり、私たちはもう広告であなたを煩わせることはありません。</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">再び表示しない</translation>
</message>
</context>
</TS>

16
HanoiTowers/client/languages/pl.ts

@ -315,6 +315,10 @@
<source>Do not show again </source>
<translation>Nie pokazuj ponownie </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>Teraz dostępne są poziomy od 1 do 15. Baw się dobrze!</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -414,5 +418,17 @@
<source>Hanoi Towers</source>
<translation>Wieże Hanoi</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">Dziękuję za wsparcie!</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">Jesteś teraz naszym użytkownikiem premium i nie odważymy się już więcej zawracać Ci głowy reklamami.</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">Nie pokazuj ponownie </translation>
</message>
</context>
</TS>

18
HanoiTowers/client/languages/ru.ts

@ -314,7 +314,7 @@
</message>
<message>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>Не удалось создать пользователя. Данное имя %0 уже используется</translation>
<translation>Не удалось создать пользователя. Данное имя %0 уже используется.</translation>
</message>
<message>
<source>Remove online error</source>
@ -588,6 +588,10 @@
<source>Do not show again </source>
<translation>Не показывать снова </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>Теперь вам доступны уровни с 1 по 15. Приятной игры!</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -796,5 +800,17 @@ Minimum steps for this lvl: %1</source>
<source>Hanoi Towers</source>
<translation>Ханойские Башни</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">Спасибо за вашу поддержку!</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">Теперь вы наш премиум-пользователь, и мы больше не смеем беспокоить вас рекламой.</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">Не показывать снова</translation>
</message>
</context>
</TS>

16
HanoiTowers/client/languages/tr.ts

@ -589,6 +589,10 @@ Bu seviye için minimum adımlar: %2</translation>
<source>Do not show again </source>
<translation>Tekrar gösterme </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>Şimdi 1&apos;den 15&apos;e kadar olan seviyeler sizin için mevcut.Oyunun tadını çıkarın!</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -797,5 +801,17 @@ Bu lvl için minimum adımlar:%1</translation>
<source>Hanoi Towers</source>
<translation>Hanoi Kuleleri</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">Desteğin için teşekkürler!</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">Artık bizim premium kullanıcımızsınız ve artık sizi reklamlarla rahatsız etmeye cesaret edemeyeceğiz.</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">Tekrar gösterme</translation>
</message>
</context>
</TS>

16
HanoiTowers/client/languages/uk.ts

@ -591,6 +591,10 @@
<source>Do not show again </source>
<translation>Не показувати знову </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>Тепер вам доступні рівні з 1 по 15. Приємною гри!</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -783,5 +787,17 @@ Minimum steps for this lvl: %1</source>
<source>Hanoi Towers</source>
<translation>Ханої вежі</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">Дякую за твою підтримку!</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">Тепер ви наш преміум-користувач, і ми більше не будемо турбувати вас рекламою.</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">Не показувати знову</translation>
</message>
</context>
</TS>

16
HanoiTowers/client/languages/zh.ts

@ -315,6 +315,10 @@
<source>Do not show again </source>
<translation>不再显示 </translation>
</message>
<message>
<source>Now levels from 1 to 15 are available to you. Enjoy your game!</source>
<translation>現在您可以選擇 1 到 15 級。享受您的遊戲吧！</translation>
</message>
</context>
<context>
<name>SwitchLvl</name>
@ -414,5 +418,17 @@
<source>Hanoi Towers</source>
<translation>汉诺塔</translation>
</message>
<message>
<source>Thanks for your support!</source>
<translation type="obsolete">感谢您的支持！</translation>
</message>
<message>
<source>You are now our premium user and we won&apos;t dare bother you with ads anymore.</source>
<translation type="obsolete">您现在是我们的高级用户，不会再被广告打扰了。</translation>
</message>
<message>
<source>Do not show again </source>
<translation type="obsolete">不再显示 </translation>
</message>
</context>
</TS>

47
HanoiTowers/client/menu/PremiumThanks.qml

@ -3,6 +3,7 @@ import QtQuick.Controls 2.15
import QtQuick.Layouts 1.3
Dialog {
width: parent.width * 0.6
@ -13,7 +14,7 @@ Dialog {
ColumnLayout {
spacing: 15
spacing: 5
Image {
id: name
fillMode: Image.PreserveAspectFit
@ -21,6 +22,7 @@ Dialog {
Layout.fillHeight: true
Layout.fillWidth: true
source: "qrc:/img/premium"
}
@ -34,18 +36,59 @@ Dialog {
}
RowLayout {
Layout.fillHeight: true
Layout.fillWidth: true
Image {
id: premUserImg
fillMode: Image.PreserveAspectFit
source: "qrc:/img/res/galochka.png"
sourceSize.width: 80
sourceSize.height: 80
}
Label {
text: qsTr("You are now our premium user and we won't dare bother you with ads anymore.")
font.bold: false
font.capitalization: Font.AllUppercase
horizontalAlignment: Text.AlignLeft
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
}
RowLayout {
Layout.fillHeight: true
Layout.fillWidth: true
Image {
id: unlockImg
fillMode: Image.PreserveAspectFit
source: "qrc:/img/res/unlock.png"
sourceSize.width: 80
sourceSize.height: 80
}
Label {
text: qsTr("Now levels from 1 to 15 are available to you. Enjoy your game!")
font.bold: false
font.capitalization: Font.AllUppercase
horizontalAlignment: Text.AlignLeft
wrapMode: Text.WordWrap
Layout.fillWidth: true
}
}
CheckBox {
id: doNotShowAgain
text: qsTr("Do not show again ")
Layout.alignment: Layout.Center
Layout.alignment: Layout.Left
}
anchors.fill: parent

2
HanoiTowers/client/qml.qrc

@ -36,6 +36,8 @@
<qresource prefix="/img">
<file alias="DefaultAvatar">res/DefaultAvatar.png</file>
<file alias="premium">res/HanoiTowers_premium_logo.png</file>
<file>res/unlock.png</file>
<file>res/galochka.png</file>
</qresource>
<qresource prefix="/languages">
<file>languages/ru.qm</file>

BIN
HanoiTowers/client/res/galochka.png Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 278 KiB

BIN
HanoiTowers/client/res/unlock.png Normal file

Binary file not shown.
Side by Side

After

(image error) Size: 43 KiB

2
submodules/Heart

@ -1 +1 @@
Subproject commit 7d16a9b01615b9085952b68883ffaa3e9b1467aa
Subproject commit f170fcc7b255c1d58f4aa258c62b2f6982704896