From f6b6e99b3870bfc331562734c21c94f16cf97ea2 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 28 Apr 2019 01:34:30 +0200 Subject: [PATCH] FInal stuff --- Assets/Editor/CustomAttributeDrawers.cs | 2 +- Assets/Prefabs/GameController.prefab | 25 ++-- Assets/Prefabs/Tile.prefab | 6 +- Assets/Scenes/Steffo.unity | 132 +++++++++++++++++++ Assets/Scripts/AISlime.cs | 2 + Assets/Scripts/Map.cs | 64 ++++++--- Assets/Scripts/Map.cs.meta | 10 +- Assets/Sprites/PurpleWall.png.meta | 24 +++- Assets/Sprites/PurpleWall_BOT.png.meta | 24 +++- Assets/Sprites/PurpleWall_BOT2.png.meta | 24 +++- Assets/Sprites/PurpleWall_BOTL.png.meta | 24 +++- Assets/Sprites/PurpleWall_BOTR.png.meta | 24 +++- Assets/Sprites/PurpleWall_BOTSteffo.png | 3 + Assets/Sprites/PurpleWall_BOTSteffo.png.meta | 112 ++++++++++++++++ Assets/Sprites/PurpleWall_LEFT.png.meta | 28 +++- Assets/Sprites/PurpleWall_RIGHT.png.meta | 28 +++- Assets/Sprites/PurpleWall_UP.png.meta | 24 +++- Assets/Sprites/PurpleWall_UP2.png.meta | 24 +++- Assets/Sprites/PurpleWall_UPL.png.meta | 24 +++- Assets/Sprites/PurpleWall_UPR.png.meta | 24 +++- 20 files changed, 573 insertions(+), 55 deletions(-) create mode 100644 Assets/Sprites/PurpleWall_BOTSteffo.png create mode 100644 Assets/Sprites/PurpleWall_BOTSteffo.png.meta diff --git a/Assets/Editor/CustomAttributeDrawers.cs b/Assets/Editor/CustomAttributeDrawers.cs index babc351..e775865 100644 --- a/Assets/Editor/CustomAttributeDrawers.cs +++ b/Assets/Editor/CustomAttributeDrawers.cs @@ -36,4 +36,4 @@ public class AfterStartAttributeDrawer : PropertyDrawer EditorGUI.PropertyField(position, property, label, true); GUI.enabled = true; } -} \ No newline at end of file +} diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab index f6050a5..bd412a4 100644 --- a/Assets/Prefabs/GameController.prefab +++ b/Assets/Prefabs/GameController.prefab @@ -80,20 +80,23 @@ MonoBehaviour: minRoomSize: 2 maxRoomSize: 8 maxRoomIterations: 100 - wallSprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} floorSprites: - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, type: 3} + topWallSprites: + - {fileID: 21300000, guid: a6548c20c0b36384f9ba55aac5cd513d, type: 3} + - {fileID: 21300000, guid: de53d30fbdcfc2e458577832376fddc7, type: 3} + botWallSprites: + - {fileID: 21300000, guid: 9c493dd4f06f0e6448ca0485a0aec85b, type: 3} + - {fileID: 21300000, guid: 9f7113f83f58bbc4b80539190bfc99b8, type: 3} + leftWallSprites: + - {fileID: 21300000, guid: 1c1ab193bd23fde40a1d3400075ccd26, type: 3} + rightWallSprites: + - {fileID: 21300000, guid: 47816dfcc9e4290499aa0189a04a5560, type: 3} + lCornerWallSprites: + - {fileID: 21300000, guid: 1f464248b697d4b459679fd8c4215983, type: 3} + rCornerWallSprites: + - {fileID: 21300000, guid: 424d116bfc9d297468486f10739cb1b3, type: 3} tilePrefab: {fileID: 2955896503201886234, guid: 0e0b618b5499bbb40b076c0291d55487, type: 3} playerPrefab: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, diff --git a/Assets/Prefabs/Tile.prefab b/Assets/Prefabs/Tile.prefab index 605ed80..0034f5e 100644 --- a/Assets/Prefabs/Tile.prefab +++ b/Assets/Prefabs/Tile.prefab @@ -46,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: walkable: 0 roomPart: 0 - sprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} + sprite: {fileID: 0} --- !u!212 &4218371391286436838 SpriteRenderer: m_ObjectHideFlags: 0 @@ -84,7 +84,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} + m_Sprite: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -92,6 +92,6 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 diff --git a/Assets/Scenes/Steffo.unity b/Assets/Scenes/Steffo.unity index ed248a3..1df960c 100644 --- a/Assets/Scenes/Steffo.unity +++ b/Assets/Scenes/Steffo.unity @@ -187,5 +187,137 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: leftWallSprites.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: rightWallSprites.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: topWallSprites.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: lCornerWallSprites.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: rCornerWallSprites.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: botWallSprites.Array.size + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.size + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: rightWallSprites.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: leftWallSprites.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: lCornerWallSprites.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: rCornerWallSprites.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: topWallSprites.Array.data[0] + value: + objectReference: {fileID: 0} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: topWallSprites.Array.data[1] + value: + objectReference: {fileID: 21300000, guid: de53d30fbdcfc2e458577832376fddc7, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: botWallSprites.Array.data[0] + value: + objectReference: {fileID: 21300000, guid: 82ccea6ce8f2edf4cae6f99e1127b0c3, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[0] + value: + objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[1] + value: + objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[2] + value: + objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[3] + value: + objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[4] + value: + objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[5] + value: + objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[6] + value: + objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[7] + value: + objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[8] + value: + objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, + type: 3} + - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: floorSprites.Array.data[9] + value: + objectReference: {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} diff --git a/Assets/Scripts/AISlime.cs b/Assets/Scripts/AISlime.cs index 88bf0ca..85306a3 100644 --- a/Assets/Scripts/AISlime.cs +++ b/Assets/Scripts/AISlime.cs @@ -4,6 +4,7 @@ using UnityEngine; public class AISlime : AI { + public float moveChance = 0.5f; public float visionRange = 4; protected Player player; @@ -13,6 +14,7 @@ public class AISlime : AI } public override void OnTurn(){ + if(Random.Range(0f, 1f) < moveChance) return; if (CanSeePlayer()){ Vector2Int distance = player.MapPosition - MapPosition; if (distance.x < 0 && map.CanMoveTo(MapPosition + Vector2Int.left)){ diff --git a/Assets/Scripts/Map.cs b/Assets/Scripts/Map.cs index f8eaa52..4d21307 100644 --- a/Assets/Scripts/Map.cs +++ b/Assets/Scripts/Map.cs @@ -88,10 +88,25 @@ public class Map : MonoBehaviour public int maxRoomIterations = 100; [BeforeStartAttribute] - public Sprite wallSprite; + public List floorSprites; [BeforeStartAttribute] - public List floorSprites; + public List topWallSprites; + + [BeforeStartAttribute] + public List botWallSprites; + + [BeforeStartAttribute] + public List leftWallSprites; + + [BeforeStartAttribute] + public List rightWallSprites; + + [BeforeStartAttribute] + public List lCornerWallSprites; + + [BeforeStartAttribute] + public List rCornerWallSprites; [BeforeStartAttribute] public GameObject tilePrefab; @@ -110,8 +125,13 @@ public class Map : MonoBehaviour private TurnHandler turnHandler; public Tile GetTile(Vector2Int position) { - GameObject tileObject = tiles[position.x, position.y]; - return tileObject.GetComponent(); + try { + GameObject tileObject = tiles[position.x, position.y]; + return tileObject.GetComponent(); + } + catch(System.IndexOutOfRangeException) { + return null; + } } public bool CanMoveTo(Vector2Int position) @@ -126,10 +146,9 @@ public class Map : MonoBehaviour } } - private void InitTile(Vector2Int position, bool walkable, Sprite tileSprite, bool roomPart) { + private void EditTile(Vector2Int position, bool walkable, bool roomPart) { Tile tile = GetTile(position); tile.walkable = walkable; - tile.sprite = tileSprite; tile.roomPart |= roomPart; } @@ -142,7 +161,6 @@ public class Map : MonoBehaviour tileObject.name = "Tile [" + x.ToString() + ", " + y.ToString() + "]"; Tile tile = tileObject.GetComponent(); tile.walkable = false; - tile.sprite = wallSprite; } } } @@ -150,7 +168,7 @@ public class Map : MonoBehaviour private void PlaceRoom(MapRoom mr) { for(int x = mr.start.x; x <= mr.end.x; x++) { for(int y = mr.start.y; y <= mr.end.y; y++) { - InitTile(new Vector2Int(x, y), true, GetFloorTileSprite(), true); + EditTile(new Vector2Int(x, y), true, true); } } } @@ -169,17 +187,17 @@ public class Map : MonoBehaviour private void PlaceCorridor(MapCorridor mc) { Vector2Int cursor = new Vector2Int(mc.start.x, mc.start.y); - InitTile(cursor, true, GetFloorTileSprite(), false); + EditTile(cursor, true, false); if(mc.horizontal_priority) { while(cursor.x != mc.end.x) { if(cursor.x > mc.end.x) cursor.x--; else cursor.x++; - InitTile(cursor, true, GetFloorTileSprite(), false); + EditTile(cursor, true, false); } while(cursor.y != mc.end.y) { if(cursor.y > mc.end.y) cursor.y--; else cursor.y++; - InitTile(cursor, true, GetFloorTileSprite(), false); + EditTile(cursor, true, false); } } else @@ -187,12 +205,12 @@ public class Map : MonoBehaviour while(cursor.y != mc.end.y) { if(cursor.y > mc.end.y) cursor.y--; else cursor.y++; - InitTile(cursor, true, GetFloorTileSprite(), false); + EditTile(cursor, true, false); } while(cursor.x != mc.end.x) { if(cursor.x > mc.end.x) cursor.x--; else cursor.x++; - InitTile(cursor, true, GetFloorTileSprite(), false); + EditTile(cursor, true, false); } } } @@ -241,8 +259,21 @@ public class Map : MonoBehaviour } } - private Sprite GetFloorTileSprite() { - return floorSprites[Random.Range(0, floorSprites.Count)]; + public static Sprite SampleSprite(List list) { + return list[Random.Range(0, list.Count)]; + } + + public void GenerateTileSprites() { + for(int x = 0; x < mapSize; x++) { + for(int y = 0; y < mapSize; y++) { + Tile tile = GetTile(new Vector2Int(x, y)); + Tile otherTile; + if(tile.walkable) tile.sprite = SampleSprite(floorSprites); + else if((bool)(otherTile = GetTile(new Vector2Int(x, y+1))) && otherTile.walkable) tile.sprite = SampleSprite(botWallSprites); + else if((bool)(otherTile = GetTile(new Vector2Int(x, y+1))) && otherTile.walkable) tile.sprite = SampleSprite(topWallSprites); + //TODO: corners + } + } } private void Start() @@ -252,7 +283,8 @@ public class Map : MonoBehaviour rooms = new List(); turnHandler = GameObject.FindGameObjectWithTag("GameController").GetComponentInChildren(); - GenerateMap(); + GenerateMap(); + GenerateTileSprites(); PlacePlayer(); PlaceEnemies(); } diff --git a/Assets/Scripts/Map.cs.meta b/Assets/Scripts/Map.cs.meta index bc948b5..659896b 100644 --- a/Assets/Scripts/Map.cs.meta +++ b/Assets/Scripts/Map.cs.meta @@ -3,16 +3,8 @@ guid: 052bc569472779a429bfc51246f723d4 MonoImporter: externalObjects: {} serializedVersion: 2 - defaultReferences: - - wallSprite: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - roomSprite: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - corridorSprite: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - - tilePrefab: {instanceID: 0} -<<<<<<< HEAD - executionOrder: -50 -======= + defaultReferences: [] executionOrder: 0 ->>>>>>> parent of bc79745... Revert "Merge branch 'master' of https://github.com/Steffo99/LD44" icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Sprites/PurpleWall.png.meta b/Assets/Sprites/PurpleWall.png.meta index 8e14f40..0b247f6 100644 --- a/Assets/Sprites/PurpleWall.png.meta +++ b/Assets/Sprites/PurpleWall.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_BOT.png.meta b/Assets/Sprites/PurpleWall_BOT.png.meta index 4dc05e3..9534277 100644 --- a/Assets/Sprites/PurpleWall_BOT.png.meta +++ b/Assets/Sprites/PurpleWall_BOT.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_BOT2.png.meta b/Assets/Sprites/PurpleWall_BOT2.png.meta index 9edc4d5..bdb9313 100644 --- a/Assets/Sprites/PurpleWall_BOT2.png.meta +++ b/Assets/Sprites/PurpleWall_BOT2.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_BOTL.png.meta b/Assets/Sprites/PurpleWall_BOTL.png.meta index 854131c..f6924d5 100644 --- a/Assets/Sprites/PurpleWall_BOTL.png.meta +++ b/Assets/Sprites/PurpleWall_BOTL.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_BOTR.png.meta b/Assets/Sprites/PurpleWall_BOTR.png.meta index b41bd5a..9ad0d81 100644 --- a/Assets/Sprites/PurpleWall_BOTR.png.meta +++ b/Assets/Sprites/PurpleWall_BOTR.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_BOTSteffo.png b/Assets/Sprites/PurpleWall_BOTSteffo.png new file mode 100644 index 0000000..0207e74 --- /dev/null +++ b/Assets/Sprites/PurpleWall_BOTSteffo.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f61450e06a483e7668752befac16b0ea438d8fc30d5f504f0ab7c30f1e74179a +size 6696 diff --git a/Assets/Sprites/PurpleWall_BOTSteffo.png.meta b/Assets/Sprites/PurpleWall_BOTSteffo.png.meta new file mode 100644 index 0000000..1f4dbb5 --- /dev/null +++ b/Assets/Sprites/PurpleWall_BOTSteffo.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 82ccea6ce8f2edf4cae6f99e1127b0c3 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 40 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 0f8138afcfde78b4dae0dbc24fad0adc + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/PurpleWall_LEFT.png.meta b/Assets/Sprites/PurpleWall_LEFT.png.meta index 51a5df4..085a82b 100644 --- a/Assets/Sprites/PurpleWall_LEFT.png.meta +++ b/Assets/Sprites/PurpleWall_LEFT.png.meta @@ -43,9 +43,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + alignment: 9 + spritePivot: {x: 0, y: 0.5} + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_RIGHT.png.meta b/Assets/Sprites/PurpleWall_RIGHT.png.meta index 201a1bf..2f6a973 100644 --- a/Assets/Sprites/PurpleWall_RIGHT.png.meta +++ b/Assets/Sprites/PurpleWall_RIGHT.png.meta @@ -43,9 +43,9 @@ TextureImporter: spriteMode: 1 spriteExtrude: 1 spriteMeshType: 1 - alignment: 0 - spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + alignment: 9 + spritePivot: {x: 1, y: 0.5} + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_UP.png.meta b/Assets/Sprites/PurpleWall_UP.png.meta index 83250bf..c27a2af 100644 --- a/Assets/Sprites/PurpleWall_UP.png.meta +++ b/Assets/Sprites/PurpleWall_UP.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_UP2.png.meta b/Assets/Sprites/PurpleWall_UP2.png.meta index af640f1..96c6eb9 100644 --- a/Assets/Sprites/PurpleWall_UP2.png.meta +++ b/Assets/Sprites/PurpleWall_UP2.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_UPL.png.meta b/Assets/Sprites/PurpleWall_UPL.png.meta index 1f8a372..bf4dc99 100644 --- a/Assets/Sprites/PurpleWall_UPL.png.meta +++ b/Assets/Sprites/PurpleWall_UPL.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/PurpleWall_UPR.png.meta b/Assets/Sprites/PurpleWall_UPR.png.meta index 2e8b2fe..b86fc61 100644 --- a/Assets/Sprites/PurpleWall_UPR.png.meta +++ b/Assets/Sprites/PurpleWall_UPR.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: []