Fixed bugs

Unity3/Assets/2021/Scenes/Main.unity

@@ -4932,6 +4932,7 @@ GameObject:
   - component: {fileID: 127776007}
   - component: {fileID: 127776006}
   - component: {fileID: 127776009}
+  - component: {fileID: 127776010}
   m_Layer: 5
   m_Name: ADVideo
   m_TagString: Untagged
@@ -5030,8 +5031,25 @@ Canvas:
   m_SortingBucketNormalizedSize: 0
   m_AdditionalShaderChannelsFlag: 25
   m_SortingLayerID: 0
-  m_SortingOrder: 13
+  m_SortingOrder: 25
   m_TargetDisplay: 0
+--- !u!114 &127776010
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 127776004}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreReversedGraphics: 1
+  m_BlockingObjects: 0
+  m_BlockingMask:
+    serializedVersion: 2
+    m_Bits: 4294967295
 --- !u!1 &128396310
 GameObject:
   m_ObjectHideFlags: 0
@@ -27414,7 +27432,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &777064953
 RectTransform:
   m_ObjectHideFlags: 0

Unity3/Assets/GameCore/FacebookHelper.cs

@@ -2,6 +2,7 @@ using System.Text;
 using UnityEngine;
 using System.Collections;
 using System;
+using System.Linq;
 using Facebook.Unity;
 using Prime31;
 using ICTS.Localization;
@@ -883,6 +884,8 @@ public class FacebookHelper : MonoBehaviour
 		int score = GameDataManager.Instance.Score;
 		string replayData = RecordingManager.Instance.GetReplayData();
 		Debug.Log("Score " + score + " " + LevelsManager.Instance.CurrentLevelIndex);
+		
+		
 		SubmitScore(LevelsManager.Instance.CurrentLevelIndex++, score, replayData);
 	}
 

Unity3/Assets/GameCore/LevelManagement/LevelsManager.cs

@@ -49,6 +49,21 @@ public class LevelsManager : MonoBehaviour
 			return levels[3];
 		} 
 	}
