nightly 1.6.2.0

ipodtouch0218 · Jun 18, 2022 · 1158f4c · 1158f4c
1 parent f514b17
commit 1158f4c
Show file tree

Hide file tree

Showing 13 changed files with 3,446 additions and 1,073 deletions.
diff --git a/Assets/Scenes/Levels/CustomBonus.unity b/Assets/Scenes/Levels/CustomBonus.unity
diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity
diff --git a/Assets/Scripts/Entity/Player/PlayerController.cs b/Assets/Scripts/Entity/Player/PlayerController.cs
@@ -1876,17 +1876,9 @@ bool HandleStuckInBlock() {
         onGround = true;
 
         if (Utils.IsAnyTileSolidBetweenWorldBox(checkPos, checkSize)) {
-
-            if (!Utils.IsAnyTileSolidBetweenWorldBox(body.position + Vector2.up * 0.25f, checkPos * Vector2.right)) {
-                Debug.Log("a");
+            if (!Utils.IsAnyTileSolidBetweenWorldBox(body.position + Vector2.up * 0.5f, checkSize * Vector2.right)) {
                 transform.position = body.position = new(body.position.x, Mathf.Floor(body.position.y * 2 + 1) / 2);
-
-            } else if (!Utils.IsAnyTileSolidBetweenWorldBox(body.position + Vector2.up * 0.75f, checkPos * Vector2.right)) {
-                Debug.Log("b");
-                transform.position = body.position = new(body.position.x, Mathf.Floor(body.position.y * 2 + 2) / 2);
-
-            } else if (!Utils.IsAnyTileSolidBetweenWorldBox(body.position + Vector2.down * 0.4f, checkPos * Vector2.right)) {
-                Debug.Log("c");
+            } else if (!Utils.IsAnyTileSolidBetweenWorldBox(body.position + Vector2.down * 0.5f, checkSize * Vector2.right)) {
                 float heightInTiles = Mathf.Floor(hitboxes[0].size.y * transform.lossyScale.y * 2);
                 transform.position = body.position = new(body.position.x, Mathf.Floor(body.position.y * 2 - heightInTiles - 1) / 2);
             }

diff --git a/Assets/Scripts/Utils.cs b/Assets/Scripts/Utils.cs
@@ -109,6 +109,8 @@ public static bool IsAnyTileSolidBetweenWorldBox(Vector2 checkPosition, Vector2
         Vector3Int minPos = WorldToTilemapPosition(checkPosition - (checkSize / 2), wrap: false);
         Vector3Int size = WorldToTilemapPosition(checkPosition + (checkSize / 2), wrap: false) - minPos;
 
+        Debug.Log("size" + size);
+
         for (int x = 0; x <= size.x; x++) {
             for (int y = 0; y <= size.y; y++) {
 

diff --git a/Assets/Sprites/Atlases/Terrain/Atlas.spriteatlas b/Assets/Sprites/Atlases/Terrain/Atlas.spriteatlas
@@ -476,9 +476,13 @@ SpriteAtlas:
   - {fileID: -2940530314470319842, guid: 0370724d18844184d950a518e4daf31d, type: 3}
   - {fileID: 3036753812775530641, guid: 0370724d18844184d950a518e4daf31d, type: 3}
   - {fileID: 1433433934713897156, guid: 0370724d18844184d950a518e4daf31d, type: 3}
+  - {fileID: -1848089947, guid: 0370724d18844184d950a518e4daf31d, type: 3}
   - {fileID: 4994258414075552032, guid: 0370724d18844184d950a518e4daf31d, type: 3}
+  - {fileID: -2103662274, guid: 0370724d18844184d950a518e4daf31d, type: 3}
   - {fileID: 2763954904775634219, guid: 0370724d18844184d950a518e4daf31d, type: 3}
+  - {fileID: 1669150104, guid: 0370724d18844184d950a518e4daf31d, type: 3}
   - {fileID: 6594603699599502552, guid: 0370724d18844184d950a518e4daf31d, type: 3}
+  - {fileID: 1038974077, guid: 0370724d18844184d950a518e4daf31d, type: 3}
   - {fileID: -1082198178173625565, guid: 0370724d18844184d950a518e4daf31d, type: 3}
   - {fileID: 3661830941288844219, guid: 0370724d18844184d950a518e4daf31d, type: 3}
   - {fileID: -766508114, guid: 0370724d18844184d950a518e4daf31d, type: 3}
@@ -1022,9 +1026,13 @@ SpriteAtlas:
   - clown_5
   - clown_4
   - clown_3
+  - bonus_21
   - clown_2
+  - bonus_20
   - clown_1
+  - bonus_23
   - clown_0
+  - bonus_22
   - clown_9
   - clown_8
   - bonus_10

diff --git a/Assets/Sprites/Atlases/Terrain/bonus.png.meta b/Assets/Sprites/Atlases/Terrain/bonus.png.meta
diff --git a/Assets/Sprites/Background/bonus-2.png b/Assets/Sprites/Background/bonus-2.png