Merge branch 'release/3.2.0'

Author: amirhakimnejad

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

@@ -24,10 +24,17 @@ public virtual void InitializeLevel(BaseLevelConfig config)
         {
             _levelNumber = LevelManager.PlayerLevel;
             _levelConfig = config;
+            NameLevelGameObject();
             FillVariables();
             PrepareUIRequirementsabstract();
         }
 
+        private void NameLevelGameObject()
+        {
+            // DEBUGGING PURPOSES
+            gameObject.name = $"{GetType().Name}_{LevelManager.LastLoadedLevelRealIndex}";
+        }
+
         protected virtual void FillVariables()
         {
         }
@@ -83,13 +90,16 @@ public class LevelData
         public float Satisfaction;
         public int Score;
         public int LevelNumber;
+        public int HumanReadableLevelNumber => LevelNumber + 1;
         public bool WinStatus;
+        public int Attempt;
 
         public static LevelData GenerateFromLevel(BaseLevel level)
         {
             var levelData = new LevelData();
             levelData.ForcedStatus = level.ForcedFinishStatus;
             levelData.LevelNumber = level.LevelNumber;
+            levelData.Attempt = LevelManager.GetLevelAttempts(level.LevelNumber);
             if (levelData.ForcedStatus == LevelFinishStatus.Retry)
             {
                 levelData.EarnedMoney = 0;

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

@@ -2,7 +2,6 @@
 using System.Collections;
 using System.Collections.Generic;
 using Joyixir.GameManager.Utils;
-using Joyixir.Utils;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using Random = UnityEngine.Random;
@@ -19,6 +18,7 @@ public class LevelManager : MonoBehaviour
         public static Action<LevelData> OnLevelFinish;
         public static Action OnLevelStart;
         public static Action OnLevelReady;
+        public static Action<int> OnLevelUnlocked; // Starts from 0
         public static Action<float> OnSceneChangeProgressChanged;
 
         internal static BaseLevel CurrentLevel { get; set; }
@@ -43,7 +43,8 @@ public class LevelManager : MonoBehaviour
 
         #endregion
 
-
+        public static int LastLoadedLevelRealIndex { get; private set; }
+        
         public static int PlayerLevel
         {
             get => GameManagementPlayerPrefs.PlayerLevel;
@@ -101,6 +102,11 @@ private void CreateAndInitializeLevel()
             CurrentLevel.InitializeLevel(_pickedConfig);
         }
 
+        internal static int GetLevelAttempts(int levelNumber)
+        {
+            return GameManagementPlayerPrefs.GetLevelAttempts(levelNumber);
+        }
+
         private void CreateLevelWithScene()
         {
             if (CurrentLevel != null)
@@ -163,22 +169,30 @@ private BaseLevelConfig GetLevelConfigToLoad()
         {
             if (levelsConfigs.Count == 0)
                 throw new Exception("No levels to load");
+            var levelIndexToLoad = GetLevelIndexToLoad();
 
-            var configToLoad = levelsConfigs[0];
+            var configToLoad = levelsConfigs[levelIndexToLoad];
+
+            if (configToLoad == null)
+                throw new Exception("You assigned a null element to configs");
+            LastLoadedLevelRealIndex = levelIndexToLoad;
+            return configToLoad;
+        }
+
+        private int GetLevelIndexToLoad()
+        {
+            var index = 0;
             if (minimumLevelToLoadAfterFirstFinish < levelsConfigs.Count)
             {
                 var playerFinishedAllLevels = PlayerLevel > levelsConfigs.Count - 1;
                 var levelIndex = playerFinishedAllLevels
                     ? Random.Range(minimumLevelToLoadAfterFirstFinish, levelsConfigs.Count)
                     : PlayerLevel;
-                configToLoad = levelsConfigs[levelIndex];
+                index = levelIndex;
             }
             else
-                configToLoad = levelsConfigs.PickRandom();
-
-            if (configToLoad == null)
-                throw new Exception("You assigned a null element to configs");
-            return configToLoad;
+                index = Random.Range(0, levelsConfigs.Count);
+            return index;
         }
 
         private void UnSubscribeFromLevel()
@@ -208,6 +222,7 @@ internal void StartLevelWheneverReady()
         private void StartLevelNow()
         {
             SubscribeToLevel();
+            GameManagementPlayerPrefs.AttemptLevel(CurrentLevel.LevelNumber);
             CurrentLevel.StartLevel();
             if (levelQueuedForStart)
                 OnLevelReady -= StartLevelWheneverReady;
@@ -256,6 +271,7 @@ private int CalculateMoneyFromScore(int score)
         private static void IncreasePlayerLevel()
         {
             PlayerLevel++;
+            OnLevelUnlocked?.Invoke(PlayerLevel);
         }
     }
 }

GameManager/Assets/Joyixir/GameManager/Scripts/Utils/GameManagementPlayerPrefs.cs

@@ -1,4 +1,5 @@
-using UnityEngine;
+using System;
+using UnityEngine;
 
 namespace Joyixir.GameManager.Utils
 {
@@ -15,5 +16,16 @@ public static int PlayerTotalScore
             set => PlayerPrefs.SetInt("Joyixir_TotalScore", value);
             get => PlayerPrefs.GetInt("Joyixir_TotalScore", 0);
         }
+
+        public static int GetLevelAttempts(int levelNumber)
+        {
+            return PlayerPrefs.GetInt($"Joyixir_Level_{levelNumber}_Attempts", 0);
+        }
+
+        public static void AttemptLevel(int levelNumber)
+        {
+            var newAttempt = GetLevelAttempts(levelNumber) + 1;
+            PlayerPrefs.SetInt($"Joyixir_Level_{levelNumber}_Attempts", newAttempt);
+        }
     }
 }

