Skip to content

Commit

Permalink
font fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
William Kwan committed Feb 15, 2016
1 parent a54fb54 commit 5b97f79
Show file tree
Hide file tree
Showing 37 changed files with 117 additions and 64 deletions.
Binary file added Assets/Resources/AdobeHeitiStd-Regular SDF.asset
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Resources/Antonio-Bold SDF.asset
Binary file not shown.
Binary file not shown.
Binary file removed Assets/Resources/AppleSDGothicNeo-SemiBold.otf
Binary file not shown.
Binary file removed Assets/Resources/Choplin-Medium-DEMO SDF.asset
Binary file not shown.
Binary file removed Assets/Resources/Choplin-Medium-DEMO.otf
Binary file not shown.
Binary file added Assets/Resources/DroidSans SDF.asset
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Resources/DroidSans.ttf
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Resources/Turkish-Antonio-Bold SDF.asset
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Resources/Turkish-Antonio-Bold SDF.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Resources/Turkish-Antonio-Regular SDF.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Resources/kochi-gothic-subst SDF.asset
Binary file not shown.
8 changes: 8 additions & 0 deletions Assets/Resources/kochi-gothic-subst SDF.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added Assets/Resources/kochi-gothic-subst.ttf
Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Stummschaltung aufheben</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Ein Video sehen, um fortzufahren?</value>
<value>Ein Video sehen,
um fortzufahren?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Sonido</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>¿Ver un vídeo para continuar?</value>
<value>¿Ver un vídeo
para continuar?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Activer les sons</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Regarder une vidéo pour continuer ?</value>
<value>Regarder une vidéo
pour continuer ?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Suoni attivi</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Vuoi guardare un video per continuare?</value>
<value>Vuoi guardare un
video per continuare?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Geluid weergeven</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Een video bekijken om verder te gaan?</value>
<value>Een video bekijken
om verder te gaan?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Desativar mudo</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Ver um vídeo para continuar?</value>
<value>Ver um vídeo
para continuar?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@
<value>Назад</value>
</data>
<data name="BEST" xml:space="preserve">
<value>Лучший результат</value>
<value>Лучший
результат</value>
</data>
<data name="CLOSE" xml:space="preserve">
<value>Закрыть</value>
Expand Down Expand Up @@ -177,6 +178,7 @@
<value>Включить звук</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Смотреть видео, чтобы продолжить?</value>
<value>Смотреть видео,
чтобы продолжить?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Sesi Aç</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Devam etmek için bir video izle?</value>
<value>Devam etmek için
bir video izle?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Stummschaltung aufheben</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Ein Video sehen, um fortzufahren?</value>
<value>Ein Video sehen,
um fortzufahren?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Sonido</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>¿Ver un vídeo para continuar?</value>
<value>¿Ver un vídeo
para continuar?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Activer les sons</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Regarder une vidéo pour continuer ?</value>
<value>Regarder une vidéo
pour continuer ?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Suoni attivi</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Vuoi guardare un video per continuare?</value>
<value>Vuoi guardare un
video per continuare?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Geluid weergeven</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Een video bekijken om verder te gaan?</value>
<value>Een video bekijken
om verder te gaan?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Desativar mudo</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Ver um vídeo para continuar?</value>
<value>Ver um vídeo
para continuar?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@
<value>Назад</value>
</data>
<data name="BEST" xml:space="preserve">
<value>Лучший результат</value>
<value>Лучший
результат</value>
</data>
<data name="CLOSE" xml:space="preserve">
<value>Закрыть</value>
Expand Down Expand Up @@ -177,6 +178,7 @@
<value>Включить звук</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Смотреть видео, чтобы продолжить?</value>
<value>Смотреть видео,
чтобы продолжить?</value>
</data>
</root>
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,7 @@
<value>Sesi Aç</value>
</data>
<data name="VIDEO_CONTINUE" xml:space="preserve">
<value>Devam etmek için bir video izle?</value>
<value>Devam etmek için
bir video izle?</value>
</data>
</root>
Binary file modified Assets/_Scenes/Game.unity
Binary file not shown.
87 changes: 49 additions & 38 deletions Assets/_Scripts/Game.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,17 +20,17 @@

using SmartLocalization;

