Merge branch 'main' of https://github.com/Niewidzialny84/PathFighters

Niewidzialny84 · Jan 25, 2022 · 7404223 · 7404223
2 parents a3a9730 + a854176
commit 7404223
Show file tree

Hide file tree

Showing 9 changed files with 151 additions and 9 deletions.
diff --git a/Path Fighters/Assets/AddressableAssetsData/Windows/addressables_content_state.bin b/Path Fighters/Assets/AddressableAssetsData/Windows/addressables_content_state.bin
diff --git a/Path Fighters/Assets/Scripts/InfoPopup.cs b/Path Fighters/Assets/Scripts/InfoPopup.cs
@@ -24,6 +24,19 @@ public void Init(Transform canvas, string localized)
         GetComponent<RectTransform>().offsetMax = Vector2.zero;
         _okButton.onClick.AddListener(() => { GameObject.Destroy(this.gameObject); });
     }
+    public void InitRegister(Transform canvas, string localized)
+    {
+        _okButtonText.text = "OK";
+        _popupText.text = localized;
+        transform.SetParent(canvas);
+        transform.localScale = Vector3.one;
+        GetComponent<RectTransform>().offsetMin = Vector2.zero;
+        GetComponent<RectTransform>().offsetMax = Vector2.zero;
+        _okButton.onClick.AddListener(() => {
+            SceneManager.LoadScene("Login Window");
+            GameObject.Destroy(this.gameObject);
+        });
+    }
     public void Initialize(Transform canvas, string localized)
     {
         _okButtonText.text = "OK";

diff --git a/Path Fighters/Assets/Scripts/ServerScripts/RequestScripts/RegisterScript.cs b/Path Fighters/Assets/Scripts/ServerScripts/RequestScripts/RegisterScript.cs
@@ -79,7 +79,7 @@ public void SuccessHandler(string msg)
         LocalizedString message = new LocalizedString();
         message.TableReference = "Main Menu Text";
         message.TableEntryReference = "Reg_PopupSuccess";
-        popup.Init(UIController.Instance.MainCanvas, message.GetLocalizedString());
+        popup.InitRegister(UIController.Instance.MainCanvas, message.GetLocalizedString());
     }
 
     public void FailureHandler(string msg)

diff --git a/Path Fighters/Assets/Scripts/deleteAccountPressed.cs b/Path Fighters/Assets/Scripts/deleteAccountPressed.cs
@@ -16,7 +16,6 @@ void Start()
         Action action = () =>
         {
             DeleteAccount();
-            Application.Quit();
             Debug.Log("Closing");
         };
         Button button = GetComponent<Button>();
@@ -65,6 +64,7 @@ void DeleteAccount()
             }
 
             DeleteAccount(loginReturn.user.id, loginReturn.jwt_token);
+
 
             Debug.Log("Account Deleted");
         }
@@ -74,6 +74,7 @@ public void SuccessHandler(String msg)
     {
         Debug.Log("Account deleted disconecting client");
         GameObject.Find("NetworkManager").GetComponent<NetworkManager>().StopClient();
+        Application.Quit();
     }
 
     #region DeleteAccount
@@ -126,6 +127,7 @@ private IEnumerator __DeleteAccount(int id,string auth, bool refresh)
             Debug.Log(www.error);
         }
     }
+
     #endregion
 
 }
diff --git a/Path Fighters/Assets/Sprites/Icon.png b/Path Fighters/Assets/Sprites/Icon.png
diff --git a/Path Fighters/Assets/Sprites/Icon.png.meta b/Path Fighters/Assets/Sprites/Icon.png.meta
diff --git a/Path Fighters/ProjectSettings/ProjectSettings.asset b/Path Fighters/ProjectSettings/ProjectSettings.asset
@@ -258,7 +258,14 @@ PlayerSettings:
   AndroidMinifyDebug: 0
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 150
-  m_BuildTargetIcons: []
+  m_BuildTargetIcons:
+  - m_BuildTarget: 
+    m_Icons:
+    - serializedVersion: 2
+      m_Icon: {fileID: 2800000, guid: a24725ea7f6c5e04db882226015b90bc, type: 3}
+      m_Width: 128
+      m_Height: 128
+      m_Kind: 0
   m_BuildTargetPlatformIcons: []
   m_BuildTargetBatching: []
   m_BuildTargetGraphicsJobs:

diff --git a/Path Fighters/UserSettings/EditorUserSettings.asset b/Path Fighters/UserSettings/EditorUserSettings.asset
@@ -15,19 +15,19 @@ EditorUserSettings:
       value: 22424703114646680e0b0227036c7215180258192f2d28353e662e27e3f42778d1e433e7e2742a323016f6
       flags: 0
     RecentlyUsedScenePath-3:
-      value: 22424703114646680e0b0227036c7215180258192f2d28353e66313ce0e22d78d1e433e7e2742a323016f6
+      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
+      value: 22424703114646680e0b0227036c7215180258192f2d28353e663032ebee7415e7e923a7f234362820
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 22424703114646680e0b0227036c7215180258192f2d28353e663032ebee7415e7e923a7f234362820
+      value: 22424703114646680e0b0227036c7215180258192f2d28353e66313ce0e22d78d1e433e7e2742a323016f6
       flags: 0
     RecentlyUsedScenePath-6:
-      value: 22424703114646680e0b0227036c7215180258192f2d28353e662f36e5e9272ce7f576dae43f31397717e1351027
+      value: 22424703114646680e0b0227036c7215180258192f2d28353e662e36f6f43d36e5f476dae43f31397717e1351027
       flags: 0
     RecentlyUsedScenePath-7:
-      value: 22424703114646680e0b0227036c7215180258192f2d28353e662e36f6f43d36e5f476dae43f31397717e1351027
+      value: 22424703114646680e0b0227036c7215180258192f2d28353e662f36e5e9272ce7f576dae43f31397717e1351027
       flags: 0
     RecentlyUsedScenePath-8:
       value: 22424703114646680e0b0227036c7215180258192f2d28353e66313ce5e93a78d5ee38ede82d7129370bfb25

diff --git a/README.md b/README.md
@@ -25,7 +25,7 @@ Here is a list of technologies used in this project:
 
 ### How to run game
 
-To run the game simply use provided .exe file in the releases zip.
+To run the game simply install it with the provided setup file and run the created .exe file. To register you need to have a password which is at least 8 symbols long and contains at least 1 lower case and 1 upper case letter, a digit and a special symbol.
 
 ### Description of game