Merging Dev with the master branch

maqsoftware · Jul 30, 2019 · e647bed · e647bed
1 parent 401ea20
commit e647bed
Show file tree

Hide file tree

Showing 11 changed files with 142 additions and 1,705 deletions.
diff --git a/goa/Classes/menu/MapScene.cpp b/goa/Classes/menu/MapScene.cpp
@@ -160,28 +160,28 @@ void MapScene::processChildNodes(cocos2d::Node *rootNode) {
                     std::string lName = node->getName();
                     std::string englishName = "";
                     if (lName.compare("City1") == 0) {
-                        lName = "Õð¢»ÜéLUUUU"; // Bengaluru
+                        lName = "बेंगलुरु"; // Bengaluru
                         englishName = "Bengaluru";
                     } else if (lName.compare("City2") == 0) {
-                        lName = "Üæòâ °¢ÁðçÜâ";// Los Angeles
+                        lName = "लॉस एंजेलिस";// Los Angeles
                         englishName = "Los Angeles";
                     } else if (lName.compare("City3") == 0) {
-                        lName = "sêSÅÙ"; // Houston
+                        lName = "ह्यूस्टन"; // Houston
                         englishName = "Houston";
                     } else if (lName.compare("city4") == 0) {
-                        lName = "Ü¢ÇÙ"; // London
+                        lName = "लंडन"; // London
                         englishName = "London";
                     } else if (lName.compare("City5") == 0) {
-                        lName = "ÇæÚ °â âÜæ×"; // Dar es Salaam
+                        lName = "डार एस सलाम"; // Dar es Salaam
                         englishName = "Dar es Salaam";
                     } else if (lName.compare("Camp") == 0) {
-						lName = "·ñ¢UUUÂ"; // Camp
+						lName = "कैंप"; // Camp
                         englishName = "Camp";
 					} else if (lName.compare("Farm House") == 0) {
-						lName ="ÈUUUæ×ü ãæ©â"; // Farm House
+						lName ="फार्म हाउस"; // Farm House
                         englishName = "Farm House";
 					} else if (lName.compare("Mining Town") == 0) {
-						lName ="¹ÙÙ àæãÚ"; // Mining Town
+						lName ="खनन शहर"; // Mining Town
                         englishName = "Mining Town";
 					}
 
@@ -193,7 +193,7 @@ void MapScene::processChildNodes(cocos2d::Node *rootNode) {
                     std::string mapText = this->currentLangUtil->translateString(lName);
                     node->setPosition(Vec2(node->getPosition().x, node->getPosition().y + 40));
 
-                    cocos2d::Label* label = Label::createWithTTF(mapText,"fonts/Chanakya.ttf", 90);
+                    cocos2d::Label* label = Label::createWithSystemFont(mapText, "arial", 70);
                     label->setPosition(Vec2(node->getPosition().x, node->getPosition().y - 60));
                     label->setColor(Color3B(128, 64, 0));
                     mainLayer->addChild(label);

diff --git a/goa/Classes/menu/ScrollableGameMapScene.cpp b/goa/Classes/menu/ScrollableGameMapScene.cpp
@@ -460,7 +460,7 @@ cocos2d::ui::Button* ScrollableGameMapScene::createButton(const rapidjson::Value
         label->setPosition(Vec2(label->getPositionX(), label->getPositionY()- 300));
         button->setScale(0.5);
 
-        Label *engText = Label::createWithTTF(gameTitleHindi, "fonts/Chanakya.ttf", 140);
+        Label *engText = Label::createWithSystemFont(gameTitleHindi, "arial", 110);
         engText->setPosition(Vec2(label->getPositionX(), label->getPositionY() - 130));
         engText->setColor(titleColor);
         button->addChild(engText);

diff --git a/goa/Classes/misc/ChooseCharacter.cpp b/goa/Classes/misc/ChooseCharacter.cpp
@@ -121,10 +121,10 @@ void ChooseCharacter::processChildNodes(cocos2d::Node *rootNode) {
     if(boyText != NULL) {
         cocos2d::ui::Text* boyLabel = dynamic_cast<cocos2d::ui::Text *>(boyText);
         if(boyLabel != NULL) {
-            std::string boyText = "ÜÇ¸·UUUæ";
+            std::string boyText = "लड़का";
             boyLabel->setString(boyText);
-            boyLabel->setFontSize(150);
-            boyLabel->setFontName("fonts/Chanakya.ttf");
+            boyLabel->setFontSize(130);
+            boyLabel->setFontName("arial");
             boyLabel->setTextColor(Color4B::WHITE);
 
         }
@@ -134,10 +134,10 @@ void ChooseCharacter::processChildNodes(cocos2d::Node *rootNode) {
     if(boyText != NULL) {
         cocos2d::ui::Text* girlLabel = dynamic_cast<cocos2d::ui::Text *>(girlText);
         if(girlLabel != NULL) {
-            std::string girlText = "ÜÇ¸·UUUè";
+            std::string girlText = "लड़की";
             girlLabel->setString(girlText);
-            girlLabel->setFontSize(150);
-            girlLabel->setFontName("fonts/Chanakya.ttf");
+            girlLabel->setFontSize(130);
+            girlLabel->setFontName("arial");
             girlLabel->setTextColor(Color4B::WHITE);
 
         }

diff --git a/goa/Classes/misc/ChooseCharacter.hpp b/goa/Classes/misc/ChooseCharacter.hpp
@@ -27,8 +27,8 @@
 #define BOY_TEXT "boy_text"
 #define GIRL_TEXT "girl_text"
 #define CHOOSE_CHARACTER_TEXT "choose Character"
-#define BOY_LABEL_TEXT "ÜÇ¸·UUUæ"
-#define GIRL_LABEL_TEXT "ÜÇ¸·UUUè"
+#define BOY_LABEL_TEXT "लड़का"
+#define GIRL_LABEL_TEXT "लड़की"
 
 
 class ChooseCharacter : public cocos2d::Layer {

diff --git a/goa/Resources/res/config/alphabet_game_map.json b/goa/Resources/res/config/alphabet_game_map.json
@@ -1,7 +1,7 @@
 [
   {
     "name": "decomone",
-    "title": "¥ÿæÚ âÁæ¥ô$#$Decomone",
+    "title": "अक्षर सजाओ$#$Decomone",
 	"_title_comment": "अक्षर सजाओ",
     "unlock": true,
     "cIcon": "gameicons/decomone_pressed.png",
@@ -184,7 +184,7 @@
   },
   {
     "name": "EndlessRunner",
-	"title":"Öæ»ô ¥æñÚ Â·UUUUÇ¸ô$#$Endless Runner",
+	"title":"भागो और पकड़ो$#$Endless Runner",
     "_title_comment": "भागो और पकड़ो",
     "unlock": true,
     "cIcon": "gameicons/EndlessRunner_pressed.png",
@@ -295,7 +295,7 @@
   },
   {
     "name": "Alphamon Feed",
-    "title": "Úæÿæâô¢ ·UUUUô ç¹Üæ¥ô$#$Alphamon Feed",
+    "title": "राक्षसों को खिलाओ$#$Alphamon Feed",
 	"_title_comment": "राक्षसों को खिलाओ",
     "unlock": true,
     "cIcon": "gameicons/Alphamon Feed_pressed.png",
@@ -406,7 +406,7 @@
   },
   {
     "name": "book",
-    "title": "¥ÿæÚ ·UUUè ÜÇ¸æ§ü$#$Book",
+    "title": "अक्षर की लड़ाई$#$Book",
 	"_title_comment": "अक्षर की लड़ाई",
     "unlock": true,
     "cIcon": "gameicons/book_pressed.png",
@@ -469,7 +469,7 @@
   },
   {
     "name": "alphamole",
-    "title": "Úæÿæâ ·UUUUô ×æÚô$#$Alphamole",
+    "title": "राक्षस को मारो $#$Alphamole",
 	"_title_comment":"राक्षस को मारो ",
     "unlock": true,
     "cIcon": "gameicons/alphamole_pressed.png",
@@ -580,7 +580,7 @@
   },
   {
     "name": "Cross The Bridge",
-	"title": "ÂêÜ ·UUUUô ÂæÚ ·UUUUÚô$#$Cross The Bridge",
+	"title": "पूल को पार करो$#$Cross The Bridge",
     "_title_comment": "पूल को पार करो",
     "unlock": true,
     "cIcon": "gameicons/Cross The Bridge_pressed.png",
@@ -688,7 +688,7 @@
   },
   {
     "name": "Cannon Ball",
-	"title":"ÌôÂ ·UUUæ »ôÜæ$#$Cannon Ball",
+	"title":"तोप का गोला$#$Cannon Ball",
     "_title_comment": "तोप का गोला",
     "unlock": true,
     "cIcon": "gameicons/Cannon Ball_pressed.png",
@@ -733,7 +733,7 @@
   },
   {
     "name": "bubble",
-	"title": "ÕéÜÕéÜæ ÈUUUUôÇ¸ô$#$Bubble",
+	"title": "बुलबुला फोड़ो$#$Bubble",
     "_title_comment": "बुलबुला फोड़ो",
     "unlock": true,
     "cIcon": "gameicons/bubble_pressed.png",
@@ -820,7 +820,7 @@
   },
   {
     "name": "Smash The Rock",
-	"title": "¿^æÙ ÌôÇ¸ô$#$Smash The Rock",
+	"title": "चट्टान तोड़ो$#$Smash The Rock",
     "_title_comment": "चट्टान तोड़ो",
     "unlock": true,
     "cIcon": "gameicons/Smash The Rock_pressed.png",
@@ -931,7 +931,7 @@
   },
   {
     "name": "dino",
-	"title": "ß‡æü×æÜæ$#$Dino",
+	"title": "वर्णमाला$#$Dino",
     "_title_comment": "वर्णमाला",
     "unlock": true,
     "cIcon": "gameicons/dino_pressed.png",
@@ -964,8 +964,8 @@
   },
   {
     "name": "Patch The Wall",
-	"title": "ÎèßæÚ ·UUUUô ÍÂÍÂæ°¢$#$Patch The Wall",
-    "_title_comment": "ÎèßæÚ ·UUUè ×Ú{×Ì",
+	"title": "दीवार को थपथपाए$#$Patch The Wall",
+    "_title_comment": "दीवार को थपथपाए",
     "unlock": true,
     "cIcon": "gameicons/Patch The Wall_pressed.png",
     "icon": "gameicons/Patch The Wall.png",
@@ -1011,7 +1011,7 @@
   },
   {
     "name": "basiclettercase",
-	"title": "¥æ§âRUUUè×$#$Basic Letter Case",
+	"title": "आइसक्रीम$#$Basic Letter Case",
     "_title_comment": "आइसक्रीम",
     "cIcon": "gameicons/basiclettercase_pressed.png",
     "icon": "gameicons/basiclettercase.png",
@@ -1058,7 +1058,7 @@
   },
   {
     "name": "alphaarrange",
-	"title": "¥ËÈUUUæ ÃØßSÍæ$#$Alpha Arrange",
+	"title": "अल्फा व्यवस्था$#$Alpha Arrange",
     "_title_comment": "अल्फा व्यवस्था",
     "unlock": true,
     "cIcon": "gameicons/AlphaArrange_pressed.png",