Merge branch 'melania-dev'

2022-12-29 16:51:41 +01:00 · 2022-12-29 16:51:41 +01:00 · 23657a87f0
commit 23657a87f0
parent b9b745d4fc d5886a233b
23 changed files with 1351 additions and 90 deletions
--- a/Assets/Resources/Chests/Gold.prefab
+++ b/Assets/Resources/Chests/Gold.prefab
@ -29,7 +29,6 @@ Transform:
  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: 4669568061092186073}
  m_RootOrder: 0
@ -96,6 +95,7 @@ GameObject:
  - component: {fileID: 4669568061092186078}
  - component: {fileID: 4669568061092186079}
  - component: {fileID: 330262631295867499}
+  - component: {fileID: 6711344301336823593}
  m_Layer: 0
  m_Name: Gold
  m_TagString: Untagged
@ -113,7 +113,6 @@ Transform:
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 58.59589, y: 32.941498, z: 20}
  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 805898525}
  m_Father: {fileID: 0}
@ -130,7 +129,6 @@ SpriteRenderer:
  m_CastShadows: 0
  m_ReceiveShadows: 0
  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
  m_MotionVectors: 1
  m_LightProbeUsage: 1
  m_ReflectionProbeUsage: 1
@ -216,3 +214,22 @@ MonoBehaviour:
    chestModel: {fileID: 4669568061092186072}
    ChestType: 2
    Content: []
+--- !u!95 &6711344301336823593
+Animator:
+  serializedVersion: 3
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4669568061092186072}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: a95209a8090661b429e3a7057efecd57, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
--- a/Assets/Resources/Dialogue/Wizard/ENG/WizardFirstMultiDialogue.asset
+++ b/Assets/Resources/Dialogue/Wizard/ENG/WizardFirstMultiDialogue.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 45b41589283138641ba006c2243b0637, type: 3}
  m_Name: WizardFirstMultiDialogue
  m_EditorClassIdentifier: 
-  SpeakerName: 
+  SpeakerName: Wizard
  CurrentDialogue: 0
  Dialogues:
  - Key: 0
--- a/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialPL.asset
+++ b/Assets/Resources/Dialogue/Wizard/PL/WizardFirstDialPL.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 06201cadd951bcc4db5fccaa01783060, type: 3}
  m_Name: WizardFirstDialPL
  m_EditorClassIdentifier: 
-  SpeakerName: 
+  SpeakerName: Czarodziej
  CurrentStep: 0
  DialogueSteps:
  - Header: Czarodziej
@ -105,4 +105,16 @@ MonoBehaviour:
      Buttons: []
    EndOfDialogueStepAction:
      m_PersistentCalls:
-        m_Calls: []
+        m_Calls:
+        - m_Target: {fileID: 0}
+          m_TargetAssemblyTypeName: NPCFollowing, Assembly-CSharp
+          m_MethodName: AfterAction
+          m_Mode: 1
+          m_Arguments:
+            m_ObjectArgument: {fileID: 0}
+            m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+            m_IntArgument: 0
+            m_FloatArgument: 0
+            m_StringArgument: 
+            m_BoolArgument: 0
+          m_CallState: 2
--- a/Assets/Resources/Dialogue/Wizard/PL/WizardFirstMultiDialPL.asset
+++ b/Assets/Resources/Dialogue/Wizard/PL/WizardFirstMultiDialPL.asset
@ -12,7 +12,7 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: 45b41589283138641ba006c2243b0637, type: 3}
  m_Name: WizardFirstMultiDialPL
  m_EditorClassIdentifier: 
-  SpeakerName: 
+  SpeakerName: Czarodziej
  CurrentDialogue: 0
  Dialogues:
  - Key: 0
