From 1db2d0c22eb4762cb39c51ad501279e353a838ce Mon Sep 17 00:00:00 2001 From: Lorenzo Balugani Date: Mon, 29 Apr 2019 14:35:35 +0200 Subject: [PATCH] Add weapon prefabs --- Assets/Prefabs/Heart.prefab | 4 +- Assets/Prefabs/LongSword.prefab | 100 ++++++++++++++++++ .../LongSword.prefab.meta} | 5 +- Assets/Prefabs/PoisonousHeart.prefab | 4 +- Assets/Prefabs/ShortSword.prefab | 100 ++++++++++++++++++ .../ShortSword.prefab.meta} | 5 +- Assets/Scenes/Steffo.unity | 6 ++ Assets/Scripts/DestroySelfAfterSomeTime.cs | 4 +- ....meta => DestroySelfAfterSomeTime.cs.meta} | 2 +- Assets/Scripts/EntityItemHeart.cs | 2 +- Assets/Scripts/EntityItemPoisonHeart.cs | 2 +- Assets/Scripts/EntityItemShop.cs | 4 +- Assets/Scripts/EntityItemShop.cs.meta | 11 ++ Assets/Scripts/EntityItemShopSword.cs | 2 +- Assets/Scripts/EntityItemShopSword.cs.meta | 11 ++ Assets/Scripts/NextLevel.cs.meta | 11 ++ Assets/Sounds.meta | 8 -- Assets/Sprites/HPotion.png.meta | 90 ++++++++++++++++ Assets/Sprites/HealthBar.png.meta | 90 ++++++++++++++++ Assets/Sprites/HealthBarLife.png | 3 + Assets/Sprites/HealthBarLife.png.meta | 90 ++++++++++++++++ Assets/Sprites/VaseRandom.png.meta | 90 ++++++++++++++++ Assets/Sprites/WeaponBacchetta.png.meta | 90 ++++++++++++++++ Assets/Sprites/WeaponScettro.png.meta | 90 ++++++++++++++++ Assets/Sprites/WeaponSpadina.png.meta | 90 ++++++++++++++++ Assets/Sprites/WeaponSpadone.png.meta | 90 ++++++++++++++++ 26 files changed, 978 insertions(+), 26 deletions(-) create mode 100644 Assets/Prefabs/LongSword.prefab rename Assets/{Assets.meta => Prefabs/LongSword.prefab.meta} (57%) create mode 100644 Assets/Prefabs/ShortSword.prefab rename Assets/{PhysMats.meta => Prefabs/ShortSword.prefab.meta} (57%) rename Assets/Scripts/{CoinMessage.cs.meta => DestroySelfAfterSomeTime.cs.meta} (83%) create mode 100644 Assets/Scripts/EntityItemShop.cs.meta create mode 100644 Assets/Scripts/EntityItemShopSword.cs.meta create mode 100644 Assets/Scripts/NextLevel.cs.meta delete mode 100644 Assets/Sounds.meta create mode 100644 Assets/Sprites/HPotion.png.meta create mode 100644 Assets/Sprites/HealthBar.png.meta create mode 100644 Assets/Sprites/HealthBarLife.png create mode 100644 Assets/Sprites/HealthBarLife.png.meta create mode 100644 Assets/Sprites/VaseRandom.png.meta create mode 100644 Assets/Sprites/WeaponBacchetta.png.meta create mode 100644 Assets/Sprites/WeaponScettro.png.meta create mode 100644 Assets/Sprites/WeaponSpadina.png.meta create mode 100644 Assets/Sprites/WeaponSpadone.png.meta diff --git a/Assets/Prefabs/Heart.prefab b/Assets/Prefabs/Heart.prefab index 9ba1efb..d6866d2 100644 --- a/Assets/Prefabs/Heart.prefab +++ b/Assets/Prefabs/Heart.prefab @@ -92,7 +92,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c07fddfe35675304f92b18a213875e74, type: 3} m_Name: m_EditorClassIdentifier: - hpMax: 0 - overlappable: 0 + hpMax: 1 + overlappable: 1 hp: 1 regen: 10 diff --git a/Assets/Prefabs/LongSword.prefab b/Assets/Prefabs/LongSword.prefab new file mode 100644 index 0000000..ff997b6 --- /dev/null +++ b/Assets/Prefabs/LongSword.prefab @@ -0,0 +1,100 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &92662261887728601 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2581692530561691080} + - component: {fileID: 4697102406538043977} + - component: {fileID: -7754318986722149322} + m_Layer: 0 + m_Name: LongSword + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2581692530561691080 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 92662261887728601} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 19.919579, y: 6.629715, z: -26.218262} + 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!212 &4697102406538043977 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 92662261887728601} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_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: 21300000, guid: 29a95eeaa590c2b468ff8382fa4459f1, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.09, y: 0.29} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &-7754318986722149322 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 92662261887728601} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7823bc23a1fc169459fa1b5c385ec764, type: 3} + m_Name: + m_EditorClassIdentifier: + hpMax: 1 + overlappable: 1 + hp: 0 + hpChange: -1 + maxHpChange: -1 + damage: 10 diff --git a/Assets/Assets.meta b/Assets/Prefabs/LongSword.prefab.meta similarity index 57% rename from Assets/Assets.meta rename to Assets/Prefabs/LongSword.prefab.meta index 4eba494..366f24f 100644 --- a/Assets/Assets.meta +++ b/Assets/Prefabs/LongSword.prefab.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: 0460346d99d385241a6d87bbd10aceb8 -folderAsset: yes -DefaultImporter: +guid: 7c2fb7e54af6dea468b8dac35e5b6e8c +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Prefabs/PoisonousHeart.prefab b/Assets/Prefabs/PoisonousHeart.prefab index 70db3b1..bed7bf1 100644 --- a/Assets/Prefabs/PoisonousHeart.prefab +++ b/Assets/Prefabs/PoisonousHeart.prefab @@ -92,7 +92,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6effa3f71be846844844432d38652a57, type: 3} m_Name: m_EditorClassIdentifier: - hpMax: 0 - overlappable: 0 + hpMax: 1 + overlappable: 1 hp: 1 damage: 10 diff --git a/Assets/Prefabs/ShortSword.prefab b/Assets/Prefabs/ShortSword.prefab new file mode 100644 index 0000000..81468a6 --- /dev/null +++ b/Assets/Prefabs/ShortSword.prefab @@ -0,0 +1,100 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1306643954942640807 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 196364543610214827} + - component: {fileID: -812928086201289980} + - component: {fileID: 7711614280348628083} + m_Layer: 0 + m_Name: ShortSword + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &196364543610214827 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1306643954942640807} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 19.595844, y: 6.769271, z: -24.406227} + 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!212 &-812928086201289980 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1306643954942640807} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_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: 21300000, guid: 0b83d7efeff86e3458c4860e3760ab38, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.08, y: 0.28} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &7711614280348628083 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1306643954942640807} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7823bc23a1fc169459fa1b5c385ec764, type: 3} + m_Name: + m_EditorClassIdentifier: + hpMax: 1 + overlappable: 1 + hp: 1 + hpChange: -1 + maxHpChange: -1 + damage: 3 diff --git a/Assets/PhysMats.meta b/Assets/Prefabs/ShortSword.prefab.meta similarity index 57% rename from Assets/PhysMats.meta rename to Assets/Prefabs/ShortSword.prefab.meta index bc5b1b2..6c95fbf 100644 --- a/Assets/PhysMats.meta +++ b/Assets/Prefabs/ShortSword.prefab.meta @@ -1,7 +1,6 @@ fileFormatVersion: 2 -guid: e823a56cb429e4b49becdc740fba66b9 -folderAsset: yes -DefaultImporter: +guid: 95108a3fad23a64459e636e30a6af002 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/Assets/Scenes/Steffo.unity b/Assets/Scenes/Steffo.unity index ff4781b..0330c3f 100644 --- a/Assets/Scenes/Steffo.unity +++ b/Assets/Scenes/Steffo.unity @@ -187,5 +187,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6406203509107481990, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9c22556080c471a48a14188af3c88967, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} diff --git a/Assets/Scripts/DestroySelfAfterSomeTime.cs b/Assets/Scripts/DestroySelfAfterSomeTime.cs index 07a332e..b53ae19 100644 --- a/Assets/Scripts/DestroySelfAfterSomeTime.cs +++ b/Assets/Scripts/DestroySelfAfterSomeTime.cs @@ -7,10 +7,10 @@ public class DestroySelfAfterSomeTime : MonoBehaviour { public float time = 1f; protected void Start() { - Invoke(DestroySelf, time); + Invoke("Delet", time); } - protected void DestroySelf() { + protected void Delet() { Destroy(gameObject); } } \ No newline at end of file diff --git a/Assets/Scripts/CoinMessage.cs.meta b/Assets/Scripts/DestroySelfAfterSomeTime.cs.meta similarity index 83% rename from Assets/Scripts/CoinMessage.cs.meta rename to Assets/Scripts/DestroySelfAfterSomeTime.cs.meta index b3decef..feab718 100644 --- a/Assets/Scripts/CoinMessage.cs.meta +++ b/Assets/Scripts/DestroySelfAfterSomeTime.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 353096ead4dbdc54d87a38e4ef3cc1c6 +guid: b954ed13d7731414a8289b9fa514f604 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/EntityItemHeart.cs b/Assets/Scripts/EntityItemHeart.cs index 11b48a4..13d7994 100644 --- a/Assets/Scripts/EntityItemHeart.cs +++ b/Assets/Scripts/EntityItemHeart.cs @@ -13,7 +13,7 @@ public class EntityItemHeart : EntityItem } public override void OnPickup(EntityPlayer player) { - messageBar.Write("Picked up: " + Name, Color.lime); + messageBar.Write("Picked up: " + Name, Color.green); player.hp += regen; if (player.hp > player.hpMax) player.hp = player.hpMax; Destroy(gameObject); diff --git a/Assets/Scripts/EntityItemPoisonHeart.cs b/Assets/Scripts/EntityItemPoisonHeart.cs index e1715fc..5298abd 100644 --- a/Assets/Scripts/EntityItemPoisonHeart.cs +++ b/Assets/Scripts/EntityItemPoisonHeart.cs @@ -13,7 +13,7 @@ public class EntityItemPoisonHeart : EntityItem } public override void OnPickup(EntityPlayer player) { - messageBar.Write("Picked up: " + Name, Color.orange); + messageBar.Write("Picked up: " + Name, Color.yellow); player.hp -= damage; Destroy(gameObject); } diff --git a/Assets/Scripts/EntityItemShop.cs b/Assets/Scripts/EntityItemShop.cs index 3ca9fc1..424d42e 100644 --- a/Assets/Scripts/EntityItemShop.cs +++ b/Assets/Scripts/EntityItemShop.cs @@ -17,9 +17,9 @@ public class EntityItemShop : EntityItem { Debug.LogWarning("OnPurchase not overridden"); } - public override void OnPickup() { + public override void OnPickup(EntityPlayer player) { player.hp += hpChange; - player.maxHpChange += maxHpChange; + player.hpMax += maxHpChange; OnPurchase(); messageBar.Write("Bought: " + Name, Color.yellow); Destroy(gameObject); diff --git a/Assets/Scripts/EntityItemShop.cs.meta b/Assets/Scripts/EntityItemShop.cs.meta new file mode 100644 index 0000000..adc0e33 --- /dev/null +++ b/Assets/Scripts/EntityItemShop.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 293e57a2283cd9b48a35d38f3c56312c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/EntityItemShopSword.cs b/Assets/Scripts/EntityItemShopSword.cs index bb8ef83..384528d 100644 --- a/Assets/Scripts/EntityItemShopSword.cs +++ b/Assets/Scripts/EntityItemShopSword.cs @@ -14,7 +14,7 @@ public class EntityItemShopSword : EntityItemShop { protected override void OnPurchase() { Destroy(player.GetComponent()); - player.AddComponent(PlayerAttackMelee); + player.gameObject.AddComponent(); PlayerAttackMelee pam = player.GetComponent(); pam.damage = this.damage; } diff --git a/Assets/Scripts/EntityItemShopSword.cs.meta b/Assets/Scripts/EntityItemShopSword.cs.meta new file mode 100644 index 0000000..1afe366 --- /dev/null +++ b/Assets/Scripts/EntityItemShopSword.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7823bc23a1fc169459fa1b5c385ec764 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/NextLevel.cs.meta b/Assets/Scripts/NextLevel.cs.meta new file mode 100644 index 0000000..8064998 --- /dev/null +++ b/Assets/Scripts/NextLevel.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: b7d6ea1bcc47c314ca03013f1bfabd6b +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounds.meta b/Assets/Sounds.meta deleted file mode 100644 index 5fd147f..0000000 --- a/Assets/Sounds.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 19c0d85909aede34bb371863f187b9e0 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Sprites/HPotion.png.meta b/Assets/Sprites/HPotion.png.meta new file mode 100644 index 0000000..f7b949f --- /dev/null +++ b/Assets/Sprites/HPotion.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 40bed58945006454a87dacafc93a9f5d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 1e943bdc19b412a45a90f1bd2d44819f + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/HealthBar.png.meta b/Assets/Sprites/HealthBar.png.meta new file mode 100644 index 0000000..3914016 --- /dev/null +++ b/Assets/Sprites/HealthBar.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 9c22556080c471a48a14188af3c88967 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5d8178a868e8bac42af9c14e04d8eb0e + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/HealthBarLife.png b/Assets/Sprites/HealthBarLife.png new file mode 100644 index 0000000..4fe39d1 --- /dev/null +++ b/Assets/Sprites/HealthBarLife.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:ee74dbfb750c5dbc0ba8bcd7c4f0e2675a3e3a27dc159a99c6539087ab8ee4f9 +size 2044 diff --git a/Assets/Sprites/HealthBarLife.png.meta b/Assets/Sprites/HealthBarLife.png.meta new file mode 100644 index 0000000..11d6017 --- /dev/null +++ b/Assets/Sprites/HealthBarLife.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: ad2b5d778bd508349988ad289efdf15a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e7121f42544b65a4c82d685e323df064 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/VaseRandom.png.meta b/Assets/Sprites/VaseRandom.png.meta new file mode 100644 index 0000000..c95bf9f --- /dev/null +++ b/Assets/Sprites/VaseRandom.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 06bf72b80e8a4d745bb2c5c1140b4bbc +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 833db605b64315c47b2528e2f6aff2e5 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/WeaponBacchetta.png.meta b/Assets/Sprites/WeaponBacchetta.png.meta new file mode 100644 index 0000000..ba5be39 --- /dev/null +++ b/Assets/Sprites/WeaponBacchetta.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 152008e0599499d4da7fe8004a6dd21a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 3a99f61a47ce2504dab76cfe4ec866f8 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/WeaponScettro.png.meta b/Assets/Sprites/WeaponScettro.png.meta new file mode 100644 index 0000000..cb0795b --- /dev/null +++ b/Assets/Sprites/WeaponScettro.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 550d4a800d7923c4cbd0963e4e8b8ef6 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e2c9eed647f66574887eb1ab33131bee + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/WeaponSpadina.png.meta b/Assets/Sprites/WeaponSpadina.png.meta new file mode 100644 index 0000000..a1616fa --- /dev/null +++ b/Assets/Sprites/WeaponSpadina.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 0b83d7efeff86e3458c4860e3760ab38 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 3f2a65579f1791c4091b0a8087a52763 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/WeaponSpadone.png.meta b/Assets/Sprites/WeaponSpadone.png.meta new file mode 100644 index 0000000..6cba259 --- /dev/null +++ b/Assets/Sprites/WeaponSpadone.png.meta @@ -0,0 +1,90 @@ +fileFormatVersion: 2 +guid: 29a95eeaa590c2b468ff8382fa4459f1 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 10 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + platformSettings: + - serializedVersion: 2 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: e93eef1570d46f748a81ba0703422d96 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: