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 0000000..b0d8b14 Binary files /dev/null and b/Assets/Fonts/Pixel NES.otf differ 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 bd412a4..835ca33 100644 --- a/Assets/Prefabs/GameController.prefab +++ b/Assets/Prefabs/GameController.prefab @@ -1,5 +1,184 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &1591973060 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1591973061} + - component: {fileID: 1591973064} + - component: {fileID: 1591973063} + - component: {fileID: 1591973062} + m_Layer: 5 + m_Name: Canvas + m_TagString: Canvas + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1591973061 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591973060} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 8182065397885380581} + - {fileID: 1331449797751746845} + - {fileID: 6763073704789207265} + m_Father: {fileID: 1651829514} + 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: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &1591973064 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591973060} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1591973063 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591973060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &1591973062 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1591973060} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &1651829513 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1651829514} + m_Layer: 0 + m_Name: UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1651829514 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1651829513} + 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: + - {fileID: 1591973061} + - {fileID: 1816923098} + m_Father: {fileID: 1419775483983031142} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1816923097 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1816923098} + - component: {fileID: 1816923100} + m_Layer: 0 + m_Name: EventSystem + m_TagString: EventSystem + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1816923098 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816923097} + 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: 1651829514} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1816923100 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1816923097} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -619905303, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 --- !u!1 &1792584738874209504 GameObject: m_ObjectHideFlags: 0 @@ -29,6 +208,7 @@ Transform: m_Children: - {fileID: 8897064855631282258} - {fileID: 3789201758602335435} + - {fileID: 1651829514} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -82,28 +262,302 @@ MonoBehaviour: maxRoomIterations: 100 floorSprites: - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} + - {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, type: 3} - {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, type: 3} topWallSprites: - - {fileID: 21300000, guid: a6548c20c0b36384f9ba55aac5cd513d, type: 3} - - {fileID: 21300000, guid: de53d30fbdcfc2e458577832376fddc7, type: 3} + - {fileID: 0} botWallSprites: - - {fileID: 21300000, guid: 9c493dd4f06f0e6448ca0485a0aec85b, type: 3} - - {fileID: 21300000, guid: 9f7113f83f58bbc4b80539190bfc99b8, type: 3} + - {fileID: 21300000, guid: 82ccea6ce8f2edf4cae6f99e1127b0c3, type: 3} leftWallSprites: - - {fileID: 21300000, guid: 1c1ab193bd23fde40a1d3400075ccd26, type: 3} + - {fileID: 0} rightWallSprites: - - {fileID: 21300000, guid: 47816dfcc9e4290499aa0189a04a5560, type: 3} + - {fileID: 0} lCornerWallSprites: - - {fileID: 21300000, guid: 1f464248b697d4b459679fd8c4215983, type: 3} + - {fileID: 0} rCornerWallSprites: - - {fileID: 21300000, guid: 424d116bfc9d297468486f10739cb1b3, type: 3} + - {fileID: 0} tilePrefab: {fileID: 2955896503201886234, guid: 0e0b618b5499bbb40b076c0291d55487, type: 3} playerPrefab: {fileID: 2935319493830293412, guid: e8ff38be23e53db40a793f6959c6f4ec, type: 3} enemyPrefabs: + - {fileID: 470211819356819165, guid: 1bd6e08f590fdd844854a34504aeaa4a, type: 3} - {fileID: 1164136568549368904, guid: a4aeecfb369f0974490d158ef9489335, type: 3} - enemiesToSpawn: 10 + enemiesToSpawn: 15 +--- !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: 0 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Hello! I'm THE MESSAGE BAR! +--- !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: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 1, 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: 1 + 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: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 1, 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/Prefabs/Main Camera.prefab b/Assets/Prefabs/Main Camera.prefab deleted file mode 100644 index 572e376..0000000 --- a/Assets/Prefabs/Main Camera.prefab +++ /dev/null @@ -1,85 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &7475959774386308610 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7475959774386308609} - - component: {fileID: 7475959774386308608} - - component: {fileID: 7475959774386308611} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7475959774386308609 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7475959774386308610} - 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: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &7475959774386308608 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7475959774386308610} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0, g: 0, b: 0, 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: 7 - 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!81 &7475959774386308611 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7475959774386308610} - m_Enabled: 1 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index e43f461..0e27d8e 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -1,5 +1,88 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &2894367173346332696 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2894367173346332699} + - component: {fileID: 2894367173346332698} + - component: {fileID: 2894367173346332697} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2894367173346332699 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2894367173346332696} + 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: 2935319493830293414} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &2894367173346332698 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2894367173346332696} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0, g: 0, b: 0, 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: 8 + 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!81 &2894367173346332697 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2894367173346332696} + m_Enabled: 1 --- !u!1 &2935319493830293412 GameObject: m_ObjectHideFlags: 0 @@ -9,8 +92,9 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2935319493830293414} - - component: {fileID: 2935319493830293413} - component: {fileID: -5893075763862095451} + - component: {fileID: 2935319493830293413} + - component: {fileID: 8856581523727923621} m_Layer: 0 m_Name: Player m_TagString: Player @@ -33,23 +117,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &2935319493830293413 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2935319493830293412} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4de6b97c3d785d146a0df2c1c078fe91, type: 3} - m_Name: - m_EditorClassIdentifier: - hpMax: 0 - hp: 0 - sprite: {fileID: 21300000, guid: fe9c8eab186d5004eaad446d8e220800, type: 3} - exp: 0 - level: 0 --- !u!212 &-5893075763862095451 SpriteRenderer: m_ObjectHideFlags: 0 @@ -87,7 +154,7 @@ SpriteRenderer: m_SortingLayerID: -522733599 m_SortingLayer: 1 m_SortingOrder: 0 - m_Sprite: {fileID: 21300000, guid: fe9c8eab186d5004eaad446d8e220800, type: 3} + m_Sprite: {fileID: 21300000, guid: 88f4c277892ae9449a57b321cd810bce, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -98,78 +165,34 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &5734536248370648602 -PrefabInstance: +--- !u!114 &2935319493830293413 +MonoBehaviour: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 2935319493830293414} - m_Modifications: - - target: {fileID: 7475959774386308610, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_Name - value: Main Camera - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalPosition.z - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 04409c352bfbdea4b9830f11d7b4d40e, type: 3} ---- !u!4 &2894367173346332699 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7475959774386308609, guid: 04409c352bfbdea4b9830f11d7b4d40e, - type: 3} - m_PrefabInstance: {fileID: 5734536248370648602} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2935319493830293412} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f16e1b4841b0d4546a52853aafbb7d85, type: 3} + m_Name: + m_EditorClassIdentifier: + hpMax: 10 + overlappable: 0 + hp: 0 + sprite: {fileID: 0} + exp: 0 + level: 0 +--- !u!114 &8856581523727923621 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2935319493830293412} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cb881aee511ed643880a50159d731b7, type: 3} + m_Name: + m_EditorClassIdentifier: + damage: 1 diff --git a/Assets/Prefabs/Slime.prefab b/Assets/Prefabs/Slime.prefab index 30a9177..40d7ddf 100644 --- a/Assets/Prefabs/Slime.prefab +++ b/Assets/Prefabs/Slime.prefab @@ -9,8 +9,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2043533519980591455} - - component: {fileID: 571363246873614695} - component: {fileID: 1351652798109185028} + - component: {fileID: 571363246873614695} m_Layer: 0 m_Name: Slime m_TagString: Untagged @@ -32,22 +32,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &571363246873614695 -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: 2fcfe4b94620b234fb7a294bf4453a69, type: 3} - m_Name: - m_EditorClassIdentifier: - hpMax: 0 - hp: 0 - sprite: {fileID: 21300000, guid: ee7ef72c830dc204c9df0595e161f049, type: 3} - visionRange: 4 --- !u!212 &1351652798109185028 SpriteRenderer: m_ObjectHideFlags: 0 @@ -96,3 +80,21 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &571363246873614695 +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: 1ce1b6adc640d6f46bbf4d7072735b7f, type: 3} + m_Name: + m_EditorClassIdentifier: + hpMax: 2 + overlappable: 0 + hp: 0 + sprite: {fileID: 0} + moveChance: 0.5 + visionRange: 4 diff --git a/Assets/Prefabs/TEST Item.prefab b/Assets/Prefabs/TEST Item.prefab new file mode 100644 index 0000000..fc955a3 --- /dev/null +++ b/Assets/Prefabs/TEST Item.prefab @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &470211819356819165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 470211819356819163} + - component: {fileID: 470211819356819162} + - component: {fileID: 7501912107144583665} + m_Layer: 0 + m_Name: TEST Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &470211819356819163 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470211819356819165} + 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 &470211819356819162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470211819356819165} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cfb3c44da9ebb1840b5a2bcdfd5e2730, type: 3} + m_Name: + m_EditorClassIdentifier: + hpMax: 1 + overlappable: 0 + hp: 0 + sprite: {fileID: 0} +--- !u!212 &7501912107144583665 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 470211819356819165} + 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: 5e4d29e1adc2ea0429b199b82253416c, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 diff --git a/Assets/Prefabs/Main Camera.prefab.meta b/Assets/Prefabs/TEST Item.prefab.meta similarity index 74% rename from Assets/Prefabs/Main Camera.prefab.meta rename to Assets/Prefabs/TEST Item.prefab.meta index 03dd195..0ef57ec 100644 --- a/Assets/Prefabs/Main Camera.prefab.meta +++ b/Assets/Prefabs/TEST Item.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 04409c352bfbdea4b9830f11d7b4d40e +guid: 1bd6e08f590fdd844854a34504aeaa4a PrefabImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Steffo.unity b/Assets/Scenes/Steffo.unity index 1df960c..3a74977 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,137 +187,50 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 8182065397885380581, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} - propertyPath: leftWallSprites.Array.size + propertyPath: m_AnchorMin.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 8182065397885380581, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} - propertyPath: rightWallSprites.Array.size + propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 8182065397885380581, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} - propertyPath: topWallSprites.Array.size + propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1331449797751746845, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} - propertyPath: lCornerWallSprites.Array.size + propertyPath: m_AnchorMin.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1331449797751746845, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} - propertyPath: rCornerWallSprites.Array.size + propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 1331449797751746845, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} - propertyPath: botWallSprites.Array.size + propertyPath: m_Pivot.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 6406203509107481990, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} - propertyPath: floorSprites.Array.size - value: 10 + propertyPath: m_FillClockwise + value: 1 objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 6763073704789207266, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} - propertyPath: rightWallSprites.Array.data[0] - value: + propertyPath: m_Text + value: Hello! I'm THE MESSAGE BAR! objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, + - target: {fileID: 6763073704789207266, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} - propertyPath: leftWallSprites.Array.data[0] - value: + propertyPath: m_FontData.m_RichText + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: lCornerWallSprites.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: rCornerWallSprites.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: topWallSprites.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: topWallSprites.Array.data[1] - value: - objectReference: {fileID: 21300000, guid: de53d30fbdcfc2e458577832376fddc7, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: botWallSprites.Array.data[0] - value: - objectReference: {fileID: 21300000, guid: 82ccea6ce8f2edf4cae6f99e1127b0c3, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[0] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[1] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[2] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[3] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[4] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[5] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[6] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[7] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[8] - value: - objectReference: {fileID: 21300000, guid: e0e60c9a4ff0b8e429e6cfe316da9bbf, - type: 3} - - target: {fileID: 5602184811824951751, guid: 4c25f33cb89f6624db48fc49d353a7f2, - type: 3} - propertyPath: floorSprites.Array.data[9] - value: - objectReference: {fileID: 21300000, guid: fa4c9841fd8a5fb4f94ff78c95301065, - type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4c25f33cb89f6624db48fc49d353a7f2, type: 3} diff --git a/Assets/Scripts/AI.cs b/Assets/Scripts/AI.cs deleted file mode 100644 index fd30b46..0000000 --- a/Assets/Scripts/AI.cs +++ /dev/null @@ -1,10 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class AI : Entity -{ - public virtual void OnTurn(){ - Debug.LogWarning("OnTurn() not overridden"); - } -} \ No newline at end of file diff --git a/Assets/Scripts/Entity.cs b/Assets/Scripts/Entity.cs index f9549f1..c2cfe15 100644 --- a/Assets/Scripts/Entity.cs +++ b/Assets/Scripts/Entity.cs @@ -4,13 +4,11 @@ using UnityEngine; public class Entity : MonoBehaviour { - public int hpMax; + public float hpMax; + public bool overlappable = false; [AfterStartAttribute] - public int hp; - - [BeforeStartAttribute] - public Sprite sprite; + public float hp; public Vector2Int MapPosition { get { @@ -22,14 +20,21 @@ public class Entity : MonoBehaviour protected SpriteRenderer spriteRenderer; protected TurnHandler turnHandler; protected Map map; + protected MessageBar messageBar; - protected void Start() + protected virtual void Start() { spriteRenderer = GetComponent(); - spriteRenderer.sprite = sprite; gameController = GameObject.FindGameObjectWithTag("GameController"); turnHandler = gameController.GetComponentInChildren(); map = gameController.GetComponentInChildren(); + GameObject canvas = GameObject.FindGameObjectWithTag("Canvas"); + messageBar = canvas.GetComponentInChildren(); hp = hpMax; } + + public virtual void Die() { + Debug.LogWarning("Die not overridden"); + Destroy(gameObject); + } } diff --git a/Assets/Scripts/EntityItem.cs b/Assets/Scripts/EntityItem.cs new file mode 100644 index 0000000..1d62286 --- /dev/null +++ b/Assets/Scripts/EntityItem.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EntityItem : Entity +{ + public virtual string Name { + get { + Debug.LogWarning("No name given to an item"); + return ""; + } + } + + protected override void Start() { + base.Start(); + overlappable = true; + } + + public virtual void OnPickup(EntityPlayer player) { + Debug.LogWarning("OnPickup not overridden"); + messageBar.Write("Picked up: " + Name, Color.yellow); + Destroy(gameObject); + } + + public override void Die() { + messageBar.Write("Destroyed: " + Name, Color.red); + Destroy(gameObject); + } +} \ No newline at end of file diff --git a/Assets/Scripts/AISlime.cs.meta b/Assets/Scripts/EntityItem.cs.meta similarity index 83% rename from Assets/Scripts/AISlime.cs.meta rename to Assets/Scripts/EntityItem.cs.meta index 9c04775..45a55ad 100644 --- a/Assets/Scripts/AISlime.cs.meta +++ b/Assets/Scripts/EntityItem.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 2fcfe4b94620b234fb7a294bf4453a69 +guid: cfb3c44da9ebb1840b5a2bcdfd5e2730 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/EntityItemHeart.cs b/Assets/Scripts/EntityItemHeart.cs new file mode 100644 index 0000000..00f3983 --- /dev/null +++ b/Assets/Scripts/EntityItemHeart.cs @@ -0,0 +1,27 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EntityItemHeart : EntityItem +{ + public int regen; + protected EntityPlayer player; + public override string Name { + get { + return "Heart"; + } + } + // Start is called before the first frame update + protected new void Start() { + base.Start(); + player = GameObject.FindGameObjectWithTag("Player").GetComponent(); + } + + // Update is called once per frame + public override void OnPickup(EntityPlayer player) { + messageBar.Write("You used: " + Name, Color.yellow); + player.hp+=regen; + if (player.hp > player.hpMax) player.hp = player.hpMax; + Destroy(gameObject); + } +} diff --git a/Assets/Scripts/Player.cs.meta b/Assets/Scripts/EntityItemHeart.cs.meta similarity index 83% rename from Assets/Scripts/Player.cs.meta rename to Assets/Scripts/EntityItemHeart.cs.meta index 4cba488..57e6a34 100644 --- a/Assets/Scripts/Player.cs.meta +++ b/Assets/Scripts/EntityItemHeart.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4de6b97c3d785d146a0df2c1c078fe91 +guid: c07fddfe35675304f92b18a213875e74 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/EntityMonster.cs b/Assets/Scripts/EntityMonster.cs new file mode 100644 index 0000000..1a130b5 --- /dev/null +++ b/Assets/Scripts/EntityMonster.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EntityMonster : Entity +{ + public virtual string Name { + get { + Debug.LogWarning("No name given to a monster"); + return ""; + } + } + + public virtual void OnTurn(){ + Debug.LogWarning("OnTurn() not overridden"); + } + + public override void Die() { + messageBar.Write("Killed: " + Name, Color.red); + Destroy(gameObject); + } +} \ No newline at end of file diff --git a/Assets/Scripts/AI.cs.meta b/Assets/Scripts/EntityMonster.cs.meta similarity index 83% rename from Assets/Scripts/AI.cs.meta rename to Assets/Scripts/EntityMonster.cs.meta index 438e77b..1e746d3 100644 --- a/Assets/Scripts/AI.cs.meta +++ b/Assets/Scripts/EntityMonster.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: e694420377849854db7a2686ff36420c +guid: aec5e971190b4b544a78be24566f9e6c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/AISlime.cs b/Assets/Scripts/EntityMonsterSlime.cs similarity index 90% rename from Assets/Scripts/AISlime.cs rename to Assets/Scripts/EntityMonsterSlime.cs index 85306a3..7b49a38 100644 --- a/Assets/Scripts/AISlime.cs +++ b/Assets/Scripts/EntityMonsterSlime.cs @@ -2,15 +2,21 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -public class AISlime : AI +public class EntityMonsterSlime : EntityMonster { + public override string Name { + get { + return "Slime"; + } + } + public float moveChance = 0.5f; public float visionRange = 4; - protected Player player; + protected EntityPlayer player; protected new void Start() { base.Start(); - player = GameObject.FindGameObjectWithTag("Player").GetComponent(); + player = GameObject.FindGameObjectWithTag("Player").GetComponent(); } public override void OnTurn(){ diff --git a/Assets/Scripts/EntityMonsterSlime.cs.meta b/Assets/Scripts/EntityMonsterSlime.cs.meta new file mode 100644 index 0000000..3495293 --- /dev/null +++ b/Assets/Scripts/EntityMonsterSlime.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1ce1b6adc640d6f46bbf4d7072735b7f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/EntityPlayer.cs b/Assets/Scripts/EntityPlayer.cs new file mode 100644 index 0000000..2b04105 --- /dev/null +++ b/Assets/Scripts/EntityPlayer.cs @@ -0,0 +1,107 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public enum ControlMode { + Move, + Attack +} + +public class EntityPlayer : Entity +{ + protected ControlMode controlMode; + + protected override void Start() { + base.Start(); + controlMode = ControlMode.Move; + } + + protected void Update() + { + CheckForControlModeChange(); + if(controlMode == ControlMode.Move) CheckForMovementInput(); + if(controlMode == ControlMode.Attack) CheckForAttackInput(); + } + + protected void CheckForControlModeChange() { + if(Input.GetKeyDown(KeyCode.Escape)) { + controlMode = ControlMode.Move; + messageBar.Write("Control mode: Move", Color.cyan); + } + if(Input.GetKeyDown(KeyCode.A)) { + controlMode = ControlMode.Attack; + messageBar.Write("Control mode: Attack", Color.cyan); + } + } + + protected void CheckForAttackInput() { + bool hasAttacked = false; + if (Input.GetKeyDown(KeyCode.LeftArrow)) + { + hasAttacked = GetComponent().Attack(MapPosition + Vector2Int.left); + } + else if (Input.GetKeyDown(KeyCode.RightArrow)) + { + hasAttacked = GetComponent().Attack(MapPosition + Vector2Int.right); + } + else if (Input.GetKeyDown(KeyCode.UpArrow)) + { + hasAttacked = GetComponent().Attack(MapPosition + Vector2Int.up); + } + else if (Input.GetKeyDown(KeyCode.DownArrow)) + { + hasAttacked = GetComponent().Attack(MapPosition + Vector2Int.down); + } + if(hasAttacked) { + //Turn happens! + turnHandler.OnTurn(); + } + } + + protected void CheckForMovementInput() + { + bool hasMoved = false; + if (Input.GetKeyDown(KeyCode.LeftArrow)) + { + if (map.CanMoveTo(MapPosition + Vector2Int.left)) { + transform.Translate(Vector3.left); + hasMoved = true; + spriteRenderer.flipX = false; + } + } + else if (Input.GetKeyDown(KeyCode.RightArrow)) + { + if (map.CanMoveTo(MapPosition + Vector2Int.right)) { + transform.Translate(Vector3.right); + hasMoved = true; + spriteRenderer.flipX = true; + } + } + else if (Input.GetKeyDown(KeyCode.UpArrow)) + { + if (map.CanMoveTo(MapPosition + Vector2Int.up)) { + transform.Translate(Vector3.up); + hasMoved = true; + } + } + else if (Input.GetKeyDown(KeyCode.DownArrow)) + { + if (map.CanMoveTo(MapPosition + Vector2Int.down)) { + transform.Translate(Vector3.down); + hasMoved = true; + } + } + if(hasMoved) { + //Check for pickuppable items + List entities = turnHandler.GetEntitiesAtPosition(MapPosition); + foreach(Entity entity in entities) { + if(entity is EntityItem) { + EntityItem item = entity as EntityItem; + item.OnPickup(this); + } + } + //Turn happens! + turnHandler.OnTurn(); + } + } +} diff --git a/Assets/Scripts/EntityPlayer.cs.meta b/Assets/Scripts/EntityPlayer.cs.meta new file mode 100644 index 0000000..370a2be --- /dev/null +++ b/Assets/Scripts/EntityPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f16e1b4841b0d4546a52853aafbb7d85 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FillAmountFromPlayerHP.cs b/Assets/Scripts/FillAmountFromPlayerHP.cs new file mode 100644 index 0000000..be01f33 --- /dev/null +++ b/Assets/Scripts/FillAmountFromPlayerHP.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class FillAmountFromPlayerHP : MonoBehaviour +{ + private EntityPlayer player; + private Image image; + + private void Start() { + player = GameObject.FindGameObjectWithTag("Player").GetComponent(); + image = GetComponent(); + } + + private void Update() { + image.fillAmount = player.hp / player.hpMax; + } +} diff --git a/Assets/Scripts/FillAmountFromPlayerHP.cs.meta b/Assets/Scripts/FillAmountFromPlayerHP.cs.meta new file mode 100644 index 0000000..73cadf6 --- /dev/null +++ b/Assets/Scripts/FillAmountFromPlayerHP.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cbf8b0d2fd980e14f9956f5345d82ddc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 100 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Map.cs b/Assets/Scripts/Map.cs index 4d21307..a5f6c3d 100644 --- a/Assets/Scripts/Map.cs +++ b/Assets/Scripts/Map.cs @@ -124,10 +124,10 @@ public class Map : MonoBehaviour private List rooms; private TurnHandler turnHandler; - public Tile GetTile(Vector2Int position) { + public MapTile GetTile(Vector2Int position) { try { GameObject tileObject = tiles[position.x, position.y]; - return tileObject.GetComponent(); + return tileObject.GetComponent(); } catch(System.IndexOutOfRangeException) { return null; @@ -138,7 +138,11 @@ public class Map : MonoBehaviour { try { bool walkable = GetTile(position).walkable; - bool free = !(bool)turnHandler.GetEntityAtPosition(position); + List entities = turnHandler.GetEntitiesAtPosition(position); + bool free = true; + foreach(Entity entity in entities) { + free &= entity.overlappable; + } return walkable && free; } catch(System.IndexOutOfRangeException) { @@ -147,7 +151,7 @@ public class Map : MonoBehaviour } private void EditTile(Vector2Int position, bool walkable, bool roomPart) { - Tile tile = GetTile(position); + MapTile tile = GetTile(position); tile.walkable = walkable; tile.roomPart |= roomPart; } @@ -159,7 +163,7 @@ public class Map : MonoBehaviour tileObject.transform.position = new Vector3(x, y, 0); tiles[x, y] = tileObject; tileObject.name = "Tile [" + x.ToString() + ", " + y.ToString() + "]"; - Tile tile = tileObject.GetComponent(); + MapTile tile = tileObject.GetComponent(); tile.walkable = false; } } @@ -266,8 +270,8 @@ public class Map : MonoBehaviour public void GenerateTileSprites() { for(int x = 0; x < mapSize; x++) { for(int y = 0; y < mapSize; y++) { - Tile tile = GetTile(new Vector2Int(x, y)); - Tile otherTile; + MapTile tile = GetTile(new Vector2Int(x, y)); + MapTile otherTile; if(tile.walkable) tile.sprite = SampleSprite(floorSprites); else if((bool)(otherTile = GetTile(new Vector2Int(x, y+1))) && otherTile.walkable) tile.sprite = SampleSprite(botWallSprites); else if((bool)(otherTile = GetTile(new Vector2Int(x, y+1))) && otherTile.walkable) tile.sprite = SampleSprite(topWallSprites); diff --git a/Assets/Scripts/Tile.cs b/Assets/Scripts/MapTile.cs similarity index 90% rename from Assets/Scripts/Tile.cs rename to Assets/Scripts/MapTile.cs index 04dec14..847627a 100644 --- a/Assets/Scripts/Tile.cs +++ b/Assets/Scripts/MapTile.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using UnityEngine; -public class Tile : MonoBehaviour +public class MapTile : MonoBehaviour { public bool walkable; public bool roomPart; diff --git a/Assets/Scripts/Tile.cs.meta b/Assets/Scripts/MapTile.cs.meta similarity index 100% rename from Assets/Scripts/Tile.cs.meta rename to Assets/Scripts/MapTile.cs.meta diff --git a/Assets/Scripts/MessageBar.cs b/Assets/Scripts/MessageBar.cs new file mode 100644 index 0000000..1c2fc3d --- /dev/null +++ b/Assets/Scripts/MessageBar.cs @@ -0,0 +1,33 @@ +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, Color color) { + text.color = color; + 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/Player.cs b/Assets/Scripts/Player.cs deleted file mode 100644 index 8c1b16c..0000000 --- a/Assets/Scripts/Player.cs +++ /dev/null @@ -1,50 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Player : Entity -{ - public int exp; - public int level; - - void Update() - { - CheckForMovementInput(); - } - - void CheckForMovementInput() - { - bool hasMoved = false; - if (Input.GetKeyDown(KeyCode.A)) - { - if (map.CanMoveTo(MapPosition + Vector2Int.left)) { - transform.Translate(Vector3.left); - hasMoved = true; - } - } - else if (Input.GetKeyDown(KeyCode.D)) - { - if (map.CanMoveTo(MapPosition + Vector2Int.right)) { - transform.Translate(Vector3.right); - hasMoved = true; - } - } - else if (Input.GetKeyDown(KeyCode.W)) - { - if (map.CanMoveTo(MapPosition + Vector2Int.up)) { - transform.Translate(Vector3.up); - hasMoved = true; - } - } - else if (Input.GetKeyDown(KeyCode.S)) - { - if (map.CanMoveTo(MapPosition + Vector2Int.down)) { - transform.Translate(Vector3.down); - hasMoved = true; - } - } - if(hasMoved) { - turnHandler.OnTurn(); - } - } -} diff --git a/Assets/Scripts/PlayerAttack.cs b/Assets/Scripts/PlayerAttack.cs new file mode 100644 index 0000000..b9b5d11 --- /dev/null +++ b/Assets/Scripts/PlayerAttack.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerAttack : MonoBehaviour +{ + protected EntityPlayer player; + protected GameObject gameController; + protected TurnHandler turnHandler; + protected Map map; + + protected void Start() { + player = GetComponent(); + gameController = GameObject.FindGameObjectWithTag("GameController"); + turnHandler = gameController.GetComponentInChildren(); + map = gameController.GetComponentInChildren(); + } + + public virtual bool Attack(Vector2Int target) { + //Returns if the attack was successful. + Debug.LogWarning("Attack not overridden"); + return false; + } +} \ No newline at end of file diff --git a/Assets/Scripts/PlayerAttack.cs.meta b/Assets/Scripts/PlayerAttack.cs.meta new file mode 100644 index 0000000..86ea067 --- /dev/null +++ b/Assets/Scripts/PlayerAttack.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1bb56d02d177e9e4e9146940057ba1ad +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerAttackMelee.cs b/Assets/Scripts/PlayerAttackMelee.cs new file mode 100644 index 0000000..936f9da --- /dev/null +++ b/Assets/Scripts/PlayerAttackMelee.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerAttackMelee : PlayerAttack +{ + public float damage = 1f; + + public override bool Attack(Vector2Int target) { + List targetEntities = turnHandler.GetEntitiesAtPosition(target); + if(targetEntities.Count == 0) { + return false; + } + Entity targetEntity = targetEntities[0]; + targetEntity.hp -= damage; + return true; + } +} \ No newline at end of file diff --git a/Assets/Scripts/PlayerAttackMelee.cs.meta b/Assets/Scripts/PlayerAttackMelee.cs.meta new file mode 100644 index 0000000..9a4a586 --- /dev/null +++ b/Assets/Scripts/PlayerAttackMelee.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0cb881aee511ed643880a50159d731b7 +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 2e42807..3165f09 100644 --- a/Assets/Scripts/TurnHandler.cs +++ b/Assets/Scripts/TurnHandler.cs @@ -5,19 +5,28 @@ using UnityEngine; public class TurnHandler : MonoBehaviour { public void OnTurn() { - AI[] ais = gameObject.GetComponentsInChildren(); - foreach(AI ai in ais) { - ai.OnTurn(); + Entity[] entities = gameObject.GetComponentsInChildren(); + foreach(Entity entity in entities) { + //Check for deaths + if(entity.hp <= 0) { + entity.Die(); + } + //Move AIs + if(entity is EntityMonster) { + EntityMonster ai = entity as EntityMonster; + ai.OnTurn(); + } } } - public Entity GetEntityAtPosition(Vector2Int position) { + public List GetEntitiesAtPosition(Vector2Int position) { Entity[] entities = GetComponentsInChildren(); + List found = new List(); foreach(Entity entity in entities) { if(entity.MapPosition == position) { - return entity; + found.Add(entity); } } - return null; + return found; } } \ No newline at end of file diff --git a/Assets/Sprites/PurpleTileset.png.meta b/Assets/Sprites/PurpleTileset.png.meta index 2135d63..d707c21 100644 --- a/Assets/Sprites/PurpleTileset.png.meta +++ b/Assets/Sprites/PurpleTileset.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleTileset2.png.meta b/Assets/Sprites/PurpleTileset2.png.meta index ead95e1..a917f1a 100644 --- a/Assets/Sprites/PurpleTileset2.png.meta +++ b/Assets/Sprites/PurpleTileset2.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall.png.meta b/Assets/Sprites/PurpleWall.png.meta index 0b247f6..69faf9a 100644 --- a/Assets/Sprites/PurpleWall.png.meta +++ b/Assets/Sprites/PurpleWall.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_BOT.png.meta b/Assets/Sprites/PurpleWall_BOT.png.meta index 9534277..e258997 100644 --- a/Assets/Sprites/PurpleWall_BOT.png.meta +++ b/Assets/Sprites/PurpleWall_BOT.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_BOT2.png.meta b/Assets/Sprites/PurpleWall_BOT2.png.meta index bdb9313..a48e01c 100644 --- a/Assets/Sprites/PurpleWall_BOT2.png.meta +++ b/Assets/Sprites/PurpleWall_BOT2.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_BOTL.png.meta b/Assets/Sprites/PurpleWall_BOTL.png.meta index f6924d5..17118dd 100644 --- a/Assets/Sprites/PurpleWall_BOTL.png.meta +++ b/Assets/Sprites/PurpleWall_BOTL.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_BOTR.png.meta b/Assets/Sprites/PurpleWall_BOTR.png.meta index 9ad0d81..51fa314 100644 --- a/Assets/Sprites/PurpleWall_BOTR.png.meta +++ b/Assets/Sprites/PurpleWall_BOTR.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_BOTSteffo.png.meta b/Assets/Sprites/PurpleWall_BOTSteffo.png.meta index 1f4dbb5..df27471 100644 --- a/Assets/Sprites/PurpleWall_BOTSteffo.png.meta +++ b/Assets/Sprites/PurpleWall_BOTSteffo.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_LEFT.png.meta b/Assets/Sprites/PurpleWall_LEFT.png.meta index 085a82b..a029815 100644 --- a/Assets/Sprites/PurpleWall_LEFT.png.meta +++ b/Assets/Sprites/PurpleWall_LEFT.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_RIGHT.png.meta b/Assets/Sprites/PurpleWall_RIGHT.png.meta index 2f6a973..ff0d438 100644 --- a/Assets/Sprites/PurpleWall_RIGHT.png.meta +++ b/Assets/Sprites/PurpleWall_RIGHT.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_UP.png.meta b/Assets/Sprites/PurpleWall_UP.png.meta index c27a2af..81adde7 100644 --- a/Assets/Sprites/PurpleWall_UP.png.meta +++ b/Assets/Sprites/PurpleWall_UP.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_UP2.png.meta b/Assets/Sprites/PurpleWall_UP2.png.meta index 96c6eb9..cd5900c 100644 --- a/Assets/Sprites/PurpleWall_UP2.png.meta +++ b/Assets/Sprites/PurpleWall_UP2.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_UPL.png.meta b/Assets/Sprites/PurpleWall_UPL.png.meta index bf4dc99..38ecc4b 100644 --- a/Assets/Sprites/PurpleWall_UPL.png.meta +++ b/Assets/Sprites/PurpleWall_UPL.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/PurpleWall_UPR.png.meta b/Assets/Sprites/PurpleWall_UPR.png.meta index b86fc61..15929a6 100644 --- a/Assets/Sprites/PurpleWall_UPR.png.meta +++ b/Assets/Sprites/PurpleWall_UPR.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/Slime.png.meta b/Assets/Sprites/Slime.png.meta index 531e9f7..00088d7 100644 --- a/Assets/Sprites/Slime.png.meta +++ b/Assets/Sprites/Slime.png.meta @@ -31,7 +31,7 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 + filterMode: 2 aniso: -1 mipBias: -100 wrapU: 1 diff --git a/Assets/Sprites/WhiteSquare.png.meta b/Assets/Sprites/WhiteSquare.png.meta index 712c525..c8e935e 100644 --- a/Assets/Sprites/WhiteSquare.png.meta +++ b/Assets/Sprites/WhiteSquare.png.meta @@ -69,6 +69,28 @@ TextureImporter: allowsAlphaSplitting: 0 overridden: 0 androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + - serializedVersion: 2 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: 4 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/pg.png.meta b/Assets/Sprites/pg.png.meta new file mode 100644 index 0000000..7c72237 --- /dev/null +++ b/Assets/Sprites/pg.png.meta @@ -0,0 +1,112 @@ +fileFormatVersion: 2 +guid: 88f4c277892ae9449a57b321cd810bce +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: 2 + 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: 30 + 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 + - 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: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: ed1284666de20434aaac0772ac619792 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Flask-Server/dummy.py b/Flask-Server/dummy.py new file mode 100644 index 0000000..da31816 --- /dev/null +++ b/Flask-Server/dummy.py @@ -0,0 +1,3 @@ +import requests +r = requests.post("http://127.0.0.1:5000/message/2", data={'content':'Piano 2'}) +print(r.text) \ No newline at end of file diff --git a/Flask-Server/server.py b/Flask-Server/server.py new file mode 100644 index 0000000..287fec6 --- /dev/null +++ b/Flask-Server/server.py @@ -0,0 +1,58 @@ +from flask import Flask, session, url_for, redirect, request, render_template, abort, flash, Markup, json +from datetime import datetime +from flask_sqlalchemy import SQLAlchemy +import random +import os +from sqlalchemy.sql.expression import func + +app = Flask(__name__) +app.secret_key = "debug-attivo" +app.config['SQLALCHEMY_DATABASE_URI'] = 'sqlite:///db.sqlite' +app.config['SQLALCHEMY_TRACK_MODIFICATIONS'] = False +db = SQLAlchemy(app) +app.config.from_object(__name__) + + +# Database Classes go beyond this line + +class Message(db.Model): + mid = db.Column(db.Integer, primary_key=True) + floor = db.Column(db.Integer, nullable=False) + content = db.Column(db.String, nullable=False) + + def toJSON(self): + return {"Message": {'floor': self.floor, + 'content': self.content}} + + def __init__(self, content, floor): + self.content = content + self.floor = floor + + def __repr__(self): + return self.content + + +def give_json_response(floor): + messages = Message.query.filter_by(floor=floor).order_by(func.random()).limit(5).all() + return json.dumps([message.toJSON() for message in messages]) + + +# Website pages and API functions go beyond this line +@app.route("/message/", methods=["GET", "POST"]) +def page_message(floor): + if request.method == "GET": + return give_json_response(floor) + newmessage = Message(request.form['content'], floor) + db.session.add(newmessage) + db.session.commit() + return "Success." + + +if __name__ == "__main__": + # Se non esiste il database viene creato + if not os.path.isfile("db.sqlite"): + newmessage = Message("Welcome to the dungeon, mortal.", 1) + db.create_all() + db.session.add(newmessage) + db.session.commit() + app.run(debug=True) 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 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 73c55a1..819cd6d 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,9 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Canvas + - EventSystem layers: - Default - TransparentFX