--- a/Assets/Resources/Items/BlueFlower.asset
+++ b/Assets/Resources/Items/BlueFlower.asset
@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1c6df47a2440e8a49bef89083164fdc1, type: 3}
+  m_Name: BlueFlower
+  m_EditorClassIdentifier: 
+  id: 0
+  name: Blue Flower
+  description: 
+  level: 0
+  value: 0
+  image: {fileID: 1933597549513317440, guid: 72c80de1ab089794785daf50f8abf104, type: 3}
+  itemModel: {fileID: 3387129930833328243, guid: 5c48efafd760da142bcf6f288801042e, type: 3}
+  price: 1
+  useEffect:
+    m_PersistentCalls:
+      m_Calls: []
--- a/Assets/Resources/Items/BlueFlower.asset.meta
+++ b/Assets/Resources/Items/BlueFlower.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 321bfaa082b726548b1f409e331839cb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Items/BlueFlower.prefab
+++ b/Assets/Resources/Items/BlueFlower.prefab
@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &3387129930833328243
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 965398221295754595}
+  - component: {fileID: 2055847558228283381}
+  m_Layer: 0
+  m_Name: BlueFlower
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &965398221295754595
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3387129930833328243}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -8.275358, y: 2.759204, 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!212 &2055847558228283381
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3387129930833328243}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  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_ReceiveGI: 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: 3
+  m_Sprite: {fileID: 1933597549513317440, guid: 72c80de1ab089794785daf50f8abf104, 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
--- a/Assets/Resources/Items/BlueFlower.prefab.meta
+++ b/Assets/Resources/Items/BlueFlower.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 5c48efafd760da142bcf6f288801042e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Items/PinkFlower.asset
+++ b/Assets/Resources/Items/PinkFlower.asset
@ -0,0 +1,25 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1c6df47a2440e8a49bef89083164fdc1, type: 3}
+  m_Name: PinkFlower
+  m_EditorClassIdentifier: 
+  id: 0
+  name: Pink Flower
+  description: 
+  level: 0
+  value: 0
+  image: {fileID: 8806948917284211570, guid: 72c80de1ab089794785daf50f8abf104, type: 3}
+  itemModel: {fileID: 5019646560265096705, guid: 0ed8eb5c2ddbee84087f2251cc6455b5, type: 3}
+  price: 1
+  useEffect:
+    m_PersistentCalls:
+      m_Calls: []
--- a/Assets/Resources/Items/PinkFlower.asset.meta
+++ b/Assets/Resources/Items/PinkFlower.asset.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: ae8441119b2a5ee49acc3e94f560153c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/Items/PinkFlower.prefab
+++ b/Assets/Resources/Items/PinkFlower.prefab
@ -0,0 +1,84 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &5019646560265096705
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1493865818649188895}
+  - component: {fileID: 1866561710427959815}
+  m_Layer: 0
+  m_Name: PinkFlower
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1493865818649188895
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5019646560265096705}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -7.856002, y: 4.387472, 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!212 &1866561710427959815
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5019646560265096705}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  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_ReceiveGI: 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: 3
+  m_Sprite: {fileID: 8806948917284211570, guid: 72c80de1ab089794785daf50f8abf104, 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
--- a/Assets/Resources/Items/PinkFlower.prefab.meta
+++ b/Assets/Resources/Items/PinkFlower.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0ed8eb5c2ddbee84087f2251cc6455b5
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Resources/UiPanels/ChestPanel.prefab
+++ b/Assets/Resources/UiPanels/ChestPanel.prefab
@ -310,7 +310,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5331092055143140113
 RectTransform:
  m_ObjectHideFlags: 0
@ -479,8 +479,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: Chest
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
+  m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -504,8 +504,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 48
+  m_fontSizeBase: 48
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@ -642,6 +642,7 @@ MonoBehaviour:
    - Key: 1
      Value: Chest
  displayedValue: {fileID: 5331092055455069024}
+  displayedTextValue: {fileID: 0}
 --- !u!1 &5331092056807707114
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Resources/UiPanels/Dialogue/DialoguePanel.prefab
+++ b/Assets/Resources/UiPanels/Dialogue/DialoguePanel.prefab
@ -28,7 +28,6 @@ RectTransform:
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1.2, y: 6, z: 1}
-  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 2835830911057077560}
  m_RootOrder: 0
@ -108,7 +107,6 @@ RectTransform:
  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 1, y: 5, z: 1}
-  m_ConstrainProportionsScale: 0
  m_Children: []
  m_Father: {fileID: 2835830911057077560}
  m_RootOrder: 1
@ -147,11 +145,11 @@ MonoBehaviour:
    m_PersistentCalls:
      m_Calls: []
  m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 14
+    m_Font: {fileID: 12800000, guid: 4c8158bc12f65384e8b9b461951f45e0, type: 3}
+    m_FontSize: 0
    m_FontStyle: 0
    m_BestFit: 0
-    m_MinSize: 10
+    m_MinSize: 0
    m_MaxSize: 40
    m_Alignment: 0
    m_AlignByGeometry: 0
@ -188,7 +186,6 @@ RectTransform:
  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
  m_LocalPosition: {x: 0, y: 0, z: 0}
  m_LocalScale: {x: 0.95, y: 0.2, z: 1}
-  m_ConstrainProportionsScale: 0
  m_Children:
  - {fileID: 2835830909972040045}
  - {fileID: 2835830910843601522}
--- a/Assets/Resources/UiPanels/EquipmentPanel.prefab
+++ b/Assets/Resources/UiPanels/EquipmentPanel.prefab
@ -80,6 +80,81 @@ MonoBehaviour:
  m_Spacing: {x: 35, y: 0}
  m_Constraint: 0
  m_ConstraintCount: 1
