diff --git a/MrBigsock/Assets/Code/InteractionSystem/Chest.cs b/MrBigsock/Assets/Code/InteractionSystem/Chest.cs index b297403bffe8a13bc849599bbe0d1a56733c4b47..6b84b7128bb36e75238852f85da74a28caab1145 100644 --- a/MrBigsock/Assets/Code/InteractionSystem/Chest.cs +++ b/MrBigsock/Assets/Code/InteractionSystem/Chest.cs @@ -5,11 +5,24 @@ using UnityEngine; public class Chest : MonoBehaviour, IInteractable { [SerializeField] private string _prompt; + [SerializeField] private Animator animator; + [SerializeField] private string goldenChestOpen = "OpeningGoldChest"; + [SerializeField] private string idleGoldChest = "Idle"; + + public SpriteRenderer spriteRenderer; + public Sprite newSprite; + + void Start() { + animator = gameObject.GetComponent<Animator>(); + } public string InteractionPrompt => _prompt; public bool Interact(Interactor interactor) { Debug.Log("Opening chest!"); + GetComponent<Animator>().Play(goldenChestOpen); + spriteRenderer.sprite = newSprite; + //animator.Play(idleGoldChest, -1, 0.0f); return true; } diff --git a/MrBigsock/Assets/Code/InteractionSystem/Door.cs b/MrBigsock/Assets/Code/InteractionSystem/Door.cs index 1bf129cdf8a502607637718c5819f39aeb703e8d..0602749d7beaefcb52d1346da8ef80388aaea021 100644 --- a/MrBigsock/Assets/Code/InteractionSystem/Door.cs +++ b/MrBigsock/Assets/Code/InteractionSystem/Door.cs @@ -5,11 +5,14 @@ using UnityEngine; public class Door : MonoBehaviour, IInteractable { [SerializeField] private string _prompt; + public SpriteRenderer spriteRenderer; + public Sprite newSprite; public string InteractionPrompt => _prompt; public bool Interact(Interactor interactor) { Debug.Log("Opening door!"); + spriteRenderer.sprite = newSprite; return true; } } diff --git a/MrBigsock/Assets/Prefabs/BigSock.prefab b/MrBigsock/Assets/Prefabs/BigSock.prefab index de11c78585885a9134ea74258ef9af18cc54f93c..86c173f5381faaee7cb81b5019ee02831e9aff85 100644 --- a/MrBigsock/Assets/Prefabs/BigSock.prefab +++ b/MrBigsock/Assets/Prefabs/BigSock.prefab @@ -1,5 +1,36 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &8243576937840750920 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4380116905326030103} + m_Layer: 11 + m_Name: InteractionPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4380116905326030103 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8243576937840750920} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.2, y: -0.9, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8799933624292384517} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8799933624292384519 GameObject: m_ObjectHideFlags: 0 @@ -34,7 +65,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 4380116905326030103} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -167,11 +199,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d28dff3ae03f6644c86402b8890d7288, type: 3} m_Name: m_EditorClassIdentifier: - _interactionPoint: {fileID: 0} + _interactionPoint: {fileID: 4380116905326030103} _interactionpointRadius: 0.5 _interactableMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 2048 _numFound: 0 --- !u!50 &8339702841083125274 Rigidbody2D: diff --git a/MrBigsock/Assets/Scenes/example.unity b/MrBigsock/Assets/Scenes/example.unity index 6abd853b6b535eabb9d1ba42c843325556bbcbd6..524e399c6bd6b06eeb0e050bd860b9bbc3bcf357 100644 --- a/MrBigsock/Assets/Scenes/example.unity +++ b/MrBigsock/Assets/Scenes/example.unity @@ -168,7 +168,7 @@ Transform: - {fileID: 323648872} - {fileID: 1483953644} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &114663866 GameObject: @@ -1026,6 +1026,8 @@ GameObject: - component: {fileID: 158679243} - component: {fileID: 158679242} - component: {fileID: 158679241} + - component: {fileID: 158679246} + - component: {fileID: 158679245} m_Layer: 0 m_Name: Canvas m_TagString: Untagged @@ -1108,13 +1110,131 @@ RectTransform: m_Children: - {fileID: 651767214} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!212 &158679245 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158679240} + 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: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2, y: 2} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &158679246 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 158679240} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 68dc6c99db5c10f4daf1f80a2ec61096, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &168450202 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 168450204} + - component: {fileID: 168450203} + m_Layer: 0 + m_Name: Items + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!156049354 &168450203 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168450202} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!4 &168450204 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 168450202} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1008853218} + - {fileID: 532417265} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &248757423 PrefabInstance: m_ObjectHideFlags: 0 @@ -1122,6 +1242,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 315102913059440191, guid: 008ac26ba660ab94484970b17c589923, type: 3} + propertyPath: _interactionpointRadius + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 8799933624292384517, guid: 008ac26ba660ab94484970b17c589923, type: 3} propertyPath: m_RootOrder value: 6 @@ -1629,6 +1753,11 @@ TilemapCollider2D: m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0.00001 +--- !u!4 &532417265 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} + m_PrefabInstance: {fileID: 2107497264} + m_PrefabAsset: {fileID: 0} --- !u!224 &651767214 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 5978214255517273168, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} @@ -1645,6 +1774,63 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 34ee06bf3eaf64142ac1526be9676c25, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &665291685 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2996495149472241661, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_Name + value: Enemy_Slime + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalPosition.x + value: 1.0450952 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalPosition.y + value: -0.04883349 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} --- !u!1 &931844718 GameObject: m_ObjectHideFlags: 0 @@ -1711,8 +1897,13 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1008853218 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + m_PrefabInstance: {fileID: 1912704979} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1229029431 PrefabInstance: m_ObjectHideFlags: 0 @@ -1959,28 +2150,8 @@ Tilemap: - first: {x: -5, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 8 - m_TileSpriteIndex: 8 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -4, y: 1, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 8 - m_TileSpriteIndex: 8 - m_TileMatrixIndex: 0 - m_TileColorIndex: 0 - m_TileObjectToInstantiateIndex: 65535 - dummyAlignment: 0 - m_AllTileFlags: 1073741825 - - first: {x: -3, y: 1, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 8 - m_TileSpriteIndex: 8 + m_TileIndex: 11 + m_TileSpriteIndex: 11 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1989,8 +2160,8 @@ Tilemap: - first: {x: -2, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 8 - m_TileSpriteIndex: 8 + m_TileIndex: 10 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2099,24 +2270,24 @@ Tilemap: - first: {x: -5, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 9 - m_TileSpriteIndex: 9 + m_TileIndex: 12 + m_TileSpriteIndex: 12 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -4, y: 2, z: 0} + - first: {x: -2, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 9 - m_TileSpriteIndex: 9 + m_TileIndex: 13 + m_TileSpriteIndex: 13 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -3, y: 2, z: 0} + - first: {x: -1, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -2126,7 +2297,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -2, y: 2, z: 0} + - first: {x: 0, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -2136,7 +2307,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -1, y: 2, z: 0} + - first: {x: 1, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -2146,7 +2317,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 0, y: 2, z: 0} + - first: {x: 2, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -2156,7 +2327,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 1, y: 2, z: 0} + - first: {x: 3, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -2166,7 +2337,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 2, y: 2, z: 0} + - first: {x: 4, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -2176,7 +2347,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 3, y: 2, z: 0} + - first: {x: 5, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -2186,7 +2357,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 2, z: 0} + - first: {x: 6, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 9 @@ -2196,31 +2367,31 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 5, y: 2, z: 0} + - first: {x: 7, y: 2, z: 0} second: serializedVersion: 2 - m_TileIndex: 9 - m_TileSpriteIndex: 9 + m_TileIndex: 6 + m_TileSpriteIndex: 6 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 6, y: 2, z: 0} + - first: {x: -4, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 9 - m_TileSpriteIndex: 9 + m_TileIndex: 15 + m_TileSpriteIndex: 15 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 7, y: 2, z: 0} + - first: {x: -3, y: 3, z: 0} second: serializedVersion: 2 - m_TileIndex: 6 - m_TileSpriteIndex: 6 + m_TileIndex: 14 + m_TileSpriteIndex: 14 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2244,10 +2415,22 @@ Tilemap: m_Data: {fileID: 11400000, guid: 26e1dd6488abfb34584a76d2ee5021de, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 75f9c18ba8ecb2d4b98ae64f7340474a, type: 2} - - m_RefCount: 12 + - m_RefCount: 8 m_Data: {fileID: 11400000, guid: a23d356dc7ef26b42afb97e7a7e87330, type: 2} - - m_RefCount: 12 + - m_RefCount: 8 m_Data: {fileID: 11400000, guid: 257657ca820b66741ab4695fbb49f83e, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 794cb64b1bb867c438f45faf4c809e60, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 1d79f2a2dd2a98142ab3dee5022b6812, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 2451da60eae72804ea1516793136c130, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 8607fee69c003254086318ea700356bc, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 89f154c4c20759a43b960c725c916389, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 725ac7f68af6b7646922285011a3f343, type: 2} m_TileSpriteArray: - m_RefCount: 1 m_Data: {fileID: -2046453881, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} @@ -2265,12 +2448,24 @@ Tilemap: m_Data: {fileID: 1802662682, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} - m_RefCount: 1 m_Data: {fileID: -1396940042, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} - - m_RefCount: 12 + - m_RefCount: 8 m_Data: {fileID: -650063954, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} - - m_RefCount: 12 + - m_RefCount: 8 m_Data: {fileID: -1085996522, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 306057277, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 811441136, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -1614669064, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} + - m_RefCount: 1 + m_Data: {fileID: -1181825705, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 1460241374, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 2137237813, guid: 0a806eb0d25e11c48b5dee57fb9339b5, type: 3} m_TileMatrixArray: - - m_RefCount: 36 + - m_RefCount: 34 m_Data: e00: 1 e01: 0 @@ -2289,13 +2484,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 36 + - m_RefCount: 34 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: -6, y: -3, z: 0} - m_Size: {x: 14, y: 6, z: 1} + m_Size: {x: 14, y: 7, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -2415,6 +2610,63 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1912704979 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 168450204} + m_Modifications: + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalPosition.x + value: -3 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalPosition.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 564010318353551005, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3927126222752442302, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} + propertyPath: m_Name + value: ClosedDoor + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: e2f80767fa7906a4cabb85c3d953f245, type: 3} --- !u!1001 &2004502025 PrefabInstance: m_ObjectHideFlags: 0 @@ -2528,64 +2780,60 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e81cb15d153a6cb49b6161acd7cb8f83, type: 3} ---- !u!1001 &2143596491 +--- !u!1001 &2107497264 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 168450204} m_Modifications: - - target: {fileID: 2996495149472241661, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} - propertyPath: m_Name - value: Enemy_Slime - objectReference: {fileID: 0} - - target: {fileID: 2996495149472241661, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_RootOrder - value: 5 + value: 1 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: -4.5 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalPosition.y - value: 0 + value: 0.55 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7097463258699610772, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + - target: {fileID: 3424500754593193000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 3524574384065166323, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} + propertyPath: m_Name + value: ClosedChest + objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0c78162db0e5ea443a58406283e89a8e, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: fdfefcc62c4bc394e850b15cc3e4db85, type: 3} diff --git a/MrBigsock/Assets/Sprites/Item/Canvas.controller b/MrBigsock/Assets/Sprites/Item/Canvas.controller new file mode 100644 index 0000000000000000000000000000000000000000..e7ebc7ece33243803fe37f91e4d74fc100280c13 --- /dev/null +++ b/MrBigsock/Assets/Sprites/Item/Canvas.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-5715601486444831835 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 2101813797707696144} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 2101813797707696144} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Canvas + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5715601486444831835} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &2101813797707696144 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OpeningDoor + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 55d643fdfce97604587565dfe5114d9b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/MrBigsock/Assets/Sprites/Item/Canvas.controller.meta b/MrBigsock/Assets/Sprites/Item/Canvas.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..335274074396f72efe0a96e52157d694d8e1599c --- /dev/null +++ b/MrBigsock/Assets/Sprites/Item/Canvas.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68dc6c99db5c10f4daf1f80a2ec61096 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Sprites/Item/ClosedChest.controller b/MrBigsock/Assets/Sprites/Item/ClosedChest.controller new file mode 100644 index 0000000000000000000000000000000000000000..ae78332c22929ab7a98ebfd980d3a75334fec228 --- /dev/null +++ b/MrBigsock/Assets/Sprites/Item/ClosedChest.controller @@ -0,0 +1,176 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9102936364586265109 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle + m_Speed: 1 + m_CycleOffset: 1 + m_Transitions: + - {fileID: 2179366303297943155} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1102 &-4254591718707031978 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Idle 0 + m_Speed: 1 + m_CycleOffset: 1 + m_Transitions: + - {fileID: 1491831612463993281} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 0} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-878898569698988956 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 4882564813246248277} + m_Position: {x: 290, y: 210, z: 0} + - serializedVersion: 1 + m_State: {fileID: -9102936364586265109} + m_Position: {x: 290, y: 120, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4254591718707031978} + m_Position: {x: 290, y: 30, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -9102936364586265109} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ClosedChest + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -878898569698988956} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &1491831612463993281 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -9102936364586265109} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &2179366303297943155 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -4254591718707031978} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &4882564813246248277 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OpeningGoldChest + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 7a666638bfe6cff46a60cb7498be4106, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/MrBigsock/Assets/Sprites/Item/ClosedChest.controller.meta b/MrBigsock/Assets/Sprites/Item/ClosedChest.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..fc671ff26c985bdfc16e83d49ae3191149f4ec65 --- /dev/null +++ b/MrBigsock/Assets/Sprites/Item/ClosedChest.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 74461049370202d4da85090bc514ba1f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Sprites/Item/ClosedChest.prefab b/MrBigsock/Assets/Sprites/Item/ClosedChest.prefab index 4b0661946bfce945aac4fb9cbc7e4da7f9df51fd..851b79eec9be537f09fc33ae12c6b6c672debaa7 100644 --- a/MrBigsock/Assets/Sprites/Item/ClosedChest.prefab +++ b/MrBigsock/Assets/Sprites/Item/ClosedChest.prefab @@ -11,8 +11,9 @@ GameObject: - component: {fileID: 3424500754593193000} - component: {fileID: 2084913590679028496} - component: {fileID: 9185049823073967866} - - component: {fileID: 180819136057372166} - m_Layer: 0 + - component: {fileID: 532417266} + - component: {fileID: 532417261} + m_Layer: 11 m_Name: ClosedChest m_TagString: Untagged m_Icon: {fileID: 0} @@ -74,7 +75,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 0 + m_SortingOrder: 1 m_Sprite: {fileID: -1476513711, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -99,16 +100,54 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _prompt: ---- !u!65 &180819136057372166 -BoxCollider: + animator: {fileID: 532417261} + goldenChestOpen: OpeningGoldChest + idleGoldChest: Idle + spriteRenderer: {fileID: 2084913590679028496} + newSprite: {fileID: 617207669, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} +--- !u!61 &532417266 +BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3524574384065166323} + m_Enabled: 1 + m_Density: 1 m_Material: {fileID: 0} m_IsTrigger: 0 - m_Enabled: 1 + 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: 0.8997903, z: 0.2} - m_Center: {x: 0, y: -0.050104856, z: 0} + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 +--- !u!95 &532417261 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3524574384065166323} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 74461049370202d4da85090bc514ba1f, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/MrBigsock/Assets/Sprites/Item/ClosedDoor.controller b/MrBigsock/Assets/Sprites/Item/ClosedDoor.controller new file mode 100644 index 0000000000000000000000000000000000000000..ccfdd5c1a6cbe6c257293ac86b633b909ba56a77 --- /dev/null +++ b/MrBigsock/Assets/Sprites/Item/ClosedDoor.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ClosedDoor + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 1435108692897676554} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1435108692897676554 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 8389795886735001894} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 8389795886735001894} +--- !u!1102 &8389795886735001894 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OpeningDoor + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 55d643fdfce97604587565dfe5114d9b, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/MrBigsock/Assets/Sprites/Item/ClosedDoor.controller.meta b/MrBigsock/Assets/Sprites/Item/ClosedDoor.controller.meta new file mode 100644 index 0000000000000000000000000000000000000000..13428559fac0b658acd0cb1b7402fef319fab307 --- /dev/null +++ b/MrBigsock/Assets/Sprites/Item/ClosedDoor.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3e9592659036024429b8d2c20e6bfdbb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Sprites/Item/ClosedDoor.prefab b/MrBigsock/Assets/Sprites/Item/ClosedDoor.prefab index 59113fb9a9ed4c18092a8cdcc427b78b310d0928..88c29bf6b8ca92919c68291a63df67c3d45d9094 100644 --- a/MrBigsock/Assets/Sprites/Item/ClosedDoor.prefab +++ b/MrBigsock/Assets/Sprites/Item/ClosedDoor.prefab @@ -13,6 +13,7 @@ GameObject: - component: {fileID: 953694648354412602} - component: {fileID: 2422460862180154357} - component: {fileID: 2894084376395367315} + - component: {fileID: 1008853213} m_Layer: 11 m_Name: ClosedDoor m_TagString: Untagged @@ -75,7 +76,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 1 m_Sprite: {fileID: 1340238494, guid: 825e3442c4ac3144390c4c276366629c, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -100,6 +101,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _prompt: + spriteRenderer: {fileID: 4182604374371590764} + newSprite: {fileID: 1308953881, guid: 825e3442c4ac3144390c4c276366629c, type: 3} --- !u!1839735485 &2422460862180154357 Tilemap: m_ObjectHideFlags: 0 @@ -164,3 +167,23 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 2, y: 2} m_EdgeRadius: 0 +--- !u!95 &1008853213 +Animator: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3927126222752442302} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 3e9592659036024429b8d2c20e6bfdbb, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 diff --git a/MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim b/MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim new file mode 100644 index 0000000000000000000000000000000000000000..a8a65bfb087d5e0afd0152b6fb9652b8de5103aa --- /dev/null +++ b/MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: OpeningGoldChest + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: -1476513711, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} + - time: 0.25 + value: {fileID: -239743868, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} + - time: 0.5 + value: {fileID: 617207669, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} + - time: 0.75 + value: {fileID: 617207669, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + pptrCurveMapping: + - {fileID: -1476513711, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} + - {fileID: -239743868, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} + - {fileID: 617207669, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} + - {fileID: 617207669, guid: f236c50a7ec8f3b4cb53217789ea98f4, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.76666665 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim.meta b/MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim.meta new file mode 100644 index 0000000000000000000000000000000000000000..bba1e869f36ab3b153bac56de5c9e65167f1af88 --- /dev/null +++ b/MrBigsock/Assets/Sprites/Item/OpeningGoldChest.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7a666638bfe6cff46a60cb7498be4106 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/MrBigsock/Assets/Sprites/Item/tilesetNice.png.meta b/MrBigsock/Assets/Sprites/Item/tilesetNice.png.meta index a0c5b9fc0d770c39a0e68abbef952d1ca3d034b8..4e84a92a0fb0c3f713af0882727ccd86061fe0bf 100644 --- a/MrBigsock/Assets/Sprites/Item/tilesetNice.png.meta +++ b/MrBigsock/Assets/Sprites/Item/tilesetNice.png.meta @@ -567,7 +567,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: tilesetNice_22 + name: ClosedDoor rect: serializedVersion: 2 x: 32 @@ -588,7 +588,7 @@ TextureImporter: edges: [] weights: [] - serializedVersion: 2 - name: tilesetNice_23 + name: OpenDoor rect: serializedVersion: 2 x: 80 @@ -619,7 +619,6 @@ TextureImporter: weights: [] secondaryTextures: [] nameFileIdTable: - tilesetNice_23: 1308953881 tilesetNice_3: 678725006 tilesetNice_14: 1783712042 tilesetNice_5: 814654453 @@ -628,6 +627,7 @@ TextureImporter: tilesetNice_15: -342193011 tilesetNice_21: 1581561053 tilesetNice_4: 810677168 + ClosedDoor: 1340238494 tilesetNice_11: -1533204815 tilesetNice_0: 1621574529 tilesetNice_9: 304410279 @@ -637,12 +637,12 @@ TextureImporter: tilesetNice_12: 493418094 tilesetNice_13: -1540811642 tilesetNice_1: 205017322 - tilesetNice_22: 1340238494 tilesetNice_10: -975176531 tilesetNice_16: 824827220 tilesetNice_18: -290510884 tilesetNice_19: 1596393381 tilesetNice_6: -140495139 + OpenDoor: 1308953881 spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0