From 8250f7446d58d1ba949ddd39a84fab83b2b0f1de Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 28 Apr 2019 15:29:17 +0200 Subject: [PATCH] Add fonts and message bar --- Assets/Fonts.meta | 8 + Assets/Fonts/Font License.txt | 47 ++++ Assets/Fonts/Font License.txt.meta | 7 + Assets/Fonts/Pixel NES.otf | Bin 0 -> 21036 bytes Assets/Fonts/Pixel NES.otf.meta | 22 ++ Assets/Prefabs/GameController.prefab | 358 +++++++++++++++++++------- Assets/Scenes/Steffo.unity | 12 +- Assets/Scripts/Entity.cs | 2 +- Assets/Scripts/Item.cs | 5 +- Assets/Scripts/MessageBar.cs | 32 +++ Assets/Scripts/MessageBar.cs.meta | 11 + Assets/Scripts/TurnHandler.cs | 11 + ProjectSettings/InputManager.asset | 290 +-------------------- ProjectSettings/QualitySettings.asset | 181 ++----------- 14 files changed, 449 insertions(+), 537 deletions(-) create mode 100644 Assets/Fonts.meta create mode 100644 Assets/Fonts/Font License.txt create mode 100644 Assets/Fonts/Font License.txt.meta create mode 100644 Assets/Fonts/Pixel NES.otf create mode 100644 Assets/Fonts/Pixel NES.otf.meta create mode 100644 Assets/Scripts/MessageBar.cs create mode 100644 Assets/Scripts/MessageBar.cs.meta diff --git a/Assets/Fonts.meta b/Assets/Fonts.meta new file mode 100644 index 0000000..ee51604 --- /dev/null +++ b/Assets/Fonts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bc27f32bee5227b498f00e41f8d46138 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Font License.txt b/Assets/Fonts/Font License.txt new file mode 100644 index 0000000..5535f76 --- /dev/null +++ b/Assets/Fonts/Font License.txt @@ -0,0 +1,47 @@ +Shareware/ Font License + +Pixel Sagas Freeware Fonts EULA (End User License Agreement) and Software Inclusion Agreement + +"Purchaser" and "User" may be used interchangeably in this agreement. + +"Pixel Sagas" and "Neale Davidson" may be used interchangeably in this agreement. These all refer to the intellectual and legal property of Neale Davidson. + +Usage + +Pixel Saga's Shareware Fonts are free to use for personal, non-commercial purposes. No payment is necessary to use Pixel Saga's Freeware Fonts for personal use, and there is no limit to the amount of prints, pages, or other medium to be produced using them. However, you cannot offer the font for commercial sale, or offer for direct download. The inclusion of the font name and/or site URL in the credits or documentation when it is used is appreciated, but this is not mandatory. + +Payment + +Payment is not required for the use of Pixel Saga's Shareware Fonts. Commercial use requires a modest fee which can be paid through the pixelsagas.com web site through Paypal.com's services. The transaction receipt for any shareware "commercial license" purchase will suffice as proof of license. + +Support + +Font installation help is available at http://www.pixelsagas.com. If you experience problems with any Pixel Saga's Freeware font (such as spacing issues or missing characters), please verify that you have the correct and current version of the fonts. In the case of Freeware fonts, downloading the font directly from the Pixel Sagas site will ensure that the font files have not been altered. + +Software Inclusion Agreement + +Pixel Saga's software products are protected by copyright laws and International copyright treaties, as well as other intellectual property laws and treaties. All Pixel Saga's software products are licensed, not sold. + +1) GRANT OF LICENSE + +This document grants the user the following rights: + +Installation and Use. The user may install and use an unlimited number of copies of the software product. The user may not offer Pixel Sagas freeware fonts for direct download unless the user has received explicit, written permission from Neale Davidson. Otherwise please direct users to the http://www.pixelsagas.com website. Pixel Sagas freeware fonts may, however, be embedded for web, publication, or general software use. + +2) WARRANTIES + +None + +Pixel Sagas expressly disclaims any warranty for the software product. The software product and any related documentation is provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties or merchantability, fitness for a particular purpose, or non-infringement. The entire risk arising out of use or performance of the software product remains with the user. + +No Liability For Consequential Damages. + +In no event shall Neale Davidson or Pixel Sagas be liable for any damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or any other pecuniary loss) arising out of the use of or inability to use this product, even if Pixel Sagas has been advised of the possibility of such damages. + +3) MISCELLANEOUS + +Should the user have any questions concerning this document or you desire to contact Neale Davidson for any reason, please email jaynz@pixelsagas.com . + +Governing Law + +This agreement is governed by and subject to the laws of the United States of America. diff --git a/Assets/Fonts/Font License.txt.meta b/Assets/Fonts/Font License.txt.meta new file mode 100644 index 0000000..7c83289 --- /dev/null +++ b/Assets/Fonts/Font License.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: beeec18f10e42f742a316d4c2699c30f +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Fonts/Pixel NES.otf b/Assets/Fonts/Pixel NES.otf new file mode 100644 index 0000000000000000000000000000000000000000..b0d8b1484f2bfc975895fe51246e805c7793f3b3 GIT binary patch literal 21036 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 VFj#XKxM@R`pTPemD7BzG@?Tyk3o8Hs literal 0 HcmV?d00001 diff --git a/Assets/Fonts/Pixel NES.otf.meta b/Assets/Fonts/Pixel NES.otf.meta new file mode 100644 index 0000000..db8632c --- /dev/null +++ b/Assets/Fonts/Pixel NES.otf.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: feeeba28bb1da554f908645dd468e2ad +TrueTypeFontImporter: + externalObjects: {} + serializedVersion: 4 + fontSize: 16 + forceTextureCase: -2 + characterSpacing: 0 + characterPadding: 1 + includeFontData: 1 + fontName: Pixel NES + fontNames: + - Pixel NES + fallbackFontReferences: [] + customCharacters: + fontRenderingMode: 0 + ascentCalculationMode: 1 + useLegacyBoundsCalculation: 0 + shouldRoundAdvanceValue: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/GameController.prefab b/Assets/Prefabs/GameController.prefab index 6f07262..0ba0dce 100644 --- a/Assets/Prefabs/GameController.prefab +++ b/Assets/Prefabs/GameController.prefab @@ -30,7 +30,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 5737868752126517729} + - {fileID: 8182065397885380581} + - {fileID: 1331449797751746845} + - {fileID: 6763073704789207265} m_Father: {fileID: 1651829514} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -230,93 +232,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4498264905375096437 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 5737868752126517729} - - component: {fileID: 1444371758723586612} - - component: {fileID: 377224390999592314} - - component: {fileID: 964787956205872362} - m_Layer: 5 - m_Name: HP Bar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &5737868752126517729 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4498264905375096437} - 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: 1591973061} - m_RootOrder: 0 - 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: 100, y: 100} - m_Pivot: {x: 0, y: 0} ---- !u!222 &1444371758723586612 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4498264905375096437} - m_CullTransparentMesh: 0 ---- !u!114 &377224390999592314 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4498264905375096437} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 0 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_Sprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 2 - m_FillAmount: 1 - m_FillClockwise: 0 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 ---- !u!114 &964787956205872362 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4498264905375096437} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cbf8b0d2fd980e14f9956f5345d82ddc, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &5605884945823581445 GameObject: m_ObjectHideFlags: 0 @@ -395,6 +310,273 @@ MonoBehaviour: enemyPrefabs: - {fileID: 470211819356819165, guid: 1bd6e08f590fdd844854a34504aeaa4a, type: 3} enemiesToSpawn: 10 +--- !u!1 &6763073704789207264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6763073704789207265} + - component: {fileID: 6763073704789207267} + - component: {fileID: 6763073704789207266} + - component: {fileID: 6763073704789207260} + m_Layer: 5 + m_Name: Message Bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6763073704789207265 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6763073704789207264} + 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: 1591973061} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 30} + m_Pivot: {x: 0.5, y: 1} +--- !u!222 &6763073704789207267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6763073704789207264} + m_CullTransparentMesh: 0 +--- !u!114 &6763073704789207266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6763073704789207264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 12800000, guid: feeeba28bb1da554f908645dd468e2ad, type: 3} + m_FontSize: 18 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: PICKED UP 1000G. +--- !u!114 &6763073704789207260 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6763073704789207264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9584516e85b5cb54eab0c7dafa1094f1, type: 3} + m_Name: + m_EditorClassIdentifier: + disappearanceSpeed: 0.3 +--- !u!1 &7185017849687019145 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1331449797751746845} + - component: {fileID: 5318808085005978312} + - component: {fileID: 6406203509107481990} + - component: {fileID: 5816643265615328278} + m_Layer: 5 + m_Name: Filled HP Bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1331449797751746845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7185017849687019145} + 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: 1591973061} + m_RootOrder: 1 + 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: 100, y: 100} + m_Pivot: {x: 0, y: 0} +--- !u!222 &5318808085005978312 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7185017849687019145} + m_CullTransparentMesh: 0 +--- !u!114 &6406203509107481990 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7185017849687019145} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 1, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 2 + m_FillAmount: 1 + m_FillClockwise: 0 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &5816643265615328278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7185017849687019145} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cbf8b0d2fd980e14f9956f5345d82ddc, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &8182065397885380578 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8182065397885380581} + - component: {fileID: 8182065397885380582} + - component: {fileID: 8182065397885380583} + - component: {fileID: 8182065397885380580} + m_Layer: 5 + m_Name: Empty HP Bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8182065397885380581 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8182065397885380578} + 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: 1591973061} + m_RootOrder: 0 + 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: 100, y: 100} + m_Pivot: {x: 0, y: 0} +--- !u!222 &8182065397885380582 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8182065397885380578} + m_CullTransparentMesh: 0 +--- !u!114 &8182065397885380583 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8182065397885380578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0, b: 0, a: 1} + m_RaycastTarget: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 21300000, guid: f5be5362b22aa6c48993a720ec6c9b84, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 2 + m_FillAmount: 1 + m_FillClockwise: 0 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 +--- !u!114 &8182065397885380580 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8182065397885380578} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cbf8b0d2fd980e14f9956f5345d82ddc, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &8733140679003710819 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Steffo.unity b/Assets/Scenes/Steffo.unity index ed248a3..04255fb 100644 --- a/Assets/Scenes/Steffo.unity +++ b/Assets/Scenes/Steffo.unity @@ -120,7 +120,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &3195245191303068541 +--- !u!1001 &8182065398405294977 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -187,5 +187,15 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6763073704789207266, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: m_Text + value: Text goes here. + objectReference: {fileID: 0} + - target: {fileID: 6763073704789207266, guid: 4c25f33cb89f6624db48fc49d353a7f2, + type: 3} + propertyPath: m_FontData.m_RichText + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} diff --git a/Assets/Scripts/Entity.cs b/Assets/Scripts/Entity.cs index e1bd183..bae1035 100644 --- a/Assets/Scripts/Entity.cs +++ b/Assets/Scripts/Entity.cs @@ -24,7 +24,7 @@ public class Entity : MonoBehaviour protected TurnHandler turnHandler; protected Map map; - protected void Start() + protected virtual void Start() { spriteRenderer = GetComponent(); spriteRenderer.sprite = sprite; diff --git a/Assets/Scripts/Item.cs b/Assets/Scripts/Item.cs index 875349e..5d99cf6 100644 --- a/Assets/Scripts/Item.cs +++ b/Assets/Scripts/Item.cs @@ -4,11 +4,14 @@ using UnityEngine; public class Item : Entity { - private new void Start() { + protected override void Start() { + base.Start(); overlappable = true; } public virtual void OnPickup(Player player) { Debug.LogWarning("OnPickup not overridden"); + turnHandler.WriteToMessageBar("Picked up [NULL]."); + Destroy(gameObject); } } \ No newline at end of file diff --git a/Assets/Scripts/MessageBar.cs b/Assets/Scripts/MessageBar.cs new file mode 100644 index 0000000..e70ffe8 --- /dev/null +++ b/Assets/Scripts/MessageBar.cs @@ -0,0 +1,32 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class MessageBar : MonoBehaviour +{ + public float disappearanceSpeed = 0.3f; + private float opacity; + + private Text text; + + // Start is called before the first frame update + void Start() + { + text = GetComponent(); + opacity = 0f; + } + + public void Write(string message) { + text.text = message; + opacity = 1f; + } + + void Update() + { + if(opacity > 0f) { + opacity -= disappearanceSpeed * Time.deltaTime; + } + text.color = new Color(text.color.r, text.color.g, text.color.b, opacity); + } +} diff --git a/Assets/Scripts/MessageBar.cs.meta b/Assets/Scripts/MessageBar.cs.meta new file mode 100644 index 0000000..d67dcf1 --- /dev/null +++ b/Assets/Scripts/MessageBar.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9584516e85b5cb54eab0c7dafa1094f1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/TurnHandler.cs b/Assets/Scripts/TurnHandler.cs index 343618a..4493018 100644 --- a/Assets/Scripts/TurnHandler.cs +++ b/Assets/Scripts/TurnHandler.cs @@ -4,6 +4,17 @@ using UnityEngine; public class TurnHandler : MonoBehaviour { + private MessageBar messageBar; + + private void Start() { + GameObject canvas = GameObject.FindGameObjectWithTag("Canvas"); + messageBar = canvas.GetComponentInChildren(); + } + + public void WriteToMessageBar(string message) { + messageBar.Write(message); + } + public void OnTurn() { AI[] ais = gameObject.GetComponentsInChildren(); foreach(AI ai in ais) { diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 17c8f53..bdc6795 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -4,292 +4,4 @@ InputManager: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Axes: - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: left - positiveButton: right - altNegativeButton: a - altPositiveButton: d - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: down - positiveButton: up - altNegativeButton: s - altPositiveButton: w - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left ctrl - altNegativeButton: - altPositiveButton: mouse 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: mouse 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left shift - altNegativeButton: - altPositiveButton: mouse 2 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: space - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse X - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse Y - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse ScrollWheel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 2 - joyNum: 0 - - serializedVersion: 3 - m_Name: Horizontal - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 0 - type: 2 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 - invert: 1 - type: 2 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: return - altNegativeButton: - altPositiveButton: joystick button 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Submit - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: enter - altNegativeButton: - altPositiveButton: space - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Cancel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: escape - altNegativeButton: - altPositiveButton: joystick button 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 + m_Axes: [] diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index 4ae8c38..931c141 100644 --- a/ProjectSettings/QualitySettings.asset +++ b/ProjectSettings/QualitySettings.asset @@ -4,94 +4,10 @@ QualitySettings: m_ObjectHideFlags: 0 serializedVersion: 5 - m_CurrentQuality: 3 + m_CurrentQuality: 0 m_QualitySettings: - serializedVersion: 2 - name: Very Low - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 15 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - blendWeights: 1 - textureQuality: 1 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.3 - maximumLODLevel: 0 - particleRaycastBudget: 4 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Low - pixelLightCount: 0 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 0 - lodBias: 0.4 - maximumLODLevel: 0 - particleRaycastBudget: 16 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Medium - pixelLightCount: 1 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 1 - shadowDistance: 20 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 0 - blendWeights: 2 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 0 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 0.7 - maximumLODLevel: 0 - particleRaycastBudget: 64 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: High + name: Yes pixelLightCount: 2 shadows: 0 shadowResolution: 1 @@ -102,7 +18,7 @@ QualitySettings: shadowCascade2Split: 0.33333334 shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} shadowmaskMode: 1 - blendWeights: 2 + skinWeights: 2 textureQuality: 0 anisotropicTextures: 0 antiAliasing: 0 @@ -113,79 +29,30 @@ QualitySettings: vSyncCount: 1 lodBias: 1 maximumLODLevel: 0 + streamingMipmapsActive: 0 + streamingMipmapsAddAllCameras: 1 + streamingMipmapsMemoryBudget: 512 + streamingMipmapsRenderersPerFrame: 512 + streamingMipmapsMaxLevelReduction: 2 + streamingMipmapsMaxFileIORequests: 1024 particleRaycastBudget: 256 asyncUploadTimeSlice: 2 asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Very High - pixelLightCount: 3 - shadows: 0 - shadowResolution: 2 - shadowProjection: 1 - shadowCascades: 2 - shadowDistance: 70 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 1.5 - maximumLODLevel: 0 - particleRaycastBudget: 1024 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 - resolutionScalingFixedDPIFactor: 1 - excludedTargetPlatforms: [] - - serializedVersion: 2 - name: Ultra - pixelLightCount: 4 - shadows: 0 - shadowResolution: 0 - shadowProjection: 1 - shadowCascades: 4 - shadowDistance: 150 - shadowNearPlaneOffset: 3 - shadowCascade2Split: 0.33333334 - shadowCascade4Split: {x: 0.06666667, y: 0.2, z: 0.46666667} - shadowmaskMode: 1 - blendWeights: 4 - textureQuality: 0 - anisotropicTextures: 0 - antiAliasing: 0 - softParticles: 0 - softVegetation: 1 - realtimeReflectionProbes: 0 - billboardsFaceCameraPosition: 0 - vSyncCount: 1 - lodBias: 2 - maximumLODLevel: 0 - particleRaycastBudget: 4096 - asyncUploadTimeSlice: 2 - asyncUploadBufferSize: 16 + asyncUploadPersistentBuffer: 1 resolutionScalingFixedDPIFactor: 1 excludedTargetPlatforms: [] m_PerPlatformDefaultQuality: - Android: 2 - Nintendo 3DS: 5 - Nintendo Switch: 5 - PS4: 5 - PSM: 5 - PSP2: 2 - Standalone: 5 - Tizen: 2 - WebGL: 3 - WiiU: 5 - Windows Store Apps: 5 - XboxOne: 5 - iPhone: 2 - tvOS: 2 + Android: 0 + Nintendo 3DS: 0 + Nintendo Switch: 0 + PS4: 0 + PSM: 0 + PSP2: 0 + Standalone: 0 + Tizen: 0 + WebGL: 0 + WiiU: 0 + Windows Store Apps: 0 + XboxOne: 0 + iPhone: 0 + tvOS: 0