Skip to content

Commit 8cc6a13

Browse files
authored
[1.1.1] Fixed the animation of closing settings (#4)
* Fix issues with settings animation * Fix package name in README
1 parent e2270bb commit 8cc6a13

File tree

7 files changed

+30
-5
lines changed

7 files changed

+30
-5
lines changed

Assets/Scenes/Lvl1.unity

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1803,6 +1803,14 @@ PrefabInstance:
18031803
propertyPath: m_Name
18041804
value: Victory
18051805
objectReference: {fileID: 0}
1806+
- target: {fileID: 3338031591941854971, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
1807+
propertyPath: needToHide.Array.size
1808+
value: 1
1809+
objectReference: {fileID: 0}
1810+
- target: {fileID: 3338031591941854971, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
1811+
propertyPath: needToHide.Array.data[0]
1812+
value:
1813+
objectReference: {fileID: 1733671630}
18061814
m_RemovedComponents: []
18071815
m_SourcePrefab: {fileID: 100100000, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
18081816
--- !u!1001 &6941278968805991357

Assets/Scenes/Lvl9.unity

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -637,6 +637,14 @@ PrefabInstance:
637637
propertyPath: m_Name
638638
value: Victory
639639
objectReference: {fileID: 0}
640+
- target: {fileID: 3338031591941854971, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
641+
propertyPath: needToHide.Array.size
642+
value: 1
643+
objectReference: {fileID: 0}
644+
- target: {fileID: 3338031591941854971, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
645+
propertyPath: needToHide.Array.data[0]
646+
value:
647+
objectReference: {fileID: 984897188}
640648
- target: {fileID: 3338031593245846864, guid: 27c2bd5700f576947927f549ebca5377, type: 3}
641649
propertyPath: m_AnchorMax.x
642650
value: 1

Assets/Scripts/SettingsAnimationsController.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ public class SettingsAnimationsController : MonoBehaviour
66
{
77
[SerializeField] private GameObject settingsBox;
88
[SerializeField] private GameObject shadowBackground;
9+
private bool _animationProgress;
910
private GameObject[] _belts;
1011

1112
private void Start()
@@ -15,18 +16,23 @@ private void Start()
1516

1617
public void OpenSettings()
1718
{
19+
if (_animationProgress) return;
20+
_animationProgress = true;
1821
shadowBackground.transform.GetComponent<Image>().DOFade(0.5f, 1);
1922
settingsBox.transform.DOLocalMoveY(760, 0);
2023
ObjectExtension.GetSavedObjects()[0].transform.GetComponent<AudioSource>().DOPitch(0.8f, 1);
2124
settingsBox.transform.DOLocalMoveY(520, 1)
2225
.OnComplete(() =>
2326
{
2427
foreach (var belt in _belts) belt.gameObject.GetComponent<SwapBeltz>().enabled = false;
28+
_animationProgress = false;
2529
});
2630
}
2731

2832
public void CloseSettings()
2933
{
34+
if (_animationProgress) return;
35+
_animationProgress = true;
3036
shadowBackground.transform.GetComponent<Image>().DOFade(0, 1);
3137
settingsBox.transform.DOLocalMoveY(520, 0);
3238
ObjectExtension.GetSavedObjects()[0].transform.GetComponent<AudioSource>().DOPitch(1, 1);
@@ -36,6 +42,7 @@ public void CloseSettings()
3642
foreach (var belt in _belts) belt.gameObject.GetComponent<SwapBeltz>().enabled = true;
3743
shadowBackground.SetActive(false);
3844
gameObject.SetActive(false);
45+
_animationProgress = false;
3946
});
4047
}
4148
}

Assets/Scripts/VictoryAnimationsController.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55
public class VictoryAnimationsController : MonoBehaviour
66
{
77
[SerializeField] private GameObject victoryBox;
8+
[SerializeField] private GameObject[] needToHide;
89

910
private void Start()
1011
{
1112
PlayVictorySound();
1213
gameObject.transform.GetComponent<Image>().DOFade(0.6f, 2).OnComplete(() =>
1314
{
15+
foreach (var item in needToHide) item.SetActive(false);
1416
victoryBox.SetActive(true);
1517
victoryBox.transform.DOScale(1, 1);
1618
});

ProjectSettings/ProjectSettings.asset

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ PlayerSettings:
134134
16:10: 1
135135
16:9: 1
136136
Others: 1
137-
bundleVersion: 1.1.0
137+
bundleVersion: 1.1.1
138138
preloadedAssets: []
139139
metroInputSource: 0
140140
wsaTransparentSwapchain: 0
@@ -160,8 +160,8 @@ PlayerSettings:
160160
iPhone: 0
161161
tvOS: 0
162162
overrideDefaultApplicationIdentifier: 1
163-
AndroidBundleVersionCode: 5
164-
AndroidMinSdkVersion: 24
163+
AndroidBundleVersionCode: 7
164+
AndroidMinSdkVersion: 23
165165
AndroidTargetSdkVersion: 32
166166
AndroidPreferredInstallLocation: 1
167167
aotOptions:

ProjectSettings/RiderScriptEditorPersistedState.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,4 @@ MonoBehaviour:
1212
m_Script: {fileID: 0}
1313
m_Name:
1414
m_EditorClassIdentifier: Unity.Rider.Editor:Packages.Rider.Editor:RiderScriptEditorPersistedState
15-
lastWriteTicks: -8585513947799261155
15+
lastWriteTicks: -8585512297529382775

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Beltz
22

3-
<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>
3+
<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>
44

55
### Hyper-casual 2d puzzle game
66
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.

0 commit comments

Comments
 (0)