+--- !u!1 &3645581844698704692
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8031422657696604112}
+  - component: {fileID: 4497529510512256180}
+  - component: {fileID: 979887493879276807}
+  m_Layer: 0
+  m_Name: Character
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8031422657696604112
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3645581844698704692}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -14.410756}
+  m_LocalScale: {x: 2.5, y: 2.5, z: 1}
+  m_Children: []
+  m_Father: {fileID: 6661176406092379127}
+  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: 50, y: 66}
+  m_SizeDelta: {x: 81.404, y: 132.921}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4497529510512256180
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3645581844698704692}
+  m_CullTransparentMesh: 1
+--- !u!114 &979887493879276807
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3645581844698704692}
+  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: 2641884549179919215, guid: 0c933d03180a3284590a9b1be2aa123d, 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!1 &5352872063262343913
 GameObject:
  m_ObjectHideFlags: 0
@ -390,6 +465,7 @@ RectTransform:
  - {fileID: 6661176407399442840}
  - {fileID: 4116106613650971739}
  - {fileID: 5233930375019896633}
+  - {fileID: 8031422657696604112}
  m_Father: {fileID: 6661176405948328694}
  m_RootOrder: 0
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -483,8 +559,8 @@ RectTransform:
  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: 0}
-  m_SizeDelta: {x: 200, y: 50}
+  m_AnchoredPosition: {x: 6, y: 2}
+  m_SizeDelta: {x: 239.785, y: 59.946}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6661176406604631022
 CanvasRenderer:
@ -516,8 +592,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: Equipment
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
+  m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -541,8 +617,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 48
+  m_fontSizeBase: 48
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@ -577,7 +653,7 @@ MonoBehaviour:
  m_VertexBufferAutoSizeReduction: 0
  m_useMaxVisibleDescender: 1
  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_margin: {x: 0, y: 0, z: 1.5301514, w: 0}
  m_isUsingLegacyAnimationComponent: 0
  m_isVolumetricText: 0
  m_hasFontAssetChanged: 0
--- a/Assets/Resources/UiPanels/InventoryPanel.prefab
+++ b/Assets/Resources/UiPanels/InventoryPanel.prefab
@ -34,8 +34,8 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: -20, y: -12.46}
-  m_SizeDelta: {x: 92, y: 30.081}
+  m_AnchoredPosition: {x: -18.7, y: -12.46}
+  m_SizeDelta: {x: 130.8507, y: 30.081}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4504096425441227888
 CanvasRenderer:
@ -128,7 +128,7 @@ MonoBehaviour:
  m_VertexBufferAutoSizeReduction: 0
  m_useMaxVisibleDescender: 1
  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0.08430481, z: 0, w: 0}
+  m_margin: {x: 0, y: 0.08430481, z: -20.846558, w: 0}
  m_isUsingLegacyAnimationComponent: 0
  m_isVolumetricText: 0
  m_hasFontAssetChanged: 0
@ -165,13 +165,14 @@ RectTransform:
  m_Children:
  - {fileID: 3709863386082553142}
  - {fileID: 4160897812758261683}
+  - {fileID: 4146880524016575058}
  m_Father: {fileID: 6528725967738540667}
  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}
-  m_AnchoredPosition: {x: 125, y: 7}
-  m_SizeDelta: {x: 100, y: 25}
+  m_AnchoredPosition: {x: 114.103, y: 7}
+  m_SizeDelta: {x: 108.718, y: 25}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5072486462454209631
 CanvasRenderer:
@ -211,6 +212,81 @@ MonoBehaviour:
  m_FillOrigin: 0
  m_UseSpriteMesh: 0
  m_PixelsPerUnitMultiplier: 1
+--- !u!1 &6706616562039612660
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4146880524016575058}
+  - component: {fileID: 8786302855310076116}
+  - component: {fileID: 9223173250793556587}
+  m_Layer: 0
+  m_Name: Coins
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4146880524016575058
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6706616562039612660}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: -194.91106}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 2181280109304687902}
+  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: 38.4, y: 0.76000977}
+  m_SizeDelta: {x: 16.255, y: 16.255}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8786302855310076116
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6706616562039612660}
+  m_CullTransparentMesh: 1
+--- !u!114 &9223173250793556587
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6706616562039612660}
+  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: -5703758344047898144, guid: 866adc2eb813e72438343756fc3b4e01, 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!1 &7510958097152264394
 GameObject:
  m_ObjectHideFlags: 0
@ -281,7 +357,7 @@ RectTransform:
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
  m_AnchorMin: {x: 0.5, y: 1}
  m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 20, y: -12.5}
