diff --git a/MrBigsock/Assets/Code/FollowPlayer.cs b/MrBigsock/Assets/Code/FollowPlayer.cs index 6f178e01850ac03da8d9eb4807a5fa1507a04488..89d4fe1efdecc0d0d6a6b9b3a6b9697ef787f59a 100644 --- a/MrBigsock/Assets/Code/FollowPlayer.cs +++ b/MrBigsock/Assets/Code/FollowPlayer.cs @@ -1,9 +1,7 @@ -using System.Collections; using System.Collections.Generic; +using BigSock.Interact; using Cinemachine; using UnityEngine; -using UnityEngine.Tilemaps; -using static System.Net.WebRequestMethods; namespace Bigsock @@ -15,27 +13,103 @@ namespace Bigsock [SerializeField] private CinemachineConfiner2D cameraMap; + private int levels = 1; + + Vector3 offset = new Vector3(0, 0, -10); int i = 0; + GameObject[] boss; + GameObject player; + GameObject[] enemies; + GameObject[] Chest; + List<GameObject> chests; + GameObject stair; + private int roomNr = 0; + bool stairs_down; void Start() { + chests = new List<GameObject>(); neighborMapGenerator.RunProceduralGeneration(); - + player = GameObject.Find("BigSock"); + stair = GameObject.Find("Stairs(Clone)"); + Chest = GameObject.FindGameObjectsWithTag("Chest"); + foreach(GameObject c in Chest) + { + chests.Add(c); + c.SetActive(false); + } + stairs_down = stair.GetComponent<Stairs>().stairs_touch; + stair.SetActive(false); } void LateUpdate() { + boss = GameObject.FindGameObjectsWithTag("Boss"); + enemies = GameObject.FindGameObjectsWithTag((roomNr).ToString()); + if (boss.Length == 0 && levels <= 1) + { + stair.SetActive(true); + stairs_down = stair.GetComponent<Stairs>().stairs_touch; + } + + + if (stairs_down) + { + roomNr = 0; + foreach(GameObject c in chests) + { + DestroyImmediate(c); + } + DestroyImmediate(stair); + chests.Clear(); + TilemapGenerator.resetMaps(); + TilemapGenerator.SetRoomIDZero(); + player.transform.position = new Vector3(9,5,0); + neighborMapGenerator.RunProceduralGeneration(); + Chest = GameObject.FindGameObjectsWithTag("Chest"); + stair = GameObject.Find("Stairs(Clone)"); + stairs_down = stair.GetComponent<Stairs>().stairs_touch; + foreach (GameObject c in Chest) + { + if(c != null) + { + c.SetActive(false); + chests.Add(c); + } + } + stair.SetActive(false); + levels++; + } + int i = 0; if(i == 0) { cameraMap.InvalidateCache(); - i++; + } + + if (enemies.Length == 0) + { + chests[roomNr].SetActive(true); + if(roomNr + 1 < NeighbourMapGenerator.GetRoomListCount() - 1) + { + roomNr++; + } + } + if(boss.Length == 0) + { + chests[1 + roomNr].SetActive(true); } } private void OnDestroy() { + roomNr = 0; + foreach (GameObject c in chests) + { + DestroyImmediate(c); + } + DestroyImmediate(stair); NeighbourMapGenerator.ClearRoomList(); TilemapGenerator.SetRoomIDZero(); TilemapGenerator.resetMaps(); diff --git a/MrBigsock/Assets/Code/InteractionSystem/Door.cs b/MrBigsock/Assets/Code/InteractionSystem/Door.cs index 7ce964c2d521220b255d6fb35c7f625b237a1ec8..604867d67d80a89a257da3b9e9406e3f34718f51 100644 --- a/MrBigsock/Assets/Code/InteractionSystem/Door.cs +++ b/MrBigsock/Assets/Code/InteractionSystem/Door.cs @@ -14,6 +14,7 @@ namespace BigSock.Interact { private GameObject cameraPlayer; private int i = TilemapGenerator.NextRoom(); private GameObject boundary; + GameObject door; public string InteractionPrompt => _prompt; @@ -30,6 +31,8 @@ namespace BigSock.Interact { player.transform.position = TilemapGenerator.DoorLocaitonTransport(i); cameraPlayer.transform.position = player.transform.position; boundary.GetComponent<PolygonCollider2D>().SetPath(0, TilemapGenerator.GetRoomBoundary(i)); + door = GameObject.Find("ClosedDoor(Clone)"); + Destroy(door); return true; } return false; diff --git a/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs b/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs new file mode 100644 index 0000000000000000000000000000000000000000..01e072dd33da97f370fd8c47f28406fbcc1fb51f --- /dev/null +++ b/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs @@ -0,0 +1,27 @@ +using Bigsock; +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + + +namespace BigSock.Interact +{ + public class Stairs : MonoBehaviour, IInteractable + { + [SerializeField] private string _prompt; + + public string InteractionPrompt => _prompt; + public bool stairs_touch = false; + + public bool Interact(Interactor interactor) + { + if (!stairs_touch) + { + stairs_touch = true; + return true; + } + return false; + } + } +} \ No newline at end of file diff --git a/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs.meta b/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..bf55bda4e1810be17367da03997d49bfc595c242 --- /dev/null +++ b/MrBigsock/Assets/Code/InteractionSystem/Stairs.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 4a3905e3d079fb64ca71936a1caba90d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Code/Map/NeighbourMapGenerator.cs b/MrBigsock/Assets/Code/Map/NeighbourMapGenerator.cs index 4dd6c90bdac929e4453f94ccc989b3e1aaf61758..5d253d85c9d62cd28567c0ef6a403907c1eca628 100644 --- a/MrBigsock/Assets/Code/Map/NeighbourMapGenerator.cs +++ b/MrBigsock/Assets/Code/Map/NeighbourMapGenerator.cs @@ -1,5 +1,6 @@ using System.Collections; using System.Collections.Generic; +using System.Security.Cryptography; using UnityEngine; namespace Bigsock @@ -15,7 +16,7 @@ namespace Bigsock public override void RunProceduralGeneration() { roomList.Clear(); - + for (int i = 0; i <= RoomCount - 1; i++) { int randomMap = Random.Range(0, mapParam.Length); @@ -29,6 +30,7 @@ namespace Bigsock roomList.Add(bossMap); tilemapGenerator.RenderMap(roomList[roomList.Count - 1],roomList.Count - 1, true); tilemapGenerator.SpawnBoss(bossMap, roomList.Count - 1); + tilemapGenerator.SpawnStairs(bossMap, roomList.Count - 1); tilemapGenerator.polyCollider(roomList[0], 0); } diff --git a/MrBigsock/Assets/Code/Map/TilemapGenerator.cs b/MrBigsock/Assets/Code/Map/TilemapGenerator.cs index 7b73c7854c6df828f07d11d25385096eacb83005..2cf2f94ae1492154d936bf6f5ab712056464fe69 100644 --- a/MrBigsock/Assets/Code/Map/TilemapGenerator.cs +++ b/MrBigsock/Assets/Code/Map/TilemapGenerator.cs @@ -15,6 +15,8 @@ namespace Bigsock [SerializeField] GameObject Door; [SerializeField] GameObject[] Enemy; [SerializeField] GameObject Boss; + [SerializeField] GameObject Stairs; + [SerializeField] GameObject Chest; private int z_value = 0; private static int roomID = 0; @@ -197,6 +199,7 @@ namespace Bigsock fast++; } } + spawnChest(map, roomNr); SetMapBoundary(map, roomNr); } @@ -232,7 +235,7 @@ namespace Bigsock } public static void SetRoomIDZero() { - roomID = 0; + roomID = 1; } public static void resetMaps() @@ -349,5 +352,19 @@ namespace Bigsock WallTop[roomNr].ClearAllTiles(); } } + + public void SpawnStairs(int[,] bossRoom, int roomNr) + { + Instantiate(Stairs, new Vector3(FloorTilemap[roomNr].transform.position.x + bossRoom.GetUpperBound(0) / 2 + 0.5f, + FloorTilemap[roomNr].transform.position.y + bossRoom.GetUpperBound(1) - 3 + 0.5f, 0), Quaternion.identity); + } + + //Spawns a chest in the middle of the room + public void spawnChest(int[,] room, int roomNr) + { + Chest.tag = "Chest"; + Instantiate(Chest, new Vector3(FloorTilemap[roomNr].transform.position.x + room.GetUpperBound(0) / 2, + FloorTilemap[roomNr].transform.position.y + room.GetUpperBound(1) / 2, 0), Quaternion.identity); + } } } \ No newline at end of file diff --git a/MrBigsock/Assets/Code/UI/ChestDisplay.cs b/MrBigsock/Assets/Code/UI/ChestDisplay.cs index 08839c01ca39303e745b4b76bcb3824ce0db5a72..b28b01df071351a9de5399016680f56541451aa6 100644 --- a/MrBigsock/Assets/Code/UI/ChestDisplay.cs +++ b/MrBigsock/Assets/Code/UI/ChestDisplay.cs @@ -28,7 +28,8 @@ namespace BigSock.UI { // Gets button gameobjects and adds onClick listener for (int i = 0; i < 3; i++) { var button = itemButtonLocation.transform.Find("ButtonItem"+(i+1).ToString()).GetComponent<Button>(); - button.onClick.AddListener(delegate {ItemPicked(i); }); + int j = i; + button.onClick.AddListener(delegate {ItemPicked(j); }); buttons.Add(button); } diff --git a/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab b/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab new file mode 100644 index 0000000000000000000000000000000000000000..1bc17042bbfe6b90961a24c896824801c2bdf028 --- /dev/null +++ b/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab @@ -0,0 +1,127 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4409019817617405666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8860318727928166917} + - component: {fileID: -6422210887197446182} + - component: {fileID: 1254199348833719201} + - component: {fileID: 4770025611691691476} + m_Layer: 11 + m_Name: Stairs + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8860318727928166917 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4409019817617405666} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.49, y: -0.45, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &-6422210887197446182 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4409019817617405666} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4a3905e3d079fb64ca71936a1caba90d, type: 3} + m_Name: + m_EditorClassIdentifier: + _prompt: +--- !u!212 &1254199348833719201 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4409019817617405666} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 2090772569, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &4770025611691691476 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4409019817617405666} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 diff --git a/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab.meta b/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab.meta new file mode 100644 index 0000000000000000000000000000000000000000..d8093fc229333f7d87a5bf753c8d4f8d4a2f193d --- /dev/null +++ b/MrBigsock/Assets/Prefabs/MapObjects/Stairs.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b4bdc0b7e656c1c498446d9f7bcda837 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/orc_warrior/bow/Bow and Arrows.png.meta b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/orc_warrior/bow/Bow and Arrows.png.meta index 7cc7910d2e591ec3651f0a0e12ce6f83339645c2..76610ac4135a39ce5fbd472f3f870aa5e7151721 100644 --- a/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/orc_warrior/bow/Bow and Arrows.png.meta +++ b/MrBigsock/Assets/Resources/Sprites/Enemy/Animations/orc_warrior/bow/Bow and Arrows.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 diff --git a/MrBigsock/Assets/Resources/Sprites/Enemy/Enemy_sprites/Archer Skeleton.png.meta b/MrBigsock/Assets/Resources/Sprites/Enemy/Enemy_sprites/Archer Skeleton.png.meta index 7e32f60d2eaa0f2c41431811e38a88bbab754416..5d0b346a44426c4e76affe0126d3527fe0062506 100644 --- a/MrBigsock/Assets/Resources/Sprites/Enemy/Enemy_sprites/Archer Skeleton.png.meta +++ b/MrBigsock/Assets/Resources/Sprites/Enemy/Enemy_sprites/Archer Skeleton.png.meta @@ -33,7 +33,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: 1 + filterMode: 0 aniso: 1 mipBias: 0 wrapU: 1 diff --git a/MrBigsock/Assets/Resources/Sprites/Item/coffee.png b/MrBigsock/Assets/Resources/Sprites/Item/coffee.png new file mode 100644 index 0000000000000000000000000000000000000000..26efebd6050b64dad3a5402e82b86bc350c31ec3 Binary files /dev/null and b/MrBigsock/Assets/Resources/Sprites/Item/coffee.png differ diff --git a/MrBigsock/Assets/Resources/Sprites/Item/coffee.png.meta b/MrBigsock/Assets/Resources/Sprites/Item/coffee.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..47e4f1ed5915ee8f299e6f54c7aeaa34bffa1fb3 --- /dev/null +++ b/MrBigsock/Assets/Resources/Sprites/Item/coffee.png.meta @@ -0,0 +1,145 @@ +fileFormatVersion: 2 +guid: 8f2199ff336579b40a72e81b29a26ea2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: coffee_0 + rect: + serializedVersion: 2 + x: 107 + y: 0 + width: 19 + height: 19 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 0863da5608d79a242839f94c1263717b + internalID: -1441320517 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + coffee_0: -1441320517 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Resources/Sprites/Item/elixirofspeed.png b/MrBigsock/Assets/Resources/Sprites/Item/elixirofspeed.png new file mode 100644 index 0000000000000000000000000000000000000000..68d21865ceb654d2fa2aa14920126573a3eabfbf Binary files /dev/null and b/MrBigsock/Assets/Resources/Sprites/Item/elixirofspeed.png differ diff --git a/MrBigsock/Assets/Resources/Sprites/Item/elixirofspeed.png.meta b/MrBigsock/Assets/Resources/Sprites/Item/elixirofspeed.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..4a70b5a6cc90f9fa47a13e70228312fa8d01947d --- /dev/null +++ b/MrBigsock/Assets/Resources/Sprites/Item/elixirofspeed.png.meta @@ -0,0 +1,169 @@ +fileFormatVersion: 2 +guid: 97451641256620a45a7d902a82eb7d58 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: chest_3 + rect: + serializedVersion: 2 + x: 48 + y: 96 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0.5, y: 0.5} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: a8e6efcf64d196846befa21a2890a76a + internalID: -1310151336 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + chest_18: 76109953 + chest_7: -866377811 + chest_0: 1856409934 + chest_21: 1005141044 + chest_22: -240853165 + chest_3: -1310151336 + chest_10: -1593485246 + chest_24: 746258729 + chest_15: 769776556 + chest_16: 453606183 + chest_13: 447216546 + chest_8: 992366502 + chest_19: -239743868 + chest_20: 617207669 + chest_23: 1205359815 + chest_5: 107204761 + chest_14: -1476513711 + chest_6: -1448534554 + chest_1: -698650373 + chest_17: 2077912087 + chest_11: -407677634 + chest_12: 407419430 + chest_9: -348577375 + chest_4: 1342639699 + chest_2: 616990432 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Resources/Sprites/Item/foureyes.png b/MrBigsock/Assets/Resources/Sprites/Item/foureyes.png new file mode 100644 index 0000000000000000000000000000000000000000..c03777e230ef0acdd5aff430589ab747876ac71c Binary files /dev/null and b/MrBigsock/Assets/Resources/Sprites/Item/foureyes.png differ diff --git a/MrBigsock/Assets/Resources/Sprites/Item/foureyes.png.meta b/MrBigsock/Assets/Resources/Sprites/Item/foureyes.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..d7dd68d65620a0abf54127c6be5dc59b0412a783 --- /dev/null +++ b/MrBigsock/Assets/Resources/Sprites/Item/foureyes.png.meta @@ -0,0 +1,145 @@ +fileFormatVersion: 2 +guid: 4b905ca6d8388824a90f45e33958838e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: foureyes_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 655dd3560a03ef64c900ab4b5296b0ff + internalID: 880566551 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + foureyes_0: 880566551 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Resources/Sprites/Item/lunch.png b/MrBigsock/Assets/Resources/Sprites/Item/lunch.png new file mode 100644 index 0000000000000000000000000000000000000000..0d100f6b10d3a25f45b54a64b9605c93a088686b Binary files /dev/null and b/MrBigsock/Assets/Resources/Sprites/Item/lunch.png differ diff --git a/MrBigsock/Assets/Resources/Sprites/Item/lunch.png.meta b/MrBigsock/Assets/Resources/Sprites/Item/lunch.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..eb415963bfe62e3192fa06b4f06e148af4118dcd --- /dev/null +++ b/MrBigsock/Assets/Resources/Sprites/Item/lunch.png.meta @@ -0,0 +1,145 @@ +fileFormatVersion: 2 +guid: 5ac1bfe01a62be74b976428bfe896e94 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: Foods_0 + rect: + serializedVersion: 2 + x: 0 + y: 16 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: fb88e420bb13c6843ace33311ea9078b + internalID: -1040748114 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + Foods_0: -1040748114 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Resources/Sprites/Item/plasticstraw.png b/MrBigsock/Assets/Resources/Sprites/Item/plasticstraw.png new file mode 100644 index 0000000000000000000000000000000000000000..4672611ce60f5cd96cb2750c6e824c4d0bfa6a29 Binary files /dev/null and b/MrBigsock/Assets/Resources/Sprites/Item/plasticstraw.png differ diff --git a/MrBigsock/Assets/Resources/Sprites/Item/plasticstraw.png.meta b/MrBigsock/Assets/Resources/Sprites/Item/plasticstraw.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..c94b183228e1c5fbcfa6b5a48c92264d3a1c3466 --- /dev/null +++ b/MrBigsock/Assets/Resources/Sprites/Item/plasticstraw.png.meta @@ -0,0 +1,145 @@ +fileFormatVersion: 2 +guid: 26f37d49585023b4cb888e18fbe8eddf +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: plasticstraw_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 39fca3deafd0a034ba4fe84a71ab7542 + internalID: -530846067 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + plasticstraw_0: -530846067 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Resources/Sprites/Item/premature.png b/MrBigsock/Assets/Resources/Sprites/Item/premature.png new file mode 100644 index 0000000000000000000000000000000000000000..3742c3153d2ba3bbd2e09271cd1f29d3ce4ff096 Binary files /dev/null and b/MrBigsock/Assets/Resources/Sprites/Item/premature.png differ diff --git a/MrBigsock/Assets/Resources/Sprites/Item/premature.png.meta b/MrBigsock/Assets/Resources/Sprites/Item/premature.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..cb94e1ae7d108b1dd71d0d59bd449b36e164967a --- /dev/null +++ b/MrBigsock/Assets/Resources/Sprites/Item/premature.png.meta @@ -0,0 +1,145 @@ +fileFormatVersion: 2 +guid: e40e526a01f47224ebd72e2d4b93a59d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: premature_0 + rect: + serializedVersion: 2 + x: 0 + y: 0 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 94ea58ade1ddd8941ba524448c42eeb2 + internalID: -1092222898 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + premature_0: -1092222898 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Resources/Sprites/Item/runningshoes.png b/MrBigsock/Assets/Resources/Sprites/Item/runningshoes.png new file mode 100644 index 0000000000000000000000000000000000000000..2cef32f127845b17b4ac5214e244bf9e35d1014a Binary files /dev/null and b/MrBigsock/Assets/Resources/Sprites/Item/runningshoes.png differ diff --git a/MrBigsock/Assets/Resources/Sprites/Item/runningshoes.png.meta b/MrBigsock/Assets/Resources/Sprites/Item/runningshoes.png.meta new file mode 100644 index 0000000000000000000000000000000000000000..6ecd8363f5e9352dc63f4a689d4fb00af16f20b8 --- /dev/null +++ b/MrBigsock/Assets/Resources/Sprites/Item/runningshoes.png.meta @@ -0,0 +1,145 @@ +fileFormatVersion: 2 +guid: ad70dad86bef68d4b9c5d007b9ffd2c8 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 0 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 16 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: runningshoes_0 + rect: + serializedVersion: 2 + x: 80 + y: 80 + width: 16 + height: 16 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + outline: [] + physicsShape: [] + tessellationDetail: 0 + bones: [] + spriteID: 8f66359af190951498370cfeb429db4c + internalID: -2008356127 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: + runningshoes_0: -2008356127 + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Resources/Sprites/Item/tilesetNice.png.meta b/MrBigsock/Assets/Resources/Sprites/Item/tilesetNice.png.meta index 959418ad5c8af9a3d7ca200f06853a93b5c6f64e..15af2050fcb915ad83e2191ef195880a9829e838 100644 --- a/MrBigsock/Assets/Resources/Sprites/Item/tilesetNice.png.meta +++ b/MrBigsock/Assets/Resources/Sprites/Item/tilesetNice.png.meta @@ -581,7 +581,11 @@ TextureImporter: pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: 0, y: 4} + - {x: 0, y: -16} + - {x: 16, y: -16} + - {x: 16, y: 4} tessellationDetail: 0 bones: [] spriteID: d76be1ed7b11f6a44a42ed64755574ef @@ -602,7 +606,11 @@ TextureImporter: pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -16, y: 4} + - {x: -16, y: -16} + - {x: 16, y: -16} + - {x: 16, y: 4} tessellationDetail: 0 bones: [] spriteID: e913d1eb61c36db44b54a48ea80056d7 @@ -623,7 +631,15 @@ TextureImporter: pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -16, y: 4} + - {x: -16, y: -16} + - {x: 16, y: -16} + - {x: 16, y: 4} + - - {x: -9, y: 4} + - {x: 13, y: 4} + - {x: 13, y: -16} + - {x: -9, y: -16} tessellationDetail: 0 bones: [] spriteID: 464d7b3c235cf0f4cac86cdf34beb2f0 diff --git a/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon.png.meta b/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon.png.meta index 89add8b39d0c8ae5d35045172766b19098173265..a00350e0badb0d1b2291d4e2bb7abfd9f26c2f3d 100644 --- a/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon.png.meta +++ b/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon.png.meta @@ -113,10 +113,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} + - {x: -8, y: -4} tessellationDetail: 0 bones: [] spriteID: bc0a1787ed5cb8342bd04f794cfb2a1a @@ -134,10 +138,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} + - {x: -8, y: -4} tessellationDetail: 0 bones: [] spriteID: 68e3a54768e5ea045ac1c2dff3cab4e0 @@ -155,10 +163,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} + - {x: -8, y: -4} tessellationDetail: 0 bones: [] spriteID: f6fab432826c0d046a83e5a950ae3166 @@ -176,7 +188,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -197,7 +209,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -218,7 +230,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -239,7 +251,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -260,7 +272,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -281,7 +293,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -302,7 +314,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -323,7 +335,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -344,7 +356,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -365,7 +377,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -386,7 +398,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -407,7 +419,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -428,10 +440,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -1} + - {x: 8, y: -1} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: a4239a45296b80f4a86faf11e0e5828c @@ -449,10 +465,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -1} + - {x: 8, y: -1} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: 480dec6ec0684a348a714326de31b451 @@ -470,10 +490,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -1} + - {x: 8, y: -1} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: 495b21167f6b3fd4d922579972f1b6ab @@ -491,7 +515,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -512,7 +536,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -533,7 +557,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -554,7 +578,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -575,7 +599,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -596,7 +620,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -617,7 +641,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -638,7 +662,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -659,7 +683,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -680,10 +704,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -1} + - {x: 8, y: -1} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: c79bbfe12c65fb24696d2fa62468b4be @@ -701,10 +729,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -1} + - {x: 8, y: -1} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: cfaa11c808708be41a8227a53c94c7bb @@ -722,10 +754,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -1} + - {x: 8, y: -1} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: 4d8069dc6a9194144b8a749b36bf9362 @@ -743,7 +779,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -764,7 +800,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -785,7 +821,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -806,7 +842,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -827,7 +863,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -848,7 +884,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -869,7 +905,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -890,7 +926,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -911,7 +947,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -932,7 +968,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -953,7 +989,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -974,7 +1010,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -995,10 +1031,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: 3, y: -4} + - {x: 3, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} tessellationDetail: 0 bones: [] spriteID: 302f114cdf21bcf41bb067a33eac78ad @@ -1016,10 +1056,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -8} + - {x: -3, y: -8} + - {x: -3, y: -4} + - {x: -8, y: -4} tessellationDetail: 0 bones: [] spriteID: f76ba334a7a6333449e2755ccdcea25f @@ -1037,10 +1081,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} + - {x: -8, y: -4} tessellationDetail: 0 bones: [] spriteID: 9881fa91a8e725240b67935319713c09 @@ -1058,10 +1106,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} + - {x: -8, y: -4} tessellationDetail: 0 bones: [] spriteID: f6d97ddf698b1ac47b708682454d08a5 @@ -1079,10 +1131,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -4, y: 4} + - {x: 4, y: 4} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: 808eea3cd265fc84bbe544158a5dad0a @@ -1100,10 +1156,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -3, y: 4} + - {x: 3, y: 4} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: 730499fc0651a2347ab744a7b9eca7b8 @@ -1121,10 +1181,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: 3, y: 8} + - {x: 3, y: -8} + - {x: 8, y: -8} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: a563291a358926b45b4d66ae59d25fca @@ -1142,10 +1206,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -3, y: -8} + - {x: -3, y: 8} + - {x: -8, y: 8} + - {x: -8, y: -8} tessellationDetail: 0 bones: [] spriteID: 1e30bb0edb68627499dcd04ef9884eac @@ -1163,7 +1231,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1184,7 +1252,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1205,10 +1273,16 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: 3, y: 8} + - {x: 3, y: -4} + - {x: -8, y: -4} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: 052d5d89c450f9a42878932054a50c19 @@ -1226,10 +1300,16 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} + - {x: -3, y: -4} + - {x: -3, y: 8} tessellationDetail: 0 bones: [] spriteID: 3fea9c9692a4fc24e9a31a9ba5056ba0 @@ -1247,7 +1327,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1268,10 +1348,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: 3, y: 8} + - {x: 3, y: -8} + - {x: 8, y: -8} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: d442e7bcd1f277e44a247494fa851675 @@ -1289,10 +1373,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -3, y: -8} + - {x: -3, y: 8} + - {x: -8, y: 8} + - {x: -8, y: -8} tessellationDetail: 0 bones: [] spriteID: 15407da73b9c97443bc11a04287e0180 @@ -1310,10 +1398,16 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} + - {x: -3, y: -4} + - {x: -3, y: 8} tessellationDetail: 0 bones: [] spriteID: fd087ee39935470409472dd50b9f7410 @@ -1331,10 +1425,16 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: 3, y: 8} + - {x: 3, y: -4} + - {x: -8, y: -4} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: b255fcab2b253ef46b7d5bd54074536b @@ -1352,7 +1452,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1373,10 +1473,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: 8} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: 8} tessellationDetail: 0 bones: [] spriteID: 7a477f36df9ca9a4e9885ae8d66eac01 @@ -1394,7 +1498,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1415,7 +1519,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1436,7 +1540,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1457,10 +1561,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} + - {x: -8, y: -4} tessellationDetail: 0 bones: [] spriteID: f89aaff1ea7ccd844a0e0ba5603af8d0 @@ -1478,10 +1586,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} + - {x: -8, y: -4} tessellationDetail: 0 bones: [] spriteID: 4080ed98fd7a6354aaeb0dbc74da61d6 @@ -1499,7 +1611,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1520,7 +1632,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1541,7 +1653,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1562,7 +1674,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1583,7 +1695,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1604,7 +1716,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1625,7 +1737,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1646,7 +1758,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1667,7 +1779,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1688,7 +1800,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1709,7 +1821,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1730,7 +1842,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1751,7 +1863,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1772,10 +1884,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -4} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} tessellationDetail: 0 bones: [] spriteID: e8753b2ce8551154dac73185900a57fa @@ -1793,10 +1909,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -4} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} tessellationDetail: 0 bones: [] spriteID: 3fb64f1629d468a45a69f5f2d03e236f @@ -1814,10 +1934,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -4} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} tessellationDetail: 0 bones: [] spriteID: a8d64ec0744f3b64cac5cea0c22b25ac @@ -1835,10 +1959,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -4} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} tessellationDetail: 0 bones: [] spriteID: 1dd3af11184c04345ae15d2626c3fe5d @@ -1856,10 +1984,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -4} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} tessellationDetail: 0 bones: [] spriteID: 21233572fdc354640a8bd268ea347480 @@ -1877,10 +2009,14 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] - physicsShape: [] + physicsShape: + - - {x: -8, y: -4} + - {x: -8, y: -8} + - {x: 8, y: -8} + - {x: 8, y: -4} tessellationDetail: 0 bones: [] spriteID: 4f777125b847a264b98de302daca646e @@ -1898,7 +2034,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1919,7 +2055,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1940,7 +2076,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1961,7 +2097,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -1982,7 +2118,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -2003,7 +2139,7 @@ TextureImporter: width: 16 height: 16 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon_77.asset b/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon_77.asset index 51d53638ca4f0a4a74fe8c1fc0037a8251a9b528..8c87b285f1405a6af251d580851633d482ff0c9f 100644 --- a/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon_77.asset +++ b/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon_77.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon_78.asset b/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon_78.asset index 8ef55b27a2a0d56ac7cec9a5fea6b2a420c5d2cf..42c696ce78af7eefdbb7b812c5fdd360f13005af 100644 --- a/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon_78.asset +++ b/MrBigsock/Assets/Tilemaps/Dungeon/Dungeon_78.asset @@ -33,4 +33,4 @@ MonoBehaviour: e33: 1 m_InstancedGameObject: {fileID: 0} m_Flags: 1 - m_ColliderType: 1 + m_ColliderType: 0 diff --git a/MrBigsock/Packages/packages-lock.json b/MrBigsock/Packages/packages-lock.json index f7cc484331365fb2a4ab7d290d8a31b242212a26..3b65785c3697f050801235ccaf41b888ce87c1c2 100644 --- a/MrBigsock/Packages/packages-lock.json +++ b/MrBigsock/Packages/packages-lock.json @@ -1,11 +1,11 @@ { "dependencies": { "com.unity.2d.animation": { - "version": "7.0.7", + "version": "7.0.6", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.common": "6.0.4", + "com.unity.2d.common": "6.0.3", "com.unity.2d.sprite": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.uielements": "1.0.0" @@ -13,7 +13,7 @@ "url": "https://packages.unity.com" }, "com.unity.2d.common": { - "version": "6.0.4", + "version": "6.0.3", "depth": 2, "source": "registry", "dependencies": { @@ -39,12 +39,12 @@ "url": "https://packages.unity.com" }, "com.unity.2d.psdimporter": { - "version": "6.0.5", + "version": "6.0.4", "depth": 1, "source": "registry", "dependencies": { - "com.unity.2d.animation": "7.0.7", - "com.unity.2d.common": "6.0.4", + "com.unity.2d.animation": "7.0.6", + "com.unity.2d.common": "6.0.3", "com.unity.2d.sprite": "1.0.0" }, "url": "https://packages.unity.com" @@ -56,12 +56,12 @@ "dependencies": {} }, "com.unity.2d.spriteshape": { - "version": "7.0.6", + "version": "7.0.5", "depth": 1, "source": "registry", "dependencies": { "com.unity.mathematics": "1.1.0", - "com.unity.2d.common": "6.0.4", + "com.unity.2d.common": "6.0.3", "com.unity.2d.path": "5.0.2", "com.unity.modules.physics2d": "1.0.0" }, @@ -123,11 +123,11 @@ "depth": 0, "source": "builtin", "dependencies": { - "com.unity.2d.animation": "7.0.7", + "com.unity.2d.animation": "7.0.6", "com.unity.2d.pixel-perfect": "5.0.1", - "com.unity.2d.psdimporter": "6.0.5", + "com.unity.2d.psdimporter": "6.0.4", "com.unity.2d.sprite": "1.0.0", - "com.unity.2d.spriteshape": "7.0.6", + "com.unity.2d.spriteshape": "7.0.5", "com.unity.2d.tilemap": "1.0.0", "com.unity.2d.tilemap.extras": "2.2.3" } diff --git a/MrBigsock/ProjectSettings/ProjectVersion.txt b/MrBigsock/ProjectSettings/ProjectVersion.txt index 1f883d75385d4bf80018ea64aea70244cee1cbf4..8d9054dca680f2c8f949df23f6ccb8d193bf45ce 100644 --- a/MrBigsock/ProjectSettings/ProjectVersion.txt +++ b/MrBigsock/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.3.10f1 -m_EditorVersionWithRevision: 2021.3.10f1 (1c7d0df0160b) +m_EditorVersion: 2021.3.9f1 +m_EditorVersionWithRevision: 2021.3.9f1 (ad3870b89536) diff --git a/MrBigsock/ProjectSettings/TagManager.asset b/MrBigsock/ProjectSettings/TagManager.asset index 31a12849571026e5ca9bf16a7584f075bef6cb3f..7ae2110e3e9484fa52e6ee599da7aac9e3dec11a 100644 --- a/MrBigsock/ProjectSettings/TagManager.asset +++ b/MrBigsock/ProjectSettings/TagManager.asset @@ -11,6 +11,7 @@ TagManager: - 4 - 5 - Boss + - Chest layers: - Default - TransparentFX