Login page converted

Assets/GUI PRO Kit - Casual Game/Prefabs/Popup_Checking.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 46fce459b689a1d88a04f46961c63ae8
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GUI PRO Kit - Casual Game/Prefabs/Popup_Login.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5c4e6c40b781c251ead4d5886a45d735
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/GUI PRO Kit - Casual Game/Prefabs/Popup_Signup.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: f1c38827cf8d35ea8bb29a9d8d0ec0a8
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Game/Scenes/Minigame/Minigame.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
+  m_IndirectSpecularColor: {r: 0.44402248, g: 0.49316555, b: 0.5722324, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -7096,14 +7096,14 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 842262928}
-  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: -83.376595}
-  m_LocalScale: {x: 0.4764377, y: 0.4764377, z: 0.4764377}
+  m_LocalScale: {x: -0.4764377, y: 0.4764377, z: 0.4764377}
   m_Children:
   - {fileID: 584455783}
   m_Father: {fileID: 2058016609}
-  m_RootOrder: 9
-  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 69.99339, y: -26.156378}
@@ -7435,7 +7435,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 2058016609}
-  m_RootOrder: 8
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -7823,7 +7823,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 1, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 11.94, y: 45.450012}
+  m_AnchoredPosition: {x: 11.939941, y: 45.450012}
   m_SizeDelta: {x: 290.1, y: 334.7}
   m_Pivot: {x: 1, y: 1}
 --- !u!114 &1083193388
@@ -8823,7 +8823,7 @@ RectTransform:
   m_Children:
   - {fileID: 532150899}
   m_Father: {fileID: 2058016609}
-  m_RootOrder: 10
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -8902,7 +8902,7 @@ RectTransform:
   m_Children:
   - {fileID: 1689565361}
   m_Father: {fileID: 2058016609}
-  m_RootOrder: 7
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -9435,10 +9435,10 @@ RectTransform:
   - {fileID: 1083193387}
   - {fileID: 2133876931}
   - {fileID: 63498959}
-  - {fileID: 1627288509}
-  - {fileID: 908570976}
   - {fileID: 842262929}
   - {fileID: 1541841919}
+  - {fileID: 1627288509}
+  - {fileID: 908570976}
   m_Father: {fileID: 0}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

Assets/Game/Scripts/LoginManager.cs

@@ -14,7 +14,7 @@ public class LoginManager : MonoBehaviour
     public TMP_InputField reg_password;
     public Button regBtn;
 
-    public OtherUIbuttons otherUI;
+    // public OtherUIbuttons otherUI;
     public BuildingData defaultBuilding;
 
     void Start()
@@ -39,17 +39,11 @@ public class LoginManager : MonoBehaviour
 
     public void OnLoginClicked(){
         if(login_username.text.Length < 2){
-            if(otherUI!=null){
-                otherUI.ErrorAuth();
-            }
-         //   MessageDialogInstance.messageDialog.ShowDialog("Error", "Please use a valid Username (should be more than 2 characters)");
+            MessageDialog.instance.ShowDialog("Invalid!", "The username you entered is invalid");
             return;
         }
         if(login_password.text.Length < 5){
-            if(otherUI!=null){
-                otherUI.ErrorAuth();
-            }
-          //  MessageDialogInstance.messageDialog.ShowDialog("Error", "Please use a Strong password (should be more than 5 characters)");
+            MessageDialog.instance.ShowDialog("Invalid!", "The password you entered is invalid");
             return;
         }
 
@@ -57,11 +51,11 @@ public class LoginManager : MonoBehaviour
     }
     public void OnRegisterClicked(){
         if(reg_username.text.Length < 2){
-            MessageDialogInstance.messageDialog.ShowDialog("Error", "Please use a valid Username (should be more than 2 characters)");
+            MessageDialog.instance.ShowDialog("Couldn't Register", "Please use a valid Username (should be more than 2 characters)");
             return;
         }
         if(reg_password.text.Length < 5){
-            MessageDialogInstance.messageDialog.ShowDialog("Error", "Please use a Strong password (should be more than 5 characters)");
+            MessageDialog.instance.ShowDialog("Couldn't Register", "Please use a Strong password (should be more than 5 characters)");
             return;
         }
         Debug.Log("Clicked register");
@@ -104,6 +98,7 @@ public class LoginManager : MonoBehaviour
         else
         {
             Debug.Log("User Login failed. Error #" + www.text);
+            MessageDialog.instance.ShowDialog("Error!", "Sorry, We couldn't log you in,\n Error: " + www.text);
         }
         loginBtn.interactable=true;
     }
@@ -130,6 +125,8 @@ public class LoginManager : MonoBehaviour
         else
         {
             Debug.Log("User creation failed " + www.text);
+            MessageDialog.instance.ShowDialog("Error!", "Sorry, We couldn't Register you,\n Error: " + www.text);
+
         }
         regBtn.interactable=true;
     }

Assets/Game/Scripts/MessageDialog.cs

@@ -6,15 +6,18 @@ using UnityEngine.UI;
 [RequireComponent(typeof(CanvasGroup))]
 public class MessageDialog : MonoBehaviour
 {
-    public Text titleTxt;
-    public Text messageTxt;
+
+    private static MessageDialog m_instance;
+    public static MessageDialog instance=>m_instance;
+    public TMPro.TMP_Text titleTxt;
+    public TMPro.TMP_Text messageTxt;
     public Button actionBtn;
 
     public bool showing => GetComponent<CanvasGroup>().blocksRaycasts;
 
     void Start()
     {
-        MessageDialogInstance.messageDialog = this;
+        m_instance = this;
         actionBtn.onClick.AddListener(OnAction);
         SetActive(false);
     }
@@ -38,7 +41,3 @@ public class MessageDialog : MonoBehaviour
         GetComponent<CanvasGroup>().alpha= (value) ? 1: 0;
     }
 }
-
-public static class MessageDialogInstance{
-    public static MessageDialog messageDialog;
-}

Assets/WarlockMobile.log.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 898702a662cc86e40b4add2cf19abd3b
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

ProjectSettings/ProjectVersion.sync-conflict-20220828-194102-YYYAVZU.txt

@@ -0,0 +1,2 @@
+m_EditorVersion: 2020.3.32f1
+m_EditorVersionWithRevision: 2020.3.32f1 (12f8b0834f07)