+  m_AnchoredPosition: {x: 10.2, y: -12.5}
  m_SizeDelta: {x: 106.8214, y: 30}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8966794799687036646
@ -346,7 +422,7 @@ MonoBehaviour:
  m_fontSizeMin: 18
  m_fontSizeMax: 72
  m_fontStyle: 0
-  m_HorizontalAlignment: 4
+  m_HorizontalAlignment: 2
  m_VerticalAlignment: 512
  m_textAlignment: 65535
  m_characterSpacing: 0
@ -448,8 +524,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: Inventory
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
+  m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -473,8 +549,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 48
+  m_fontSizeBase: 48
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@ -993,3 +1069,4 @@ MonoBehaviour:
    - Key: 1
      Value: Inventory
  displayedValue: {fileID: 9124304227092242854}
+  displayedTextValue: {fileID: 0}
--- a/Assets/Resources/UiPanels/Shop/ShopPanel.prefab
+++ b/Assets/Resources/UiPanels/Shop/ShopPanel.prefab
@ -982,7 +982,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5331092055143140113
 RectTransform:
  m_ObjectHideFlags: 0
@ -1151,8 +1151,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: Shop
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
+  m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -1176,8 +1176,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 48
+  m_fontSizeBase: 48
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
--- a/Assets/Resources/UiPanels/SkillsPanel.prefab
+++ b/Assets/Resources/UiPanels/SkillsPanel.prefab
@ -264,7 +264,7 @@ MonoBehaviour:
  Headers:
    InstanceTemplates:
    - Key: 0
-      Value: "Si\u0142a"
+      Value: Sila
    - Key: 1
      Value: Strenght
  displayedValue: {fileID: 7957429322733181781}
@ -2301,8 +2301,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: Skills
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
+  m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -2326,8 +2326,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 48
+  m_fontSizeBase: 48
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@ -2460,7 +2460,7 @@ MonoBehaviour:
  Headers:
    InstanceTemplates:
    - Key: 0
-      Value: "Umiej\u0119tno\u015Bci"
+      Value: Umiejetnosci
    - Key: 1
      Value: Skills
  displayedValue: {fileID: 6979182002126622113}
--- a/Assets/Resources/UiPanels/TaskBox.prefab
+++ b/Assets/Resources/UiPanels/TaskBox.prefab
@ -68,7 +68,11 @@ MonoBehaviour:
  taskBox_body: {fileID: 3337243679785832160}
  title: {fileID: 3337243677751433640}
  content: {fileID: 3337243679043656668}
-  task: {fileID: 0}
+  task:
+    id: 0
+    title: 
+    description: 
+    difficulty: 0
 --- !u!1 &3337243677751433640
 GameObject:
  m_ObjectHideFlags: 0
@ -136,8 +140,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: Lorem ipsum title
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
+  m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -762,8 +766,8 @@ MonoBehaviour:
    nibh, et rhoncus dolor. Mauris lobortis volutpat ullamcorper. Etiam dictum consequat
    null
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
+  m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
--- a/Assets/Resources/UiPanels/TaskPanel.prefab
+++ b/Assets/Resources/UiPanels/TaskPanel.prefab
@ -357,8 +357,8 @@ MonoBehaviour:
      m_Calls: []
  m_text: Quests
  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
-  m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
+  m_fontAsset: {fileID: 11400000, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
+  m_sharedMaterial: {fileID: -4776278116225565339, guid: 0264833e418f9c347a60eea0d843662f, type: 2}
  m_fontSharedMaterials: []
  m_fontMaterial: {fileID: 0}
  m_fontMaterials: []
@ -382,8 +382,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 36
-  m_fontSizeBase: 36
+  m_fontSize: 48
+  m_fontSizeBase: 48
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@ -520,6 +520,7 @@ MonoBehaviour:
    - Key: 1
      Value: Quests
  displayedValue: {fileID: 4136979551422401453}
+  displayedTextValue: {fileID: 0}
 --- !u!1 &4136979552221407527
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Scenes/OutsideWizardsHouse.unity
+++ b/Assets/Scenes/OutsideWizardsHouse.unity
@ -793586,7 +793586,7 @@ TilemapRenderer:
  m_LightmapParameters: {fileID: 0}
  m_SortingLayerID: 0
  m_SortingLayer: 0
-  m_SortingOrder: 3
+  m_SortingOrder: 2
  m_ChunkSize: {x: 32, y: 32, z: 32}
  m_ChunkCullingBounds: {x: 0, y: 0, z: 0}
  m_MaxChunkCount: 16
--- a/Assets/Sound/ObjectSounds.meta
+++ b/Assets/Sound/ObjectSounds.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c454d3d2266d4d54da99b6f4ac537a27
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Materials/LiberationSans
+++ b/Materials/LiberationSans