diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index bad7ee5..da3e32b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,12 +11,6 @@ permissions: pull-requests: write jobs: - lint-commit: - runs-on: "ubuntu-latest" - steps: - - uses: "actions/checkout@v4.2.2" - - uses: "wagoid/commitlint-github-action@v6.2.1" - lint-editorconfig-checker: runs-on: "ubuntu-latest" steps: diff --git a/Assets/Resources/InGame/ButtonSkin/cancelBtn.png.meta b/Assets/Resources/InGame/ButtonSkin/cancelBtn.png.meta index 2c493d2..24c537e 100644 --- a/Assets/Resources/InGame/ButtonSkin/cancelBtn.png.meta +++ b/Assets/Resources/InGame/ButtonSkin/cancelBtn.png.meta @@ -108,6 +108,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -234,7 +247,12 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + cancelBtn_0: -4579822432219233078 + cancelBtn_1: -4181939333999132496 + cancelBtn_2: 8512661480653712572 + cancelBtn_3: -2543711027167231359 + cancelBtn_4: 4838270059752062411 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/InGame/ButtonSkin/closeBtn.png.meta b/Assets/Resources/InGame/ButtonSkin/closeBtn.png.meta index 023897a..76fe327 100644 --- a/Assets/Resources/InGame/ButtonSkin/closeBtn.png.meta +++ b/Assets/Resources/InGame/ButtonSkin/closeBtn.png.meta @@ -96,6 +96,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -134,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + closeBtn_0: -654415992179358624 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/InGame/ButtonSkin/editorBtn.png.meta b/Assets/Resources/InGame/ButtonSkin/editorBtn.png.meta index 23bb500..895c4f4 100644 --- a/Assets/Resources/InGame/ButtonSkin/editorBtn.png.meta +++ b/Assets/Resources/InGame/ButtonSkin/editorBtn.png.meta @@ -96,6 +96,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -134,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + editorBtn_0: 9002939317064965793 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/InGame/ButtonSkin/importBtn.png.meta b/Assets/Resources/InGame/ButtonSkin/importBtn.png.meta index ec1f211..69afd0d 100644 --- a/Assets/Resources/InGame/ButtonSkin/importBtn.png.meta +++ b/Assets/Resources/InGame/ButtonSkin/importBtn.png.meta @@ -96,6 +96,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -134,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + importBtn_0: 6669414160430206226 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/InGame/ButtonSkin/importBtn2.png.meta b/Assets/Resources/InGame/ButtonSkin/importBtn2.png.meta index 7c2ab0b..9340d8c 100644 --- a/Assets/Resources/InGame/ButtonSkin/importBtn2.png.meta +++ b/Assets/Resources/InGame/ButtonSkin/importBtn2.png.meta @@ -96,6 +96,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -134,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + importBtn2_0: -1409255045544979666 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/InGame/ButtonSkin/playBtn.png.meta b/Assets/Resources/InGame/ButtonSkin/playBtn.png.meta index 42abab5..7c583ec 100644 --- a/Assets/Resources/InGame/ButtonSkin/playBtn.png.meta +++ b/Assets/Resources/InGame/ButtonSkin/playBtn.png.meta @@ -96,6 +96,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -134,7 +147,8 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + playBtn_0: -4287216300838241123 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Resources/InGame/ButtonSkin/saveBtn.png.meta b/Assets/Resources/InGame/ButtonSkin/saveBtn.png.meta index f6bd267..087174b 100644 --- a/Assets/Resources/InGame/ButtonSkin/saveBtn.png.meta +++ b/Assets/Resources/InGame/ButtonSkin/saveBtn.png.meta @@ -111,6 +111,19 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: @@ -259,7 +272,13 @@ TextureImporter: secondaryTextures: [] spriteCustomMetadata: entries: [] - nameFileIdTable: {} + nameFileIdTable: + saveBtn_0: -626436719271748831 + saveBtn_1: -1715996769668828261 + saveBtn_2: -8850024829547459184 + saveBtn_3: 9204917831739309651 + saveBtn_4: -7034966553427437937 + saveBtn_5: -142403778502646489 mipmapLimitGroupName: pSDRemoveMatte: 0 userData: diff --git a/Assets/Scenes/SelectLevelScene.unity b/Assets/Scenes/SelectLevelScene.unity index 41aa46d..acaab1c 100644 --- a/Assets/Scenes/SelectLevelScene.unity +++ b/Assets/Scenes/SelectLevelScene.unity @@ -300,7 +300,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 4.799972, y: -181.581} + m_AnchoredPosition: {x: 3.6, y: -182.2} m_SizeDelta: {x: 629.6868, y: 98.2373} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &92159576 @@ -623,7 +623,7 @@ MonoBehaviour: starTemplate: {fileID: 1331855743} starsContainer: {fileID: 760835823} levelsLoader: {fileID: 0} - starSpacing: 1 + extraPadding: 10 --- !u!1 &633505916 GameObject: m_ObjectHideFlags: 0 @@ -734,7 +734,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -18, y: -132} + m_AnchoredPosition: {x: 3.6, y: -135.3} m_SizeDelta: {x: 629.6868, y: 98.2373} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &760653960 @@ -826,7 +826,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -63} + m_AnchoredPosition: {x: 0, y: -41} m_SizeDelta: {x: 375, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &954359120 @@ -1584,7 +1584,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -47.518017, y: -230.241} + m_AnchoredPosition: {x: 3.6, y: -95.2} m_SizeDelta: {x: 629.6868, y: 98.2373} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1571276506 diff --git a/Assets/Scripts/LevelsLoader.cs b/Assets/Scripts/LevelsLoader.cs index 801ffaf..cced260 100644 --- a/Assets/Scripts/LevelsLoader.cs +++ b/Assets/Scripts/LevelsLoader.cs @@ -50,7 +50,10 @@ public class LevelsLoader : MonoBehaviour private void SaveLevelCurrent() { - if (levelCurrent == null) return; + if (levelCurrent == null) + { + return; + } LevelStat levelStat = new() { @@ -68,7 +71,10 @@ public class LevelsLoader : MonoBehaviour public void NextLevel() { - if (levels.Count == 0) return; + if (levels.Count == 0) + { + return; + } int currentIndex = levels.IndexOf(levelCurrent); levelCurrent = levels[(currentIndex + 1) % levels.Count]; @@ -76,7 +82,10 @@ public class LevelsLoader : MonoBehaviour public void PreviousLevel() { - if (levels.Count == 0) return; + if (levels.Count == 0) + { + return; + } int currentIndex = levels.IndexOf(levelCurrent); levelCurrent = levels[(currentIndex - 1 + levels.Count) % levels.Count]; @@ -84,7 +93,10 @@ public class LevelsLoader : MonoBehaviour public void IncreaseTotalJumps() { - if (levelCurrent == null) return; + if (levelCurrent == null) + { + return; + } levelCurrent.TotalJumps += 1; SaveLevelCurrent(); @@ -92,7 +104,10 @@ public class LevelsLoader : MonoBehaviour public void IncreaseTotalAttempts() { - if (levelCurrent == null) return; + if (levelCurrent == null) + { + return; + } levelCurrent.TotalAttempts += 1; SaveLevelCurrent(); @@ -100,7 +115,10 @@ public class LevelsLoader : MonoBehaviour public int CalculateCurrentProgressionPercent(Vector3 playerPosition) { - if (levelCurrent == null) return 0; + if (levelCurrent == null) + { + return 0; + } float lastX = levelCurrent.LastX; GameObject winnerWallPrefab = Resources.Load("Prefabs/WinnerWall"); @@ -125,6 +143,8 @@ public class LevelsLoader : MonoBehaviour levels.Clear(); LoadAllLevels(); if (levels.Count > 0) + { levelCurrent = levels[0]; + } } } diff --git a/Assets/Scripts/LevelsSelect/LevelHomeButton.cs b/Assets/Scripts/LevelsSelect/LevelHomeButton.cs index e61ac40..c8ab518 100644 --- a/Assets/Scripts/LevelsSelect/LevelHomeButton.cs +++ b/Assets/Scripts/LevelsSelect/LevelHomeButton.cs @@ -10,6 +10,7 @@ public class LevelHomeButton : MonoBehaviour public static IEnumerator PlaySoundAndLoadScene(AudioSource sfxSource, string scene) { yield return new WaitWhile(() => sfxSource.isPlaying); + Time.timeScale = 1; SceneManager.LoadScene(scene); } diff --git a/Assets/Scripts/Player.cs b/Assets/Scripts/Player.cs index f77722a..791453c 100644 --- a/Assets/Scripts/Player.cs +++ b/Assets/Scripts/Player.cs @@ -105,11 +105,10 @@ public class Player : MonoBehaviour if (collision.gameObject.CompareTag("Kill")) { - + Time.timeScale = 0; sfxSource.clip = Resources.Load(Path.Combine("Sounds", "death")); sfxSource.Play(); StartCoroutine(LevelHomeButton.PlaySoundAndLoadScene(sfxSource, SceneManager.GetActiveScene().name)); - } if (collision.gameObject.CompareTag("Win")) diff --git a/Assets/Scripts/SelectDifficulty.cs b/Assets/Scripts/SelectDifficulty.cs index 556008c..b8d3120 100644 --- a/Assets/Scripts/SelectDifficulty.cs +++ b/Assets/Scripts/SelectDifficulty.cs @@ -50,7 +50,6 @@ public class SelectDifficulty : MonoBehaviour public void PreviousDifficulty() { - Debug.Log("PreviousDifficulty called"); if (currentDifficulty > MinDiff) { currentDifficulty--; @@ -60,7 +59,6 @@ public class SelectDifficulty : MonoBehaviour public void NextDifficulty() { - Debug.Log("NextDifficulty called"); if (currentDifficulty < MaxDiff) { currentDifficulty++; diff --git a/Assets/Scripts/StarsRenderer.cs b/Assets/Scripts/StarsRenderer.cs index a4d7234..cffb5b7 100644 --- a/Assets/Scripts/StarsRenderer.cs +++ b/Assets/Scripts/StarsRenderer.cs @@ -50,7 +50,6 @@ public class StarsRenderer : MonoBehaviour { useManualMode = true; manualDifficulty = Mathf.Clamp(difficulty, 1, 5); - Debug.Log($"[StarsRenderer] SetManualDifficulty → manualDifficulty = {manualDifficulty}"); lastRenderedDifficulty = -1; RenderStarsInternal(manualDifficulty); } @@ -74,7 +73,6 @@ public class StarsRenderer : MonoBehaviour private void RenderStarsInternal(int difficulty) { - Debug.Log($"[StarsRenderer] RenderStarsInternal → difficulté = {difficulty}", this); for (int i = starsContainer.childCount - 1; i >= 0; i--) { var child = starsContainer.GetChild(i); diff --git a/Documentation/Screenshots/gameplay.png b/Documentation/Screenshots/gameplay.png index 57095e8..c093332 100644 Binary files a/Documentation/Screenshots/gameplay.png and b/Documentation/Screenshots/gameplay.png differ diff --git a/Documentation/Screenshots/home-page.png b/Documentation/Screenshots/home-page.png index 07fc519..263e22c 100644 Binary files a/Documentation/Screenshots/home-page.png and b/Documentation/Screenshots/home-page.png differ diff --git a/Documentation/Screenshots/levels-selection.png b/Documentation/Screenshots/levels-selection.png index 9840e6f..b97250f 100644 Binary files a/Documentation/Screenshots/levels-selection.png and b/Documentation/Screenshots/levels-selection.png differ