From 3e0fe60e7a53743015f8acf98c0fc40c7d69a009 Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 28 Apr 2019 00:28:13 +0200 Subject: [PATCH] Fix more stuff --- .../Map.prefab.meta => Animations.meta} | 5 +- Assets/Animators.meta | 8 + Assets/Assets.meta | 8 + .../Editor/BeforeStartAttributeDrawer.cs.meta | 11 - Assets/PhysMats.meta | 8 + Assets/Prefabs/GameController.prefab | 2 +- Assets/Prefabs/Map.prefab | 52 ----- Assets/Prefabs/Slime.prefab | 20 +- Assets/Prefabs/Tile.prefab | 34 ++- Assets/Scenes/Steffo.unity | 193 ++---------------- Assets/Scripts/BeforeStartAttribute.cs.meta | 11 - Assets/Scripts/Consumabile.cs.meta | 11 - Assets/Scripts/Monster.cs | 23 --- Assets/Scripts/Monster.cs.meta | 11 - Assets/Scripts/Mostro.cs.meta | 11 - Assets/Scripts/Object.cs.meta | 11 - Assets/Sounds.meta | 8 + Assets/Sprites/Slime.png.meta | 24 ++- 18 files changed, 93 insertions(+), 358 deletions(-) rename Assets/{Prefabs/Map.prefab.meta => Animations.meta} (57%) create mode 100644 Assets/Animators.meta create mode 100644 Assets/Assets.meta delete mode 100644 Assets/Editor/BeforeStartAttributeDrawer.cs.meta create mode 100644 Assets/PhysMats.meta delete mode 100644 Assets/Prefabs/Map.prefab delete mode 100644 Assets/Scripts/BeforeStartAttribute.cs.meta delete mode 100644 Assets/Scripts/Consumabile.cs.meta delete mode 100644 Assets/Scripts/Monster.cs delete mode 100644 Assets/Scripts/Monster.cs.meta delete mode 100644 Assets/Scripts/Mostro.cs.meta delete mode 100644 Assets/Scripts/Object.cs.meta create mode 100644 Assets/Sounds.meta diff --git a/Assets/Prefabs/Map.prefab.meta b/Assets/Animations.meta similarity index 57% rename from Assets/Prefabs/Map.prefab.meta rename to Assets/Animations.meta index f5813e2..b2a79e2 100644 --- a/Assets/Prefabs/Map.prefab.meta +++ b/Assets/Animations.meta @@ -1,6 +1,7 @@ fileFormatVersion: 2 -guid: cd714ea41cb7c454994bf0f5ad99abd1 -PrefabImporter: +guid: ef3d86d84c224344a94715cdfa9fe32c +folderAsset: yes +DefaultImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Animators.meta b/Assets/Animators.meta new file mode 100644 index 0000000..7ff80b8 --- /dev/null +++ b/Assets/Animators.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 043f304edcc831c4ea9fcf0e1a2e520d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Assets.meta b/Assets/Assets.meta new file mode 100644 index 0000000..4eba494 --- /dev/null +++ b/Assets/Assets.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0460346d99d385241a6d87bbd10aceb8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Editor/BeforeStartAttributeDrawer.cs.meta b/Assets/Editor/BeforeStartAttributeDrawer.cs.meta deleted file mode 100644 index 4216c56..0000000 --- a/Assets/Editor/BeforeStartAttributeDrawer.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 13bad693cf0c2634ea1e2be679edf00f -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/PhysMats.meta b/Assets/PhysMats.meta new file mode 100644 index 0000000..bc5b1b2 --- /dev/null +++ b/Assets/PhysMats.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e823a56cb429e4b49becdc740fba66b9 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab index 785b082..f6050a5 100644 --- a/Assets/Prefabs/GameController.prefab +++ b/Assets/Prefabs/GameController.prefab @@ -94,7 +94,7 @@ MonoBehaviour: - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, type: 3} - tilePrefab: {fileID: 3219556109866242471, guid: 0e0b618b5499bbb40b076c0291d55487, + tilePrefab: {fileID: 2955896503201886234, guid: 0e0b618b5499bbb40b076c0291d55487, type: 3} playerPrefab: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, type: 3} diff --git a/Assets/Prefabs/Map.prefab b/Assets/Prefabs/Map.prefab deleted file mode 100644 index e8043ff..0000000 --- a/Assets/Prefabs/Map.prefab +++ /dev/null @@ -1,52 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7249059666095778526 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7249059666095778521} - - component: {fileID: 6907631410461015020} - m_Layer: 0 - m_Name: Map - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7249059666095778521 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7249059666095778526} - 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_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &6907631410461015020 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7249059666095778526} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 052bc569472779a429bfc51246f723d4, type: 3} - m_Name: - m_EditorClassIdentifier: - mapSize: 30 - roomsToGenerate: 5 - wallSprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} - roomSprite: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - corridorSprite: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - tilePrefab: {fileID: 3219556109866242471, guid: 0e0b618b5499bbb40b076c0291d55487, - type: 3} diff --git a/Assets/Prefabs/Slime.prefab b/Assets/Prefabs/Slime.prefab index ae102a3..30a9177 100644 --- a/Assets/Prefabs/Slime.prefab +++ b/Assets/Prefabs/Slime.prefab @@ -9,7 +9,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2043533519980591455} - - component: {fileID: 7440667849060313208} - component: {fileID: 571363246873614695} - component: {fileID: 1351652798109185028} m_Layer: 0 @@ -33,21 +32,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7440667849060313208 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1164136568549368904} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a72ad0eb2136f284bab78f19fa561bb8, type: 3} - m_Name: - m_EditorClassIdentifier: - hpMax: 0 - hp: 0 - sprite: {fileID: 21300000, guid: 0121970e693ee0a4d987bd5fe694ad67, type: 3} --- !u!114 &571363246873614695 MonoBehaviour: m_ObjectHideFlags: 0 @@ -62,7 +46,7 @@ MonoBehaviour: m_EditorClassIdentifier: hpMax: 0 hp: 0 - sprite: {fileID: 21300000, guid: 0121970e693ee0a4d987bd5fe694ad67, type: 3} + sprite: {fileID: 21300000, guid: ee7ef72c830dc204c9df0595e161f049, type: 3} visionRange: 4 --- !u!212 &1351652798109185028 SpriteRenderer: @@ -101,7 +85,7 @@ SpriteRenderer: m_SortingLayerID: -522733599 m_SortingLayer: 1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: 0121970e693ee0a4d987bd5fe694ad67, type: 3} + m_Sprite: {fileID: 21300000, guid: ee7ef72c830dc204c9df0595e161f049, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/Assets/Prefabs/Tile.prefab b/Assets/Prefabs/Tile.prefab index afca17b..605ed80 100644 --- a/Assets/Prefabs/Tile.prefab +++ b/Assets/Prefabs/Tile.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &3219556109866242471 +--- !u!1 &2955896503201886234 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,9 +8,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 3219556109866242468} - - component: {fileID: 9040756953319481538} - - component: {fileID: 1691311275711631131} + - component: {fileID: 9097349522954059487} + - component: {fileID: 8906036564741524568} + - component: {fileID: 4218371391286436838} m_Layer: 0 m_Name: Tile m_TagString: Untagged @@ -18,13 +18,13 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &3219556109866242468 +--- !u!4 &9097349522954059487 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3219556109866242471} + m_GameObject: {fileID: 2955896503201886234} 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} @@ -32,31 +32,28 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &9040756953319481538 +--- !u!114 &8906036564741524568 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3219556109866242471} + m_GameObject: {fileID: 2955896503201886234} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4df8012d0534aea47b137c1838a5a6af, type: 3} m_Name: m_EditorClassIdentifier: walkable: 0 -<<<<<<< HEAD roomPart: 0 -======= ->>>>>>> parent of bc79745... Revert "Merge branch 'master' of https://github.com/Steffo99/LD44" - sprite: {fileID: 0} ---- !u!212 &1691311275711631131 + sprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} +--- !u!212 &4218371391286436838 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3219556109866242471} + m_GameObject: {fileID: 2955896503201886234} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -84,15 +81,10 @@ SpriteRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} -<<<<<<< HEAD - m_SortingLayerID: -23662865 - m_SortingLayer: -1 -======= m_SortingLayerID: 0 m_SortingLayer: 0 ->>>>>>> parent of bc79745... Revert "Merge branch 'master' of https://github.com/Steffo99/LD44" m_SortingOrder: 0 - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -100,6 +92,6 @@ SpriteRenderer: m_Size: {x: 1, y: 1} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 diff --git a/Assets/Scenes/Steffo.unity b/Assets/Scenes/Steffo.unity index a77c498..ed248a3 100644 --- a/Assets/Scenes/Steffo.unity +++ b/Assets/Scenes/Steffo.unity @@ -1,5 +1,3 @@ -<<<<<<< HEAD -======= %YAML 1.1 %TAG !u! tag:unity3d.com,2011: --- !u!29 &1 @@ -122,225 +120,72 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &1386694424 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1386694427} - - component: {fileID: 1386694426} - - component: {fileID: 1386694425} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &1386694425 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386694424} - m_Enabled: 1 ---- !u!20 &1386694426 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386694424} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &1386694427 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1386694424} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &5874724150884597007 +--- !u!1001 &3195245191303068541 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2866215097817665852, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1792584738874209504, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_Name value: GameController objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalPosition.x - value: 0.18855336 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalPosition.y - value: 0.26111984 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalPosition.z - value: 34.533203 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.x - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.y - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.z - value: -0 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3211721187637284538, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1419775483983031142, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} ---- !u!1001 &7249059666254997933 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 7249059666095778526, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_Name - value: Map - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7249059666095778521, guid: cd714ea41cb7c454994bf0f5ad99abd1, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cd714ea41cb7c454994bf0f5ad99abd1, type: 3} ->>>>>>> parent of bc79745... Revert "Merge branch 'master' of https://github.com/Steffo99/LD44" diff --git a/Assets/Scripts/BeforeStartAttribute.cs.meta b/Assets/Scripts/BeforeStartAttribute.cs.meta deleted file mode 100644 index 68df79c..0000000 --- a/Assets/Scripts/BeforeStartAttribute.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ec73aa347f0168f4f95e1acbd3072646 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Consumabile.cs.meta b/Assets/Scripts/Consumabile.cs.meta deleted file mode 100644 index 26b1684..0000000 --- a/Assets/Scripts/Consumabile.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: db5a27c0009da214088bb4a3c08b76db -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Monster.cs b/Assets/Scripts/Monster.cs deleted file mode 100644 index 604daad..0000000 --- a/Assets/Scripts/Monster.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Monster : MonoBehaviour -{ - public int hpMax; - - [AfterStartAttribute] - public int hp; - - [BeforeStartAttribute] - public Sprite sprite; - - private SpriteRenderer spriteRenderer; - - private void Start() - { - spriteRenderer = GetComponent(); - spriteRenderer.sprite = sprite; - hp = hpMax; - } -} diff --git a/Assets/Scripts/Monster.cs.meta b/Assets/Scripts/Monster.cs.meta deleted file mode 100644 index f99ee29..0000000 --- a/Assets/Scripts/Monster.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: a72ad0eb2136f284bab78f19fa561bb8 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Mostro.cs.meta b/Assets/Scripts/Mostro.cs.meta deleted file mode 100644 index 31bb5e3..0000000 --- a/Assets/Scripts/Mostro.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: d484827da1a4f984c837dbfb9f970bdd -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Object.cs.meta b/Assets/Scripts/Object.cs.meta deleted file mode 100644 index ec349c0..0000000 --- a/Assets/Scripts/Object.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 49be0f8468bff6249b7befdf02bc8ec9 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta new file mode 100644 index 0000000..5fd147f --- /dev/null +++ b/Assets/Sounds.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19c0d85909aede34bb371863f187b9e0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/Slime.png.meta b/Assets/Sprites/Slime.png.meta index 4c8fdc8..531e9f7 100644 --- a/Assets/Sprites/Slime.png.meta +++ b/Assets/Sprites/Slime.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 40 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: []