Merge branch 'release/3.2.1'

Author: amirhakimnejad

GameManager/Assets/Joyixir/GameManager/Demo/GameManagerSample.unity

@@ -53,6 +53,8 @@ private void Update()
                 Retry();
             if (UnityEngine.Input.GetKeyDown(KeyCode.RightArrow))
                 Skip();
+            if (UnityEngine.Input.GetKeyDown(KeyCode.LeftArrow))
+                GoToPreviousLevel();
             if (UnityEngine.Input.GetKeyDown(KeyCode.F))
                 ForceFinish();
         }
@@ -104,6 +106,11 @@ public static void Skip()
             LevelManager.Instance.Skip();
         }
 
+        private void GoToPreviousLevel()
+        {
+            LevelManager.Instance.InitializePreviousLevel();
+        }
+
         public static void Retry()
         {
             LevelManager.Instance.Retry();

GameManager/Assets/Joyixir/GameManager/Demo/GameManagerSample.unity.meta

@@ -144,6 +144,13 @@ internal void Skip()
             Initialize();
         }
 
+        internal void InitializePreviousLevel()
+        {
+            ForceLose();
+            DecreasePlayerLevel();
+            Initialize();
+        }
+
         internal void Retry()
         {
             CurrentLevel.ForceFinishLevel(LevelFinishStatus.Retry);
@@ -268,10 +275,16 @@ private int CalculateMoneyFromScore(int score)
             return score;
         }
 
+        private static void DecreasePlayerLevel()
+        {
+            PlayerLevel--;
+        }
+
         private static void IncreasePlayerLevel()
         {
             PlayerLevel++;
-            OnLevelUnlocked?.Invoke(PlayerLevel);
+            if(GetLevelAttempts(PlayerLevel) == 0)
+                OnLevelUnlocked?.Invoke(PlayerLevel);
         }
     }
 }

GameManager/Assets/Joyixir/GameManager/Scripts/GameManager.cs

@@ -1,8 +1,8 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.15.15",
+    "com.unity.collab-proxy": "1.15.18",
     "com.unity.ide.rider": "2.0.7",
-    "com.unity.ide.visualstudio": "2.0.14",
+    "com.unity.ide.visualstudio": "2.0.15",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",

GameManager/Assets/Joyixir/GameManager/Scripts/Level/LevelManager.cs

@@ -1,7 +1,7 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": {
-      "version": "1.15.15",
+      "version": "1.15.18",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -26,7 +26,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.14",
+      "version": "2.0.15",
       "depth": 0,
       "source": "registry",
       "dependencies": {

GameManager/Packages/manifest.json

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.33f1
-m_EditorVersionWithRevision: 2020.3.33f1 (915a7af8b0d5)
+m_EditorVersion: 2020.3.36f1
+m_EditorVersionWithRevision: 2020.3.36f1 (71f96b79b9f0)

GameManager/Packages/packages-lock.json

@@ -23,7 +23,8 @@ There are three ways to use it
 ### PackageManager
 ##### Scoped Registry
 **No longer supported(Latest version is 2.1.0)**
-TO add Joyixir scope to NPM scopedregistry, add the following to manifest.json
+
+To add Joyixir scope to NPM scopedregistry, add the following to manifest.json
 ```json
 {
     "scopedRegistries": [