Merge branch 'dev'

ShutovKS · Feb 29, 2024 · c5666d1 · c5666d1
2 parents 66a36ca + 9100368
commit c5666d1
Show file tree

Hide file tree

Showing 39 changed files with 530 additions and 275 deletions.
diff --git a/src/Localizations/Eng/UILocalisation.json b/src/Localizations/Eng/UILocalisation.json
@@ -1,7 +1,8 @@
 {
   "GameName": "Between two Worlds",
   "LoadGameButton": "Load",
-  "StartGameButton": "Start",
+  "StartNewGameButton": "New game",
+  "ContinueGameButton": "Continue",
   "ExitButton": "Exit",
   "Title": "Are you sure?",
   "YesButton": "Yes",

diff --git a/src/Localizations/Fren/Main.txt b/src/Localizations/Fren/Main.txt
@@ -1 +1 @@
-Language-French
+Language-Français
diff --git a/src/Localizations/Fren/UILocalisation.json b/src/Localizations/Fren/UILocalisation.json
@@ -1,13 +1,14 @@
 {
   "GameName": "Entre deux mondes",
   "LoadGameButton": "Charger",
-  "StartGameButton": "Démarrer",
-  "ExitButton": "Sortie",
-  "Title": "Êtes-vous sûr?",
+  "StartNewGameButton": "Nouveau jeu",
+  "ContinueGameButton": "Continuer",
+  "ExitButton": "Quitter",
+  "Title": "Êtes-vous sûr ?",
   "YesButton": "Oui",
   "NoButton": "Non",
-  "HistoryButton": "Histoire",
-  "SkipButton": "Ignorer",
+  "HistoryButton": "Historique",
+  "SkipButton": "Sauter",
   "AutoButton": "Auto",
   "FurtherButton": "Suivant",
   "BackButton": "Retour"

diff --git a/src/Localizations/Ger/Main.txt b/src/Localizations/Ger/Main.txt
@@ -1 +1 @@
-Language-German
+Language-Germanique
diff --git a/src/Localizations/Ger/UILocalisation.json b/src/Localizations/Ger/UILocalisation.json
@@ -1,7 +1,8 @@
 {
   "GameName": "Zwischen zwei Welten",
   "LoadGameButton": "Laden",
-  "StartGameButton": "Starten",
+  "StartNewGameButton": "Neues Spiel",
+  "ContinueGameButton": "Fortsetzen",
   "ExitButton": "Beenden",
   "Title": "Sind Sie sicher?",
   "YesButton": "Ja",
@@ -11,4 +12,4 @@
   "AutoButton": "Auto",
   "FurtherButton": "Weiter",
   "BackButton": "Zurück"
-  }
+}
diff --git a/src/Localizations/Ital/Main.txt b/src/Localizations/Ital/Main.txt
@@ -1 +1 @@
-Language-Italian
+Language-Italiano
diff --git a/src/Localizations/Ital/UILocalisation.json b/src/Localizations/Ital/UILocalisation.json
@@ -1,8 +1,9 @@
 {
-  "GameName": "Tra due mondi",
+  "GameName": "Tra due Mondi",
   "LoadGameButton": "Carica",
-  "StartGameButton": "Inizia",
-  "ExitButton": "Uscita",
+  "StartNewGameButton": "Nuova partita",
+  "ContinueGameButton": "Continua",
+  "ExitButton": "Esci",
   "Title": "Sei sicuro?",
   "YesButton": "Sì",
   "NoButton": "No",

diff --git a/src/Localizations/Rus/UILocalisation.json b/src/Localizations/Rus/UILocalisation.json
@@ -1,7 +1,8 @@
 {
   "GameName": "Между двух миров",
   "LoadGameButton": "Загрузить",
-  "StartGameButton": "Начать",
+  "StartNewGameButton": "Новая игра",
+  "ContinueGameButton": "Продолжить",
   "ExitButton": "Выход",
   "Title": "Вы уверены?",
   "YesButton": "Да",

diff --git a/src/Visual novel/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset b/src/Visual novel/Assets/AddressableAssetsData/AssetGroups/Default Local Group.asset
@@ -52,11 +52,6 @@ MonoBehaviour:
     m_ReadOnly: 0
     m_SerializedLabels: []
     FlaggedDuringContentUpdateRestriction: 0
-  - m_GUID: caf9732433f4dc044845763962493607
-    m_Address: Prefabs/YandexGame
-    m_ReadOnly: 0
-    m_SerializedLabels: []
-    FlaggedDuringContentUpdateRestriction: 0
   - m_GUID: 46fd095b9a5968a4fb70e3f242e7f9c8
     m_Address: Screens/ImageCaptureForSave
     m_ReadOnly: 0