GameManager/Assets/Joyixir/Utility

@@ -1,10 +1,10 @@
 {
   "dependencies": {
-    "com.unity.collab-proxy": "1.7.1",
+    "com.unity.collab-proxy": "1.15.15",
     "com.unity.ide.rider": "2.0.7",
-    "com.unity.ide.visualstudio": "2.0.11",
-    "com.unity.ide.vscode": "1.2.3",
-    "com.unity.test-framework": "1.1.27",
+    "com.unity.ide.visualstudio": "2.0.14",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.4.8",
     "com.unity.ugui": "1.0.0",

GameManager/Assets/Joyixir/Utility.meta

@@ -1,11 +1,11 @@
 {
   "dependencies": {
     "com.unity.collab-proxy": {
-      "version": "1.7.1",
+      "version": "1.15.15",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.nuget.newtonsoft-json": "2.0.0"
+        "com.unity.services.core": "1.0.1"
       },
       "url": "https://packages.unity.com"
     },
@@ -26,7 +26,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.11",
+      "version": "2.0.14",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -35,21 +35,23 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.vscode": {
-      "version": "1.2.3",
+      "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
       "url": "https://packages.unity.com"
     },
-    "com.unity.nuget.newtonsoft-json": {
-      "version": "2.0.0",
+    "com.unity.services.core": {
+      "version": "1.0.1",
       "depth": 1,
       "source": "registry",
-      "dependencies": {},
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      },
       "url": "https://packages.unity.com"
     },
     "com.unity.test-framework": {
-      "version": "1.1.27",
+      "version": "1.1.31",
       "depth": 0,
       "source": "registry",
       "dependencies": {

GameManager/Packages/manifest.json

@@ -12,8 +12,8 @@ PlayerSettings:
   targetDevice: 2
   useOnDemandResources: 0
   accelerometerFrequency: 60
-  companyName: DefaultCompany
-  productName: utility
+  companyName: Joyixir
+  productName: Game Manager
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -68,6 +68,12 @@ PlayerSettings:
   androidRenderOutsideSafeArea: 1
   androidUseSwappy: 1
   androidBlitType: 0
+  androidResizableWindow: 0
+  androidDefaultWindowWidth: 1920
+  androidDefaultWindowHeight: 1080
+  androidMinimumWindowWidth: 400
+  androidMinimumWindowHeight: 300
+  androidFullscreenMode: 1
   defaultIsNativeResolution: 1
   macRetinaSupport: 1
   runInBackground: 1
@@ -121,13 +127,14 @@ PlayerSettings:
   vulkanEnableSetSRGBWrite: 0
   vulkanEnablePreTransform: 0
   vulkanEnableLateAcquireNextImage: 0
+  vulkanEnableCommandBufferRecycling: 1
   m_SupportedAspectRatios:
     4:3: 1
     5:4: 1
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 0.1
+  bundleVersion: 3.2.0
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -145,7 +152,8 @@ PlayerSettings:
   resolutionScalingMode: 0
   androidSupportedAspectRatio: 1
   androidMaxAspectRatio: 2.1
-  applicationIdentifier: {}
+  applicationIdentifier:
+    Standalone: com.Joyixir.Game-Manager
   buildNumber:
     Standalone: 0
     iPhone: 0
@@ -235,6 +243,7 @@ PlayerSettings:
   useCustomGradlePropertiesTemplate: 0
   useCustomProguardFile: 0
   AndroidTargetArchitectures: 1
+  AndroidTargetDevices: 0
   AndroidSplashScreenScale: 0
   androidSplashScreen: {fileID: 0}
   AndroidKeystoreName: 
@@ -251,6 +260,7 @@ PlayerSettings:
     height: 180
     banner: {fileID: 0}
   androidGamepadSupportLevel: 0
+  chromeosInputEmulation: 1
   AndroidMinifyWithR8: 0
   AndroidMinifyRelease: 0
   AndroidMinifyDebug: 0
@@ -345,6 +355,7 @@ PlayerSettings:
   cameraUsageDescription: 
   locationUsageDescription: 
   microphoneUsageDescription: 
+  bluetoothUsageDescription: 
   switchNMETAOverride: 
   switchNetLibKey: 
   switchSocketMemoryPoolSize: 6144
@@ -483,7 +494,9 @@ PlayerSettings:
   switchPlayerConnectionEnabled: 1
   switchUseNewStyleFilepaths: 0
   switchUseMicroSleepForYield: 1
+  switchEnableRamDiskSupport: 0
   switchMicroSleepForYieldTime: 25
+  switchRamDiskSpaceSize: 12
   ps4NPAgeRating: 12
   ps4NPTitleSecret: 
   ps4NPTrophyPackPath: 
@@ -625,6 +638,7 @@ PlayerSettings:
   metroFTAName: 
   metroFTAFileTypes: []
   metroProtocolName: 
+  vcxProjDefaultLanguage: 
   XboxOneProductId: 
   XboxOneUpdateKey: 
   XboxOneSandboxId: 

GameManager/Packages/packages-lock.json

@@ -1,2 +1,2 @@
-m_EditorVersion: 2020.3.16f1
-m_EditorVersionWithRevision: 2020.3.16f1 (049d6eca3c44)
+m_EditorVersion: 2020.3.33f1
+m_EditorVersionWithRevision: 2020.3.33f1 (915a7af8b0d5)

GameManager/ProjectSettings/ProjectSettings.asset

@@ -1,18 +1,20 @@
 # GameManager
 
- A simple unity game management system to handle loading a game, its levels and saving the levels data such as score, gained money, level number. Also it provides enough public Actions for other classes to do things based on game status changes like listening to level finish to send analytics, etc. 
+ A simple unity game management system to handle loading a game, its levels and saving the levels data such as score, gained money, level number. Technically its a full game circle.
+ Also it provides enough public Actions for other classes to do things based on game status changes like listening to level finish to send analytics, etc. 
 
 ## Features
 
 - Starts, ends, restarts levels
 - Handles level number, score, money, satisfaction
 - Initialization is separated from level start
 - Handles all required actions
+- Tracks number of attempts
 
 
 ## Installation
 There are three ways to use it
-**Keep in mind that this repo is dependent to Unity TMPro and [Joyixir Utility](https://github.com/joyixir/utility)**
+**Keep in mind that this repo is dependent to Unity TMPro**
 
 ### Unitypackage
 - Go to the releases section and download the .unitypackage file
@@ -78,6 +80,7 @@ public static LevelManager Instance;
 public static Action<LevelData> OnLevelFinish;
 public static Action OnLevelStart;
 public static Action OnLevelReady;
+public static Action<int> OnLevelUnlocked; // Starts from 0
 ```
 ## What is LevelData?
 The short answer is the simplified data of ANY kind of levels. Doesn’t matter if a baseball or a shooter, simulation or a runner, every sort of level should be simplified to some general parameters.
@@ -113,7 +116,9 @@ public class LevelData
     public float Satisfaction;
     public int Score;
     public int LevelNumber;
+    public int HumanReadableLevelNumber => LevelNumber + 1;
     public bool WinStatus;
+    public int Attempt;
 
     public static LevelData GenerateFromLevel(BaseLevel level)
     {