diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity
index 46d3f3efabd6f35d6f14013002cabb14c0031b56..51327d45c1bee31fa1c06ce6c37a6974d7f30f52 100644
--- a/Assets/Scenes/Level01.unity
+++ b/Assets/Scenes/Level01.unity
@@ -1044,8 +1044,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
- rgba: 4294967295
- m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+ rgba: 4278225151
+ m_fontColor: {r: 1, g: 0.5337493, b: 0, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -8017,6 +8017,140 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1.4878683, y: 0.8788283, z: 1.2891334}
m_Center: {x: 0.24413626, y: 0.35415924, z: 0.14878966}
+--- !u!1 &829077381
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 829077382}
+ - component: {fileID: 829077384}
+ - component: {fileID: 829077383}
+ m_Layer: 5
+ m_Name: Info
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!224 &829077382
+RectTransform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 829077381}
+ 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: 1040537966}
+ 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: 0, y: 100}
+ m_SizeDelta: {x: 1000, y: 50}
+ m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &829077383
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 829077381}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Press 'L' to open the shop
+ m_isRightToLeft: 0
+ m_fontAsset: {fileID: 11400000, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
+ m_sharedMaterial: {fileID: 2164040, guid: 5302535af1044152a457ed104f1f4b91, type: 2}
+ m_fontSharedMaterials: []
+ m_fontMaterial: {fileID: 0}
+ m_fontMaterials: []
+ m_fontColor32:
+ serializedVersion: 2
+ rgba: 4294311680
+ m_fontColor: {r: 0, g: 1, b: 0.960886, a: 1}
+ m_enableVertexGradient: 0
+ m_colorMode: 3
+ m_fontColorGradient:
+ topLeft: {r: 1, g: 1, b: 1, a: 1}
+ topRight: {r: 1, g: 1, b: 1, a: 1}
+ bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+ bottomRight: {r: 1, g: 1, b: 1, a: 1}
+ m_fontColorGradientPreset: {fileID: 0}
+ m_spriteAsset: {fileID: 11400000, guid: fbef3c704dce48f08a44612d6c856c8d, type: 2}
+ m_tintAllSprites: 0
+ m_StyleSheet: {fileID: 0}
+ m_TextStyleHashCode: -1183493901
+ m_overrideHtmlColors: 0
+ m_faceColor:
+ serializedVersion: 2
+ rgba: 4294967295
+ m_fontSize: 28
+ m_fontSizeBase: 28
+ m_fontWeight: 400
+ m_enableAutoSizing: 0
+ m_fontSizeMin: 18
+ m_fontSizeMax: 72
+ m_fontStyle: 0
+ m_HorizontalAlignment: 2
+ m_VerticalAlignment: 512
+ m_textAlignment: 65535
+ m_characterSpacing: 0
+ m_wordSpacing: 0
+ m_lineSpacing: 0
+ m_lineSpacingMax: 0
+ m_paragraphSpacing: 0
+ m_charWidthMaxAdj: 0
+ m_enableWordWrapping: 1
+ m_wordWrappingRatios: 0.4
+ m_overflowMode: 0
+ m_linkedTextComponent: {fileID: 0}
+ parentLinkedComponent: {fileID: 0}
+ m_enableKerning: 1
+ m_enableExtraPadding: 0
+ checkPaddingRequired: 0
+ m_isRichText: 1
+ m_parseCtrlCharacters: 1
+ m_isOrthographic: 1
+ m_isCullingEnabled: 0
+ m_horizontalMapping: 0
+ m_verticalMapping: 0
+ m_uvLineOffset: 0
+ m_geometrySortingOrder: 0
+ m_IsTextObjectScaleStatic: 0
+ m_VertexBufferAutoSizeReduction: 0
+ m_useMaxVisibleDescender: 1
+ m_pageToDisplay: 1
+ m_margin: {x: 0, y: 0, z: 0, w: 0}
+ m_isUsingLegacyAnimationComponent: 0
+ m_isVolumetricText: 0
+ m_hasFontAssetChanged: 0
+ m_baseMaterial: {fileID: 0}
+ m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!222 &829077384
+CanvasRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 829077381}
+ m_CullTransparentMesh: 1
--- !u!1 &837799651
GameObject:
m_ObjectHideFlags: 0
@@ -9889,6 +10023,7 @@ RectTransform:
- {fileID: 374433000}
- {fileID: 1079222898}
- {fileID: 161263487}
+ - {fileID: 829077382}
- {fileID: 206007650}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -11673,6 +11808,8 @@ MonoBehaviour:
m_EditorClassIdentifier:
player: {fileID: 944601036}
isShopActivated: 0
+ info: {fileID: 829077383}
+ error: {fileID: 161263488}
--- !u!1 &1260317323
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/ShopKeeper/ShopEffect.cs b/Assets/Scripts/ShopKeeper/ShopEffect.cs
index 92a25ac403df30b7642c46b4779f008c021df64b..8973c010d1b3c8d732900600876dd199b54d7944 100644
--- a/Assets/Scripts/ShopKeeper/ShopEffect.cs
+++ b/Assets/Scripts/ShopKeeper/ShopEffect.cs
@@ -1,6 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
+using TMPro;
namespace Nightmare
{
@@ -8,6 +9,8 @@ namespace Nightmare
{
public GameObject player;
public bool isShopActivated;
+ public TMP_Text info;
+ public TMP_Text error;
private Light shopLight;
@@ -21,9 +24,12 @@ namespace Nightmare
if (isShopActivated)
{
shopLight.enabled = true;
+ info.text = "Press 'L' to open the shop";
+ error.text = "";
}
else
{
+ info.text = "";
shopLight.enabled = false;
}
}