From be3161d7e4757e919f6c1c443568fd7499ca4957 Mon Sep 17 00:00:00 2001 From: Vladimir Koshevarov Date: Thu, 17 Nov 2022 16:12:51 +0200 Subject: [PATCH] show player energy, change daytimecontroller to TimeManager --- Assets/Characters/Read me.txt.meta | 7 - Assets/Scenes/CityOutside.unity | 386 +++++++++++++++++- Assets/Scripts/Actions/Eat.cs | 43 +- .../Actions/Interfaces/ISellableItem.cs | 2 +- Assets/Scripts/Actions/Relax.cs | 30 +- Assets/Scripts/GameUIController.cs | 20 +- Assets/Scripts/PlayerController.cs | 22 +- Assets/Scripts/Stat.cs | 82 ++-- .../{DateTimeController.cs => TimeManager.cs} | 222 +++++----- ...Controller.cs.meta => TimeManager.cs.meta} | 0 Assets/Textures/EnergyIcon.png | Bin 0 -> 1125 bytes Assets/Textures/EnergyIcon.png.meta | 134 ++++++ Assets/Textures/FoodIcon.png | Bin 0 -> 1190 bytes Assets/Textures/FoodIcon.png.meta | 134 ++++++ Assets/Characters/Read me.txt => Read me.txt | 0 15 files changed, 859 insertions(+), 223 deletions(-) delete mode 100644 Assets/Characters/Read me.txt.meta rename Assets/Scripts/{DateTimeController.cs => TimeManager.cs} (50%) rename Assets/Scripts/{DateTimeController.cs.meta => TimeManager.cs.meta} (100%) create mode 100644 Assets/Textures/EnergyIcon.png create mode 100644 Assets/Textures/EnergyIcon.png.meta create mode 100644 Assets/Textures/FoodIcon.png create mode 100644 Assets/Textures/FoodIcon.png.meta rename Assets/Characters/Read me.txt => Read me.txt (100%) diff --git a/Assets/Characters/Read me.txt.meta b/Assets/Characters/Read me.txt.meta deleted file mode 100644 index 5534c959..00000000 --- a/Assets/Characters/Read me.txt.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e8490bd42479d9b47ae3707927cf7937 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/CityOutside.unity b/Assets/Scenes/CityOutside.unity index 607741b8..bd917161 100644 --- a/Assets/Scenes/CityOutside.unity +++ b/Assets/Scenes/CityOutside.unity @@ -2978,10 +2978,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2649ed9748ff3864880311f1c2aecdef, type: 3} m_Name: m_EditorClassIdentifier: - _dateTimeController: {fileID: 307039699} _playerController: {fileID: 1476341271} _timeText: {fileID: 2089282903} _moneyText: {fileID: 443940496} + _energy: {fileID: 910851332} --- !u!1 &443940494 GameObject: m_ObjectHideFlags: 0 @@ -3242,6 +3242,7 @@ RectTransform: - {fileID: 2051386991} - {fileID: 1006389537} - {fileID: 1235246448} + - {fileID: 1613486730} m_Father: {fileID: 329780516} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3817,7 +3818,7 @@ GameObject: - component: {fileID: 779251536} - component: {fileID: 779251535} m_Layer: 5 - m_Name: MoneyIcon + m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -4872,6 +4873,96 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ea47665625ccfd4408f6411caf45f910, type: 3} +--- !u!1 &910851330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 910851331} + - component: {fileID: 910851332} + m_Layer: 5 + m_Name: Bar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &910851331 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910851330} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1208778161} + - {fileID: 1671838872} + m_Father: {fileID: 1613486730} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -4.39, y: -0.6} + m_SizeDelta: {x: -16.4603, y: -13.6867} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &910851332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 910851330} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 0 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 1671838872} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 100 + m_WholeNumbers: 0 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] --- !u!1 &931340241 GameObject: m_ObjectHideFlags: 0 @@ -5088,10 +5179,10 @@ RectTransform: m_Father: {fileID: 497576566} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -413.1, y: -17.039} - m_SizeDelta: {x: -1028.6992, y: 21.462} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -15.599976, y: -16.3} + m_SizeDelta: {x: 147.30078, y: 21.462} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1023905085 stripped MonoBehaviour: @@ -5132,7 +5223,7 @@ GameObject: - component: {fileID: 1030855394} - component: {fileID: 1030855393} m_Layer: 5 - m_Name: CalendarIcon + m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -5151,7 +5242,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1235246448} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -5395,7 +5486,7 @@ Mesh: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: pb_Mesh26922 + m_Name: pb_Mesh23968 serializedVersion: 10 m_SubMeshes: - serializedVersion: 2 @@ -5894,6 +5985,82 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1194898190} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1208778160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1208778161} + - component: {fileID: 1208778163} + - component: {fileID: 1208778162} + m_Layer: 5 + m_Name: Border + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1208778161 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208778160} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 910851331} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -0.22940063, y: 0} + m_SizeDelta: {x: 0.4588, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1208778162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208778160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.2677999, g: 0.3081395, b: 0.3207547, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1208778163 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1208778160} + m_CullTransparentMesh: 1 --- !u!1 &1232329904 GameObject: m_ObjectHideFlags: 0 @@ -6019,14 +6186,14 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 2089282902} - {fileID: 1030855392} + - {fileID: 2089282902} m_Father: {fileID: 497576566} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -265.0797, y: -17.039} + m_AnchoredPosition: {x: 132.42029, y: -16.299986} m_SizeDelta: {x: 148.7307, y: 21.462} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1287883232 @@ -11295,7 +11462,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c802a0d9d32b0c04b841113e87b83e4b, type: 3} m_Name: m_EditorClassIdentifier: - Clock: 0 --- !u!114 &1476341272 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11602,6 +11768,44 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1579224152} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1613486729 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1613486730} + m_Layer: 5 + m_Name: Energy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1613486730 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613486729} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 910851331} + - {fileID: 1726465721} + m_Father: {fileID: 497576566} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -437.8, y: -17.039} + m_SizeDelta: {x: 100, y: 21.462} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1628496569 GameObject: m_ObjectHideFlags: 0 @@ -11686,6 +11890,82 @@ Transform: m_Father: {fileID: 274182514} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1671838871 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1671838872} + - component: {fileID: 1671838874} + - component: {fileID: 1671838873} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1671838872 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671838871} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 910851331} + 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.16749573, y: 0} + m_SizeDelta: {x: 0.58259, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1671838873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671838871} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.9245283, g: 0.6511125, b: 0.12646852, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10911, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1671838874 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1671838871} + m_CullTransparentMesh: 1 --- !u!1 &1682316605 GameObject: m_ObjectHideFlags: 0 @@ -12076,6 +12356,82 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1716045985} m_CullTransparentMesh: 1 +--- !u!1 &1726465720 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1726465721} + - component: {fileID: 1726465723} + - component: {fileID: 1726465722} + m_Layer: 5 + m_Name: Icon + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1726465721 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726465720} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1613486730} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -42.5, y: 0} + m_SizeDelta: {x: 13, y: 14} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1726465722 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726465720} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: dfe1a973babd6cc4bb1a418ed2f3562e, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1726465723 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1726465720} + m_CullTransparentMesh: 1 --- !u!1 &1791787532 GameObject: m_ObjectHideFlags: 0 @@ -12437,8 +12793,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.33900002, y: 0} m_AnchorMax: {x: 0.65355104, y: 0.5} - m_AnchoredPosition: {x: 4.5, y: -17.0386} - m_SizeDelta: {x: 807, y: 34.0772} + m_AnchoredPosition: {x: 4.38, y: -15.1362} + m_SizeDelta: {x: 807, y: 36.4047} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2051386992 MonoBehaviour: @@ -12644,7 +13000,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1235246448} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Actions/Eat.cs b/Assets/Scripts/Actions/Eat.cs index ae8a7015..1d11d8c7 100644 --- a/Assets/Scripts/Actions/Eat.cs +++ b/Assets/Scripts/Actions/Eat.cs @@ -1,22 +1,21 @@ -using Assets.Scripts.Actions.Interfaces; - -namespace Assets.Scripts.Actions -{ - public class Eat : BaseAction, ISellableItem - { - public double Price { get; private set; } - private int _energyPerTick; - public Eat(int duration, int energyPerTick, double price) : base(duration) - { - Price = price; - _energyPerTick = energyPerTick; - } - - - - public override void ApplyAction(PlayerController playerController) - { - playerController.foodEnergy.increase(_energyPerTick); - } - } -} +using Assets.Scripts.Actions.Interfaces; + +namespace Assets.Scripts.Actions +{ + public class Eat : BaseAction, ISellableItem + { + public float Price { get; private set; } + private int _energyPerTick; + public Eat(int duration, int energyPerTick, float price) : base(duration) + { + Price = price; + _energyPerTick = energyPerTick; + } + + + public override void ApplyAction(PlayerController playerController) + { + playerController.foodEnergy.increase(_energyPerTick); + } + } +} diff --git a/Assets/Scripts/Actions/Interfaces/ISellableItem.cs b/Assets/Scripts/Actions/Interfaces/ISellableItem.cs index 5f63ce0c..283ffb45 100644 --- a/Assets/Scripts/Actions/Interfaces/ISellableItem.cs +++ b/Assets/Scripts/Actions/Interfaces/ISellableItem.cs @@ -3,6 +3,6 @@ namespace Assets.Scripts.Actions.Interfaces { internal interface ISellableItem { - public double Price { get; } + public float Price { get; } } } diff --git a/Assets/Scripts/Actions/Relax.cs b/Assets/Scripts/Actions/Relax.cs index 5656e1f0..567cbbf1 100644 --- a/Assets/Scripts/Actions/Relax.cs +++ b/Assets/Scripts/Actions/Relax.cs @@ -1,15 +1,15 @@ -namespace Assets.Scripts.Actions -{ - public class Relax : BaseAction - { - private int _energyPerTick; - public Relax(int duration, int energyPerTick) : base(duration) - { - _energyPerTick = energyPerTick; - } - public override void ApplyAction(PlayerController playerController) - { - playerController.restEnergy.increase(_energyPerTick); - } - } -} +namespace Assets.Scripts.Actions +{ + public class Relax : BaseAction + { + private int _energyPerTick; + public Relax(int duration, int energyPerTick) : base(duration) + { + _energyPerTick = energyPerTick; + } + public override void ApplyAction(PlayerController playerController) + { + playerController.energy.increase(_energyPerTick); + } + } +} diff --git a/Assets/Scripts/GameUIController.cs b/Assets/Scripts/GameUIController.cs index b5a09a0f..f07e9296 100644 --- a/Assets/Scripts/GameUIController.cs +++ b/Assets/Scripts/GameUIController.cs @@ -1,11 +1,9 @@ using TMPro; using UnityEngine; +using UnityEngine.UI; public class GameUIController : MonoBehaviour { - [SerializeField] - private DateTimeController _dateTimeController; - [SerializeField] private PlayerController _playerController; @@ -15,23 +13,33 @@ public class GameUIController : MonoBehaviour [SerializeField] private TextMeshProUGUI _moneyText; + [SerializeField] + public Slider _energy; + // Start is called before the first frame update - void Start() + private void OnEnable() { + TimeManager.OnMinuteChanged += UpdateTime; + } + + private void OnDisable() + { + TimeManager.OnMinuteChanged -= UpdateTime; } // Update is called once per frame void Update() { _moneyText.text = $"${_playerController.money.Value}"; - UpdateTime(); + _energy.value = _playerController.energy.Value; + } private void UpdateTime() { if (_timeText != null) { - _timeText.text = _dateTimeController.CurrentTime.ToString("HH:mm"); + _timeText.text = TimeManager.CurrentTime.ToString(@"hh\:mm"); } } } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index be30f06f..c6115c12 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -4,10 +4,10 @@ using UnityEngine; public class PlayerController : MonoBehaviour { - public Stat money = new Stat("Money", 100.00); + public Stat money = new Stat("Money", 100.0f); public Stat rentAccount = new Stat("Rent Account", 0); public Stat foodEnergy = new Stat("Food Energy", 0); - public Stat restEnergy = new Stat("Rest Energy", 0); + public Stat energy = new Stat("Energy", 100); // bank public Stat bankAccount = new Stat("Bank Account", 0); @@ -40,11 +40,15 @@ public class PlayerController : MonoBehaviour public Stat tvItem = new Stat("Tv Item", 1500, 1); public Stat laptopItem = new Stat("Laptop Item", 3000, 1); + private void OnEnable() + { + TimeManager.OnMinuteChanged += DecreaseEnergy; + } - private int _day; - public int Clock; - - + private void OnDisable() + { + TimeManager.OnMinuteChanged -= DecreaseEnergy; + } // Start is called before the first frame update void Start() { @@ -53,13 +57,11 @@ public class PlayerController : MonoBehaviour // Update is called once per frame void Update() { - } - - public void StartNewDay() + public void DecreaseEnergy() { - Clock = 24; + energy.deduct(0.096f); // 24 hours it's 100, 100/1440=~0.096 per minute } public bool TryBuyAction(BaseAction action) diff --git a/Assets/Scripts/Stat.cs b/Assets/Scripts/Stat.cs index e6b64718..34ed2ca1 100644 --- a/Assets/Scripts/Stat.cs +++ b/Assets/Scripts/Stat.cs @@ -1,41 +1,41 @@ -public class Stat -{ - public string Name { get; set; } - public double Value { get; set; } - public double Price { get; set; } - public double Quantity { get; set; } - - public Stat(string name, double startValue) - { - Name = name; - Value = startValue; - } - - public Stat(string name, double price, double quantity) - { - Name = name; - Price = price; - Quantity = quantity; - } - - public void increase(double byAmount) - { - Value += byAmount; - } - - public bool deduct(double amount) - { - if (Value >= amount) - { - Value -= amount; - return true; - } - return false; - } - - public void forceDeduct(double amount) - { - Value -= amount; - } - -} +public class Stat +{ + public string Name { get; set; } + public float Value { get; set; } + public double Price { get; set; } + public double Quantity { get; set; } + + public Stat(string name, float startValue) + { + Name = name; + Value = startValue; + } + + public Stat(string name, float price, float quantity) + { + Name = name; + Price = price; + Quantity = quantity; + } + + public void increase(float byAmount) + { + Value += byAmount; + } + + public bool deduct(float amount) + { + if (Value >= amount) + { + Value -= amount; + return true; + } + return false; + } + + public void forceDeduct(float amount) + { + Value -= amount; + } + +} diff --git a/Assets/Scripts/DateTimeController.cs b/Assets/Scripts/TimeManager.cs similarity index 50% rename from Assets/Scripts/DateTimeController.cs rename to Assets/Scripts/TimeManager.cs index f2762ead..a3dc25be 100644 --- a/Assets/Scripts/DateTimeController.cs +++ b/Assets/Scripts/TimeManager.cs @@ -1,106 +1,116 @@ -using System; -using UnityEngine; - -public class DateTimeController : MonoBehaviour -{ - [SerializeField] - private float _timeMultiplier; - - [SerializeField] - private float _startHour; - - [SerializeField] - private Light _sunLight; - - [SerializeField] - private float _sunriseHour; - [SerializeField] - private float _sunsetHour; - - [SerializeField] - private Color _dayAmbientLight; - - [SerializeField] - private Color _nightAmbientLight; - - [SerializeField] - private AnimationCurve _lightChangeCurve; - - [SerializeField] - private float _maxSunLightIntensity; - - [SerializeField] - private Light _moonLight; - - [SerializeField] - private float _maxMoonLightIntensity; - - private TimeSpan _sunriseTime; - private TimeSpan _sunsetTime; - - private DateTime _currentTime; - - public DateTime CurrentTime => _currentTime; - - // Start is called before the first frame update - void Start() - { - _currentTime = DateTime.Now.Date + TimeSpan.FromHours(_startHour); - _sunriseTime = TimeSpan.FromHours(_sunriseHour); - _sunsetTime = TimeSpan.FromHours(_sunsetHour); - } - - // Update is called once per frame - void Update() - { - UpdateTime(); - RotateSun(); - } - - private void UpdateTime() - { - _currentTime = _currentTime.AddSeconds(Time.deltaTime * _timeMultiplier); - } - - private void RotateSun() - { - float sunLightRotation; - if (_currentTime.TimeOfDay > _sunriseTime && _currentTime.TimeOfDay < _sunsetTime) - { - TimeSpan sunriseToSunsetDuration = CalculateTimeDifference(_sunriseTime, _sunsetTime); - TimeSpan timeSinceSunrise = CalculateTimeDifference(_sunriseTime, _currentTime.TimeOfDay); - - double percentage = timeSinceSunrise.TotalMinutes / sunriseToSunsetDuration.TotalMinutes; - - sunLightRotation = Mathf.Lerp(0, 180, (float)percentage); - } - else - { - TimeSpan nightDuration = CalculateTimeDifference(_sunsetTime, _sunriseTime); - TimeSpan timeSinceSunset = CalculateTimeDifference(_sunsetTime, _currentTime.TimeOfDay); - - double percentage = timeSinceSunset.TotalMinutes / nightDuration.TotalMinutes; - - sunLightRotation = Mathf.Lerp(180, 360, (float)percentage); - } - _sunLight.transform.rotation = Quaternion.AngleAxis(sunLightRotation, Vector3.right); - } - - private void UpdateLightSettings() - { - float dotProduct = Vector3.Dot(_sunLight.transform.forward, Vector3.down); - _sunLight.intensity = Mathf.Lerp(0, _maxSunLightIntensity, _lightChangeCurve.Evaluate(dotProduct)); - _moonLight.intensity = Mathf.Lerp(_maxMoonLightIntensity, 0, _lightChangeCurve.Evaluate(dotProduct)); - RenderSettings.ambientLight = Color.Lerp(_nightAmbientLight, _dayAmbientLight, _lightChangeCurve.Evaluate(dotProduct)); - } - private TimeSpan CalculateTimeDifference(TimeSpan from, TimeSpan to) - { - TimeSpan diff = to - from; - if (diff.TotalSeconds < 0) - { - diff += TimeSpan.FromHours(24); - } - - return diff; - } -} +using System; +using UnityEngine; + +public class TimeManager : MonoBehaviour +{ + public static Action OnMinuteChanged; + + [SerializeField] + private float _startHour; + + [SerializeField] + private Light _sunLight; + + [SerializeField] + private float _sunriseHour; + [SerializeField] + private float _sunsetHour; + + [SerializeField] + private Color _dayAmbientLight; + + [SerializeField] + private Color _nightAmbientLight; + + [SerializeField] + private AnimationCurve _lightChangeCurve; + + [SerializeField] + private float _maxSunLightIntensity; + + [SerializeField] + private Light _moonLight; + + [SerializeField] + private float _maxMoonLightIntensity; + + private TimeSpan _sunriseTime; + private TimeSpan _sunsetTime; + + private float _timer; + + [SerializeField] + private float _minuteToRealTime = 0.5f; + + public static TimeSpan CurrentTime { get; private set; } + + // Start is called before the first frame update + void Start() + { + _timer = _minuteToRealTime; + CurrentTime = TimeSpan.Zero + TimeSpan.FromHours(_startHour); + _sunriseTime = TimeSpan.FromHours(_sunriseHour); + _sunsetTime = TimeSpan.FromHours(_sunsetHour); + } + + // Update is called once per frame + void Update() + { + UpdateTime(); + //RotateSun(); + } + + private void UpdateTime() + { + _timer -= Time.deltaTime; + if (_timer <= 0) + { + CurrentTime = CurrentTime.Add(TimeSpan.FromMinutes(1)); + OnMinuteChanged?.Invoke(); + + _timer = _minuteToRealTime; + } + } + + //private void RotateSun() + //{ + // float sunLightRotation; + // if (_currentTime.TimeOfDay > _sunriseTime && _currentTime.TimeOfDay < _sunsetTime) + // { + // TimeSpan sunriseToSunsetDuration = CalculateTimeDifference(_sunriseTime, _sunsetTime); + // TimeSpan timeSinceSunrise = CalculateTimeDifference(_sunriseTime, _currentTime.TimeOfDay); + + // double percentage = timeSinceSunrise.TotalMinutes / sunriseToSunsetDuration.TotalMinutes; + + // sunLightRotation = Mathf.Lerp(0, 180, (float)percentage); + // } + // else + // { + // TimeSpan nightDuration = CalculateTimeDifference(_sunsetTime, _sunriseTime); + // TimeSpan timeSinceSunset = CalculateTimeDifference(_sunsetTime, _currentTime.TimeOfDay); + + // double percentage = timeSinceSunset.TotalMinutes / nightDuration.TotalMinutes; + + // sunLightRotation = Mathf.Lerp(180, 360, (float)percentage); + // } + // _sunLight.transform.rotation = Quaternion.AngleAxis(sunLightRotation, Vector3.right); + //} + + private void UpdateLightSettings() + { + float dotProduct = Vector3.Dot(_sunLight.transform.forward, Vector3.down); + _sunLight.intensity = Mathf.Lerp(0, _maxSunLightIntensity, _lightChangeCurve.Evaluate(dotProduct)); + _moonLight.intensity = Mathf.Lerp(_maxMoonLightIntensity, 0, _lightChangeCurve.Evaluate(dotProduct)); + RenderSettings.ambientLight = Color.Lerp(_nightAmbientLight, _dayAmbientLight, _lightChangeCurve.Evaluate(dotProduct)); + } + private TimeSpan CalculateTimeDifference(TimeSpan from, TimeSpan to) + { + TimeSpan diff = to - from; + if (diff.TotalSeconds < 0) + { + diff += TimeSpan.FromHours(24); + } + + return diff; + } +} diff --git a/Assets/Scripts/DateTimeController.cs.meta b/Assets/Scripts/TimeManager.cs.meta similarity index 100% rename from Assets/Scripts/DateTimeController.cs.meta rename to Assets/Scripts/TimeManager.cs.meta diff --git a/Assets/Textures/EnergyIcon.png b/Assets/Textures/EnergyIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..87007ea26ffbaf87abae326ebe106750552ccf4b GIT binary patch literal 1125 zcmV-r1e*JaP)500001b5ch_0Itp) z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1NuosK~z{rt(Z$p z6G0fqzuj#MZFvMJf+CWb5EbJ=AkjpTpgi=V0*VI@CYnfMVq&~|@@~9%BOXjVsKLa< z2M{&!5%F;#>Ond9K){yL7Ab~8>9+2Fcc!#J%g)w+(spOIo$uHGeAAh)5}8ozv98LR z>gsEOVDMxt7L%e&OG+YFvOboo+v@q{lBSD88CWhcEYdp7^Jy&!#$*{N`3cFz}HB{v-&5YrDNzo3gc265}Hd z;vp{UUWP%Ah=M>ar$pUtldNS3&J4bG>p?S#10gQ!GGIW5WEBO`U1{>AxdPoC+(waw zHRfl95D#&=J30*LuxfBEBDa$?SG=rc$c!tgLR{{S1gboTV`4EH6@q~)C)&MqzGs5< z7$AN9+v)k+eA6(H7GKrkZ@}>S`pH`9>ggDz{h^1}H8jRW9?x)_K zU#us)tSocW&fxn=q#6wqva-xgI|C_-M1^jJ`0QRh9iryOuljYW;L5ox^)w$b4-X0D zjH)K+PdG-i;i&$&e#@hcu$A34#HYu~G8ckbDZ4F36dz+P>)QdBoXc{|v(IbK##H1A z0uCAHQq~p{KHSt0WG(Ca5*IjRloPBiq{5Uf0j^lxm$<+oqplI1D!jjA9}ZRVoD!A` zIbf&mm8^5FZ>ePUom)%({cO8Ar_+-5aXS83b_=9~}D97IDX! zujoh3z)TShyeiBI1mdpXT89yFr@$4}U;Fy2a>^4Z)fKdpKYE};VU-OC_nI61)IU_C zO;2vC2V)@~cLhqqfDRR2HXyf)sAbO#4ZJS-FCZ%`%Cu7+YG2gAsD{fQ=x>w$$iV_Dhkid+WgZYT8e2Kq)7n+D<<1tAzbS(AEuXYhC7Gf rf4C70h4Mx|eJ;(GGaNwdpDUt&N*+qPmg~7Y00000NkvXXu0mjfpo|56 literal 0 HcmV?d00001 diff --git a/Assets/Textures/EnergyIcon.png.meta b/Assets/Textures/EnergyIcon.png.meta new file mode 100644 index 00000000..771e175b --- /dev/null +++ b/Assets/Textures/EnergyIcon.png.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: dfe1a973babd6cc4bb1a418ed2f3562e +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 128 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/FoodIcon.png b/Assets/Textures/FoodIcon.png new file mode 100644 index 0000000000000000000000000000000000000000..e81a7f0a863374e1797d76bce9a2eab2f4623680 GIT binary patch literal 1190 zcmV;X1X=ruP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1UpGYK~z{ry_ijC z8%Gp?S8G|8Y|FA-7t4es{t1bzKuGDSZ73;iQhMm6gyfjy5C{}Xjy;voV+j-rZ7)em z54{w6Xs$gLN-GG#hN_eXBpm<9Kk~0^S(fF^_jX5O*IMmLM#=||oq03!-u%y#v`i-R z_Wu6<_gh7-Y$|hrl+UBqBm0XI<=7sZ=T=Sq64DpU+2BbxrT??hXY40j;a6D?mO(!!QlQQb>bAKH-s(kz^zi z(Qtf`PF$2SJJ^@{*O3R<85Da}bX^xY9SVhh*xA|ng1Y9&b+gn4PQ{R!mPU5$2JOtx z&tEE+%U_cmwlwwh^z>+nMB?`P`ucgvdpd69=qP=CeRqSwU_+->sB@B;yM_Ir&h*8V z-lXbOVA@owG1MPqX0A5VNvVVLYmE90ePw0kQ>8x^%+Tq9fdT&>DsX;+eRWHhscl4W zZ|^@U=?bF_ZES4Z0_xH!@9NVXQe0=;bm25i<^PXculuC3KWaQ zC`TvGRG12m&L^Dn7@aeZSG&MoOt1Eq4n$Bq9vd6G$1XK>Z2udS|Ah1ROhua*9UYaU zYMm(Q01nTRe9Kf=j57Mm;jlGenH~F59G60&pw&j)EUngegAJ+4=BlW?FN{1lJUslr z$_fV(&GIbA;X89L6rP`a2zkuvWVGBHz1)f7nrWGH!Y|`?vay7DSzN||7 z!XvcDY57}voLF65P091+!=K2Ts=WjBUm<0wscb1*@m>0$>wIMp5 zvlK}Q0_q+W0sSf7+Zn0v!wckN)y#qs2ia(sDOfYBz~<(rK}2x}qfxS++nKr-2q2zY zEnS&KK17_6h=6hmSwT!#0)vp}k}CFu>H$KdB)fdsYHh)q%B=lJ@(NOO>N<7Df%9!} zBc)@p*b}8PVVSgaI{k$5-;uIXdpnlPqM0|@3zknKUfWmM8lH}Mw6$n7TE8YOax{bz zJRS3HY7-L^XH@oBh*RRNIzOI{r4duz^ds+vbUv9(j;m}9Psi;*I?oFyVX^~yyC;r90S z3P(H3ZRq$ZEZD79^7;IKG_uFpMSe^DqS8%)sSMKui^5=v>&&3AU@B^`{iWQpn5;@;n4e-BGl>h($07*qoM6N<$ Eg5--j>Hq)$ literal 0 HcmV?d00001 diff --git a/Assets/Textures/FoodIcon.png.meta b/Assets/Textures/FoodIcon.png.meta new file mode 100644 index 00000000..00a362b2 --- /dev/null +++ b/Assets/Textures/FoodIcon.png.meta @@ -0,0 +1,134 @@ +fileFormatVersion: 2 +guid: bc479ad3f781c4540995d023a62d8c1d +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 64 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Characters/Read me.txt b/Read me.txt similarity index 100% rename from Assets/Characters/Read me.txt rename to Read me.txt