+
+	public int? GetIndexCurLevel()
+	{
+		for (int i = 0; i < LevelsManager.Instance.levels.Length; i++)
+		{
+			if (levels[i] == CurrentLevel)
+			{
+				return i;
+			}
+		}
+
+		return null;
+	}
+	
+	
 	public int _currentLevelIndex;
 	public int CurrentLevelIndex { get { return _currentLevelIndex; } 
 		set

Unity3/Assets/LivesManager/LivesManager/LivesManager.cs

@@ -32,7 +32,7 @@ public class LivesManager : MonoBehaviour
 	private const string TIMESTAMP_KEY = "timestamp";
 
 	public const int LIFE_RECHARGE_TIME = 0;
-	public const int MAX_RECHARGABLE_LIVES = 4;
+	public const int MAX_RECHARGABLE_LIVES = 10;
 
 	private SecureIntValue _lives;
 	private bool _isReplenishing = false;

Unity3/Assets/UI/Buttons/ButtonMenuTransitionEvent.cs

@@ -69,7 +69,7 @@ public class ButtonMenuTransitionEvent : MonoBehaviour
                         NotificationCenter.Post(NotificationType.MenuTransition,
                             MenuManager.MenuTransition.ExitToMainMenu);
                         LivesManager.Instance.ResetLive();
-                        if (PlayerPrefs.GetInt("GUEST") == 1)
+                        if (PlayerPrefs.GetInt("GUEST") != 1)
                         {
                             MenuManager._instance.FBShareDialog.Show();
                         }
@@ -150,7 +150,7 @@ public class ButtonMenuTransitionEvent : MonoBehaviour
                             NotificationCenter.Post(NotificationType.MenuTransition,
                                 MenuManager.MenuTransition.ExitToMainMenu);
                             LivesManager.Instance.ResetLive();
-                            if (PlayerPrefs.GetInt("GUEST") == 1)
+                            if (PlayerPrefs.GetInt("GUEST") != 1)
                             {
                                 MenuManager._instance.FBShareDialog.Show();
                             }
@@ -204,7 +204,7 @@ public class ButtonMenuTransitionEvent : MonoBehaviour
 					if (gameObject.name == "ButtonContinue" || CloseGameOver)
 					{
 					    
-                        var curLEvel = LevelsManager.Instance.CurrentLevelIndex+1;
+                        var curLEvel = LevelsManager.Instance.CurrentLevelIndex + 1;
 						if (MenuManager._instance.gameOverSummaryScreen.gameObject.activeSelf)
 						{
 						    if (curLEvel == 1 )
@@ -274,7 +274,7 @@ public class ButtonMenuTransitionEvent : MonoBehaviour
                                 NotificationCenter.Post(NotificationType.MenuTransition,
                                     MenuManager.MenuTransition.ExitToMainMenu);
                                 LivesManager.Instance.ResetLive();
-                                if (PlayerPrefs.GetInt("GUEST") == 1)
+                                if (PlayerPrefs.GetInt("GUEST") != 1)
                                 {
                                     MenuManager._instance.FBShareDialog.Show();
                                 }

Unity3/Assets/UI/Objectives/GameOverScreenTitle.cs

@@ -27,12 +27,13 @@ public class GameOverScreenTitle : MonoBehaviour
             MenuManager._instance.CouponeMessage.Show();
 	        return;
 	    }
-	    var curLEvel = PlayerPrefs.GetInt("Level");
+	    var curLEvel = LevelsManager.Instance.GetIndexCurLevel();
+	    curLEvel++;
 	    Debug.Log("Finish Game " + curLEvel);
 		if(MenuManager._instance.Finish)
 		{
 			Debug.Log("Finish " + LevelsManager.Instance.CurrentLevelIndex);
-			title.text = string.Format(Localization.instance.Get("scoreSummary.title.finished"), curLEvel);
+			title.text = string.Format(Localization.instance.Get("scoreSummary.title.finished"), curLEvel-1);
 			if (LevelsManager.Instance.CurrentLevelIndex > 2)
 			{
 				if (InventoryManager.Instance.GetItemCount(InventoryItem.specialwave) <= 1)

Unity3/ProjectSettings/EditorBuildSettings.asset

@@ -27,6 +27,9 @@ EditorBuildSettings:
     path: Assets/AssetBundling/Tests/TestAssetBundles.unity
     guid: d63b7afea00e44496a3dcc037dded9b8
   - enabled: 0
+    path: Assets/AppleAuthSample/SampleScene.unity
+    guid: 6f48e3993e1264b21b0fc1e486a1641e
+  - enabled: 0
     path: 
     guid: 00000000000000000000000000000000
   - enabled: 0

Unity3/ProjectSettings/ProjectSettings.asset

@@ -56,7 +56,7 @@ PlayerSettings:
   iosShowActivityIndicatorOnLoading: -1
   androidShowActivityIndicatorOnLoading: -1
   iosUseCustomAppBackgroundBehavior: 0
-  iosAllowHTTPDownload: 0
+  iosAllowHTTPDownload: 1
   allowedAutorotateToPortrait: 0
   allowedAutorotateToPortraitUpsideDown: 0
   allowedAutorotateToLandscapeRight: 1
@@ -154,10 +154,10 @@ PlayerSettings:
     tvOS: gamatic.icts
   buildNumber:
     Standalone: 0
-    iPhone: 5
+    iPhone: 1
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 11
+  AndroidBundleVersionCode: 12
   AndroidMinSdkVersion: 19
   AndroidTargetSdkVersion: 29
   AndroidPreferredInstallLocation: 0
@@ -274,36 +274,6 @@ PlayerSettings:
   - m_BuildTarget: Android
     m_Icons:
     - m_Textures: []
-      m_Width: 432
-      m_Height: 432
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 324
-      m_Height: 324
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 216
-      m_Height: 216
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 162
-      m_Height: 162
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 108
-      m_Height: 108
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
-      m_Width: 81
-      m_Height: 81
-      m_Kind: 2
-      m_SubKind: 
-    - m_Textures: []
       m_Width: 192
       m_Height: 192
       m_Kind: 0
@@ -363,6 +333,36 @@ PlayerSettings:
       m_Height: 36
       m_Kind: 1
       m_SubKind: 
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
   - m_BuildTarget: iPhone
     m_Icons:
     - m_Textures: []

Unity3/UserSettings/EditorUserSettings.asset

@@ -18,12 +18,21 @@ EditorUserSettings:
       value: 224247031146466e0307183b50175a131e191726232f2f353e662e3ae5ee1d36d5ee22e1c62a2f303c4ddc3d092e0d3ae1453a08f3050f185e3df4091fd61e2418d110e40ad81319f42a1dc3dd11d4dcf0c0d1e4ccd8fecbcadaadbce1fee7ecec
       flags: 0
     RecentlyUsedScenePath-4:
-      value: 224247031146466e0307183b50175a131e191726232f2f353e662e3ae5ee1d36d5ee22e1c62a2f303c4ddc3d092e0d3ae1453a08f3050f185e3df4091fd61e2418d110e40ad81319f42a1dc3dd11d4dcf6d7d8e6daeae4d3cd91b5fcfde4f7
+      value: 224247031146467008170f2a112d763f0558352b252668252320092a
       flags: 0
     RecentlyUsedScenePath-5:
-      value: 224247031146467008170f2a112d763f0558352b252668252320092a
+      value: 224247031146466e0307183b50175a131e191726232f2f353e662e3ae5ee1d36d5ee22e1c62a2f303c4ddc3d092e0d3ae1453a08f3050f185e3df4091fd61e2418d110e40ad81319f42a1dc3dd11d4dcf6d7d8e6daeae4d3cd91b5fcfde4f7
       flags: 0
     RecentlyUsedScenePath-6:
+      value: 224247031146467d0c0d09201f2c5423323c570f34292b20212c0e7ccfe13d36cfe238fca92f31352d1b
+      flags: 0
+    RecentlyUsedScenePath-7:
+      value: 224247031146467a1d1e002731364b182516153a202d69032c240d3fe7d3373dece278fce9332b25
+      flags: 0
+    RecentlyUsedScenePath-8:
+      value: 224247031146467a1d1e002731364b182516153a202d691c2c271920e1e1243dd1e63bf9eb3f0c3f3c0cea721130082beb
+      flags: 0
+    RecentlyUsedScenePath-9:
       value: 22424703114646095d5c5d6d23205a1e130457072d21287e38271427fb
       flags: 0
     vcSharedLogLevel: