diff --git a/App/Assets/Scenes/ApresLogin.unity b/App/Assets/Scenes/ApresLogin.unity
index 8e7dc9e75da882b26a221933b6163699108259e3..f9fdfba19008deb72f8786c10845cae34679d357 100644
--- a/App/Assets/Scenes/ApresLogin.unity
+++ b/App/Assets/Scenes/ApresLogin.unity
@@ -5680,9 +5680,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 1681099788}
- m_TargetAssemblyTypeName: signBtn, Assembly-CSharp
- m_MethodName: returnBtnLogin
+ - m_Target: {fileID: 1681099791}
+ m_TargetAssemblyTypeName: App.Assets.Scripts.LinkButton, Assembly-CSharp
+ m_MethodName: OpenInstagram
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -13895,9 +13895,9 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls:
- - m_Target: {fileID: 1681099788}
- m_TargetAssemblyTypeName: signBtn, Assembly-CSharp
- m_MethodName: returnBtnLogin
+ - m_Target: {fileID: 1681099791}
+ m_TargetAssemblyTypeName: App.Assets.Scripts.LinkButton, Assembly-CSharp
+ m_MethodName: OpenFacebook
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
@@ -15581,6 +15581,7 @@ GameObject:
- component: {fileID: 1681099785}
- component: {fileID: 1681099788}
- component: {fileID: 1681099790}
+ - component: {fileID: 1681099791}
m_Layer: 0
m_Name: Canvas
m_TagString: Untagged
@@ -15759,6 +15760,18 @@ MonoBehaviour:
PlayerApresLogin: {fileID: 743448616}
buffer: 00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000
leaveTheLobby: 0
+--- !u!114 &1681099791
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1681099783}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: bf7424ccf04797a4e977b60e58a63abf, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
--- !u!1 &1684473842
GameObject:
m_ObjectHideFlags: 0
@@ -18453,7 +18466,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: -5.98, y: 0}
+ m_AnchoredPosition: {x: -5.9799805, y: 0}
m_SizeDelta: {x: -1248.69, y: -700}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2096138807
diff --git a/App/Assets/Scenes/Settings.unity b/App/Assets/Scenes/Settings.unity
index 8124ec059a895f1ead148b88435f15e8f4a1c1c5..fe83728c4fbd9fcd0941633721580ee2ea2668e3 100644
--- a/App/Assets/Scenes/Settings.unity
+++ b/App/Assets/Scenes/Settings.unity
@@ -246,8 +246,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1926752423}
m_TargetAssemblyTypeName: Client, Assembly-CSharp
- m_MethodName: Language
- m_Mode: 5
+ m_MethodName: SwitchLanguageEnglish
+ m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
@@ -379,8 +379,8 @@ MonoBehaviour:
m_Calls:
- m_Target: {fileID: 1926752423}
m_TargetAssemblyTypeName: Client, Assembly-CSharp
- m_MethodName: Language
- m_Mode: 5
+ m_MethodName: SwitchLanguageFrench
+ m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
diff --git a/App/Assets/Scripts/Client.cs b/App/Assets/Scripts/Client.cs
index 9794eec4ec275c9c87c41c1833e7d68c0af20534..ace43a3a7eedcc913bdcc35b121e621b97269a13 100644
--- a/App/Assets/Scripts/Client.cs
+++ b/App/Assets/Scripts/Client.cs
@@ -13,7 +13,9 @@ using System.Runtime.InteropServices;
using UnityEditor;
using System.Collections;
using UnityEngine.EventSystems;
-using Assets.SimpleLocalization;
+using UnityEngine.Localization.Settings;
+using UnityEngine.Localization;
+
@@ -220,25 +222,23 @@ public class Client : MonoBehaviour
fields[nextIndex].Select();
}
}
+ }
- LocalizationManager.Read();
- switch(Application.systemLanguage){
+ public void SetSelectedLocale(Locale locale){
+ LocalizationSettings.SelectedLocale = locale;
+ }
- case SystemLanguage.English:
-
- LocalizationManager.Language = "English";
- break;
-
- case SystemLanguage.French:
- LocalizationManager.Language = "French";
- break;
- }
+ public void SwitchLanguageFrench()
+ {
+ SetSelectedLocale(LocalizationSettings.AvailableLocales.Locales[1]);
+ SceneManager.LoadScene(0);
}
-
- public void Language(string language){
- LocalizationManager.Language = language;
+ public void SwitchLanguageEnglish()
+ {
+ SetSelectedLocale(LocalizationSettings.AvailableLocales.Locales[0]);
+ SceneManager.LoadScene(0);
}
//Cacher/Afficher le mot de passe
@@ -250,11 +250,10 @@ public class Client : MonoBehaviour
else{
passWord.contentType = TMP_InputField.ContentType.Password;
- //newpassWord.contentType = TMP_InputField.ContentType.Password;
}
passWord.ForceLabelUpdate();
- //newpassWord.ForceLabelUpdate();
+
}
public void ToggleInputTypeNewPassword(){