[1.1.1] Fixed the animation of closing settings (#4)

* Fix issues with settings animation * Fix package name in README
Carapacik · Apr 19, 2022 · 8cc6a13 · 8cc6a13
1 parent e2270bb
commit 8cc6a13
Show file tree

Hide file tree

Showing 7 changed files with 30 additions and 5 deletions.
diff --git a/Assets/Scenes/Lvl1.unity b/Assets/Scenes/Lvl1.unity
@@ -1803,6 +1803,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: Victory
       objectReference: {fileID: 0}
+    - target: {fileID: 3338031591941854971, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
+      propertyPath: needToHide.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3338031591941854971, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
+      propertyPath: needToHide.Array.data[0]
+      value: 
+      objectReference: {fileID: 1733671630}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
 --- !u!1001 &6941278968805991357

diff --git a/Assets/Scenes/Lvl9.unity b/Assets/Scenes/Lvl9.unity
@@ -637,6 +637,14 @@ PrefabInstance:
       propertyPath: m_Name
       value: Victory
       objectReference: {fileID: 0}
+    - target: {fileID: 3338031591941854971, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
+      propertyPath: needToHide.Array.size
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3338031591941854971, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
+      propertyPath: needToHide.Array.data[0]
+      value: 
+      objectReference: {fileID: 984897188}
     - target: {fileID: 3338031593245846864, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
       propertyPath: m_AnchorMax.x
       value: 1

diff --git a/Assets/Scripts/SettingsAnimationsController.cs b/Assets/Scripts/SettingsAnimationsController.cs
@@ -6,6 +6,7 @@ public class SettingsAnimationsController : MonoBehaviour
 {
     [SerializeField] private GameObject settingsBox;
     [SerializeField] private GameObject shadowBackground;
+    private bool _animationProgress;
     private GameObject[] _belts;
 
     private void Start()
@@ -15,18 +16,23 @@ private void Start()
 
     public void OpenSettings()
     {
+        if (_animationProgress) return;
+        _animationProgress = true;
         shadowBackground.transform.GetComponent<Image>().DOFade(0.5f, 1);
         settingsBox.transform.DOLocalMoveY(760, 0);
         ObjectExtension.GetSavedObjects()[0].transform.GetComponent<AudioSource>().DOPitch(0.8f, 1);
         settingsBox.transform.DOLocalMoveY(520, 1)
             .OnComplete(() =>
             {
                 foreach (var belt in _belts) belt.gameObject.GetComponent<SwapBeltz>().enabled = false;
+                _animationProgress = false;
             });
     }
 
     public void CloseSettings()
     {
+        if (_animationProgress) return;
+        _animationProgress = true;
         shadowBackground.transform.GetComponent<Image>().DOFade(0, 1);
         settingsBox.transform.DOLocalMoveY(520, 0);
         ObjectExtension.GetSavedObjects()[0].transform.GetComponent<AudioSource>().DOPitch(1, 1);
@@ -36,6 +42,7 @@ public void CloseSettings()
                 foreach (var belt in _belts) belt.gameObject.GetComponent<SwapBeltz>().enabled = true;
                 shadowBackground.SetActive(false);
                 gameObject.SetActive(false);
+                _animationProgress = false;
             });
     }
 }
diff --git a/Assets/Scripts/VictoryAnimationsController.cs b/Assets/Scripts/VictoryAnimationsController.cs
@@ -5,12 +5,14 @@
 public class VictoryAnimationsController : MonoBehaviour
 {
     [SerializeField] private GameObject victoryBox;
+    [SerializeField] private GameObject[] needToHide;
 
     private void Start()
     {
         PlayVictorySound();
         gameObject.transform.GetComponent<Image>().DOFade(0.6f, 2).OnComplete(() =>
         {
+            foreach (var item in needToHide) item.SetActive(false);
             victoryBox.SetActive(true);
             victoryBox.transform.DOScale(1, 1);
         });

diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
@@ -134,7 +134,7 @@ PlayerSettings:
     16:10: 1
     16:9: 1
     Others: 1
-  bundleVersion: 1.1.0
+  bundleVersion: 1.1.1
   preloadedAssets: []
   metroInputSource: 0
   wsaTransparentSwapchain: 0
@@ -160,8 +160,8 @@ PlayerSettings:
     iPhone: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 5
-  AndroidMinSdkVersion: 24
+  AndroidBundleVersionCode: 7
+  AndroidMinSdkVersion: 23
   AndroidTargetSdkVersion: 32
   AndroidPreferredInstallLocation: 1
   aotOptions: 

diff --git a/ProjectSettings/RiderScriptEditorPersistedState.asset b/ProjectSettings/RiderScriptEditorPersistedState.asset
@@ -12,4 +12,4 @@ MonoBehaviour:
   m_Script: {fileID: 0}
   m_Name: 
   m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
-  lastWriteTicks: -8585513947799261155
+  lastWriteTicks: -8585512297529382775
diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # Beltz
 
-<a href='https://play.google.com/store/apps/details?id=com.Carapacik.Beltz'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='100px'/></a>
+<a href='https://play.google.com/store/apps/details?id=com.carapacik.beltz'><img alt='Get it on Google Play' src='https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png' height='90px'/></a>
 
 ### Hyper-casual 2d puzzle game
 The game is a system of *shafts* and *belts*. It is necessary to make sure that the belts are in the correct position, so that the shafts begin to spin.