//TODO: close stats if open when pressing close
//TODO: Double character wave when clicking fast on game over


public class Game : MonoBehaviour, IStoreListener
{
public TMP_FontAsset korean;
public TMP_FontAsset japanese;
public TMP_FontAsset chineseSimplified;
public TMP_FontAsset chineseTraditional;
public TMP_FontAsset chinese;
public TMP_FontAsset russian;
public TMP_FontAsset turkish;
public TMP_FontAsset turkishBold;

static string lang;
const string PLAYED_BEFORE = "PLAYED_BEFORE";
Expand Down Expand Up @@ -401,33 +401,33 @@ void Start()



if (systemLanguage != null)
{
Debug.Log("lang " + systemLanguage.languageCode + " supported");
lang = systemLanguage.languageCode;
LanguageManager.Instance.ChangeLanguage(lang);
}
else
{
Debug.Log("null sys lang");
if (Application.systemLanguage.ToString() == "ChineseTraditional")
{
lang = "zh-CHT";
Debug.Log("chinese traditional!!");
}
else if (Application.systemLanguage.ToString() == "Chinese" || Application.systemLanguage.ToString() == "ChineseSimplified")
{
lang = "zh-CHS";
Debug.Log("chinese simplified");
}
else
{
lang = "en";
Debug.Log("lang not supported, using English");
//if (systemLanguage != null)
//{
// Debug.Log("lang " + systemLanguage.languageCode + " supported");
// lang = systemLanguage.languageCode;
// LanguageManager.Instance.ChangeLanguage(lang);
//}
//else
//{
// Debug.Log("null sys lang");
// if (Application.systemLanguage.ToString() == "ChineseTraditional")
// {
// lang = "zh-CHT";
// Debug.Log("chinese traditional!!");
// }
// else if (Application.systemLanguage.ToString() == "Chinese" || Application.systemLanguage.ToString() == "ChineseSimplified")
// {
// lang = "zh-CHS";
// Debug.Log("chinese simplified");
// }
// else
// {
// lang = "en";
// Debug.Log("lang not supported, using English");

}
LanguageManager.Instance.ChangeLanguage(lang);
}
// }
// LanguageManager.Instance.ChangeLanguage(lang);
//}


////NOTE: SmartCultureInfo doesn't work well for ChineseTraditional, maybe should switch over to Unity's built-in system
Expand Down Expand Up @@ -469,8 +469,9 @@ void Start()


//testing
//LanguageManager.Instance.ChangeLanguage("ko-KR");
//lang = "ko";

lang = "ja";
LanguageManager.Instance.ChangeLanguage(lang);


if (lang == "ko" || lang == "ja" || lang == "zh-CHS" || lang == "zh-CHT" || lang == "ru" || lang == "tr")
Expand All @@ -484,13 +485,9 @@ void Start()
{
fontAsset = japanese;
}
else if (lang == "zh-CHS")
{
fontAsset = chineseSimplified;
}
else if (lang == "zh-CHT")
else if (lang == "zh-CHS" || lang == "zh-CHT")
{
fontAsset = chineseTraditional;
fontAsset = chinese;
}
else if (lang == "ru")
{
Expand All @@ -501,10 +498,18 @@ void Start()
fontAsset = turkish;
}

if (lang == "ko" || lang == "ja")
{
title.font = fontAsset;
}
else if (lang == "tr")
{
title.font = turkishBold;
}

muteText.font = fontAsset;
bestScore.font = fontAsset;
bestTotalCubesScore.font = fontAsset;
title.font = fontAsset;
achievementsText.font = fontAsset;
backText.font = fontAsset;
heightText.font = fontAsset;
Expand Down Expand Up @@ -942,6 +947,12 @@ IEnumerator BringInUI(float delay)
if (disabledAds)
{
continueText.text = LanguageManager.Instance.GetTextValue("CONTINUE");
continueText.text = LanguageManager.Instance.GetTextValue("VIDEO_CONTINUE");

}
else
{
continueText.text = LanguageManager.Instance.GetTextValue("VIDEO_CONTINUE");
}
continueButton.interactable = true;
continueSecs.text = "5";
Expand Down

0 comments on commit 5b97f79

Please sign in to comment.