Merge remote-tracking branch 'origin/master'

Assets/Palettes/dungeon_587.asset

@@ -0,0 +1,36 @@
+%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: 13312, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: dungeon_587
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: -8204593885250283506, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Transform:
+    e00: 1
+    e01: 0
+    e02: 0
+    e03: 0
+    e10: 0
+    e11: 1
+    e12: 0
+    e13: 0
+    e20: 0
+    e21: 0
+    e22: 1
+    e23: 0
+    e30: 0
+    e31: 0
+    e32: 0
+    e33: 1
+  m_InstancedGameObject: {fileID: 0}
+  m_Flags: 1
+  m_ColliderType: 1

Assets/Palettes/dungeon_587.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d4a0e0ab89699ba4a83f8faf52bbdbc0
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Lumberjack/ENG/LumberjackAfterDialENG.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: 06201cadd951bcc4db5fccaa01783060, type: 3}
+  m_Name: LumberjackAfterDialENG
+  m_EditorClassIdentifier: 
+  SpeakerName: Lumberjack
+  CurrentStep: 0
+  DialogueSteps:
+  - Header: Lumberjack
+    WasDisplayed: 0
+    ListOfSentences:
+    - Sentence: What a fine day!
+      Buttons: []
+    EndOfDialogueStepAction:
+      m_PersistentCalls:
+        m_Calls: []

Assets/Resources/Dialogue/Lumberjack/ENG/LumberjackAfterDialENG.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 8d66ed665924c7a4ba42a951d93caea7
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Lumberjack/ENG/LumberjackAfterMultiDialENG.asset

@@ -0,0 +1,19 @@
+%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: 45b41589283138641ba006c2243b0637, type: 3}
+  m_Name: LumberjackAfterMultiDialENG
+  m_EditorClassIdentifier: 
+  SpeakerName: Lumberjack
+  CurrentDialogue: 0
+  Dialogues:
+  - Key: 0
+    Value: {fileID: 11400000, guid: 8d66ed665924c7a4ba42a951d93caea7, type: 2}

Assets/Resources/Dialogue/Lumberjack/ENG/LumberjackAfterMultiDialENG.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 006af9d64adb4bd42be3d72e448ff86a
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Lumberjack/PL/LumberjackAfterDialPL.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: 06201cadd951bcc4db5fccaa01783060, type: 3}
+  m_Name: LumberjackAfterDialPL
+  m_EditorClassIdentifier: 
+  SpeakerName: Drwal
+  CurrentStep: 0
+  DialogueSteps:
+  - Header: Drwal
+    WasDisplayed: 0
+    ListOfSentences:
+    - Sentence: Jaki piekny dzien!
+      Buttons: []
+    EndOfDialogueStepAction:
+      m_PersistentCalls:
+        m_Calls: []

Assets/Resources/Dialogue/Lumberjack/PL/LumberjackAfterDialPL.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 592a1626927dbc64a99969537cfaf4f6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/Dialogue/Lumberjack/PL/LumberjackAfterMultiDialPL.asset

@@ -0,0 +1,19 @@
+%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: 45b41589283138641ba006c2243b0637, type: 3}
+  m_Name: LumberjackAfterMultiDialPL
+  m_EditorClassIdentifier: 
+  SpeakerName: Drwal
+  CurrentDialogue: 0
+  Dialogues:
+  - Key: 0
+    Value: {fileID: 11400000, guid: 592a1626927dbc64a99969537cfaf4f6, type: 2}

Assets/Resources/Dialogue/Lumberjack/PL/LumberjackAfterMultiDialPL.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9717b0d7c5470e4488a2c05222380ace
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Resources/GUI/Letter/ControlLetter.prefab

@@ -321,7 +321,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: OPEN SETTINGS
+  m_Text: OPEN SKILLS PANEL
 --- !u!1 &1295333951625532254
 GameObject:
   m_ObjectHideFlags: 0
@@ -680,7 +680,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: ESC
+  m_Text: U
 --- !u!1 &2738866775543504653
 GameObject:
   m_ObjectHideFlags: 0
@@ -959,7 +959,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: INTERACTION WITH OBJECTS
+  m_Text: OPEN INVENTORY
 --- !u!1 &4232041324529390980
 GameObject:
   m_ObjectHideFlags: 0
@@ -2201,7 +2201,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: E
+  m_Text: I
 --- !u!1 &9116174847400212058
 GameObject:
   m_ObjectHideFlags: 0

Assets/Scene Sprites/dungeon.png.meta

@@ -1742,6 +1742,30 @@ TextureImporter:
   - first:
       213: -1327494610502158651
     second: Column
+  - first:
+      213: -6535279209345025294
+    second: dungeon_580
+  - first:
+      213: 5478186761327079916
+    second: dungeon_581
+  - first:
+      213: -4370514332163419185
+    second: dungeon_582
+  - first:
+      213: 3758050488492249321
+    second: dungeon_583
+  - first:
+      213: -3843692784308425337
+    second: dungeon_584
+  - first:
+      213: -4601301688994747232
+    second: dungeon_585
+  - first:
+      213: -6492712280173417568
+    second: dungeon_586
+  - first:
+      213: -8204593885250283506
+    second: dungeon_587
   externalObjects: {}
   serializedVersion: 11
   mipmaps:
@@ -14010,7 +14034,7 @@ TextureImporter:
         width: 13
         height: 26
       alignment: 0
-      pivot: {x: 0, y: 0}
+      pivot: {x: 0.5, y: 0.5}
       border: {x: 0, y: 0, z: 1, w: 0}
       outline: []
       physicsShape: []
@@ -14022,6 +14046,174 @@ TextureImporter:
       indices: 
       edges: []
       weights: []
+    - serializedVersion: 2
+      name: dungeon_580
+      rect:
+        serializedVersion: 2
+        x: 745
+        y: 146
+        width: 14
+        height: 3
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 2fa7efa3f260e45a0800000000000000
+      internalID: -6535279209345025294
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: dungeon_581
+      rect:
+        serializedVersion: 2
+        x: 745
+        y: 169
+        width: 14
+        height: 5
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: ce1f522b5dd660c40800000000000000
+      internalID: 5478186761327079916
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: dungeon_582
+      rect:
+        serializedVersion: 2
+        x: 763
+        y: 153
+        width: 3
+        height: 14
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: fc355a1fe50d853c0800000000000000
+      internalID: -4370514332163419185
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: dungeon_583
+      rect:
+        serializedVersion: 2
+        x: 738
+        y: 153
+        width: 3
+        height: 14
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 9e0509e1207472430800000000000000
+      internalID: 3758050488492249321
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: dungeon_584
+      rect:
+        serializedVersion: 2
+        x: 752
+        y: 176
+        width: 5
+        height: 5
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 78d609507c578aac0800000000000000
+      internalID: -3843692784308425337
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: dungeon_585
+      rect:
+        serializedVersion: 2
+        x: 763
+        y: 176
+        width: 5
+        height: 5
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 0ac201b1e74e420c0800000000000000
+      internalID: -4601301688994747232
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: dungeon_586
+      rect:
+        serializedVersion: 2
+        x: 752
+        y: 185
+        width: 6
+        height: 7
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: 0ab627fb49045e5a0800000000000000
+      internalID: -6492712280173417568
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: dungeon_587
+      rect:
+        serializedVersion: 2
+        x: 763
+        y: 185
+        width: 5
+        height: 7
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: e089057c45d632e80800000000000000
+      internalID: -8204593885250283506
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
     outline: []
     physicsShape: []
     bones: []

Assets/Scene Sprites/dungeon_582.asset

@@ -0,0 +1,36 @@
+%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: 13312, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: dungeon_582
+  m_EditorClassIdentifier: 
+  m_Sprite: {fileID: -4370514332163419185, guid: 3a08fefc7df696140a7a44798f351457, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Transform:
+    e00: 1
+    e01: 0
+    e02: 0
+    e03: 0
+    e10: 0
+    e11: 1
+    e12: 0
+    e13: 0
+    e20: 0
+    e21: 0
+    e22: 1
+    e23: 0
+    e30: 0
+    e31: 0
+    e32: 0
+    e33: 1
+  m_InstancedGameObject: {fileID: 0}
+  m_Flags: 1
+  m_ColliderType: 1

Assets/Scene Sprites/dungeon_582.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f233a336c263be04b9eee378939d445e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/FinalCave.unity.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 6d29c730c97162247bbd642d1abec871
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Scenes/ForestWay.unity

@@ -24427,7 +24427,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 15
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &158070407
 GameObject:
@@ -51843,7 +51843,7 @@ Transform:
   - {fileID: 124878500}
   - {fileID: 2106866014}
   m_Father: {fileID: 0}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &329699091
 GameObject:
@@ -55173,7 +55173,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 557637066}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &411373426
 MonoBehaviour:
@@ -57016,7 +57016,6 @@ Transform:
   m_Children:
   - {fileID: 1288958687}
   - {fileID: 277471083}
-  - {fileID: 1564453899}
   - {fileID: 411373425}
   - {fileID: 627642924}
   - {fileID: 1216715598}
@@ -58011,7 +58010,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 557637066}
-  m_RootOrder: 4
+  m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &627642925
 MonoBehaviour:
@@ -105557,7 +105556,7 @@ Transform:
   - {fileID: 270516053}
   - {fileID: 464012281}
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &827196534
 GameObject:
@@ -106123,7 +106122,7 @@ RectTransform:
   - {fileID: 1101338460}
   - {fileID: 1738591102}
   m_Father: {fileID: 0}
-  m_RootOrder: 8
+  m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
@@ -112395,7 +112394,7 @@ RectTransform:
   - {fileID: 1902623420}
   - {fileID: 1132500037}
   m_Father: {fileID: 1866620309}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -112629,7 +112628,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 5
+  m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1051807162
 GameObject:
@@ -112755,7 +112754,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1059523633
 GameObject:
@@ -113229,7 +113228,7 @@ Transform:
   m_Children:
   - {fileID: 1343129543}
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1123755324
 GameObject:
@@ -114562,7 +114561,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 557637066}
-  m_RootOrder: 5
+  m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1216715599
 MonoBehaviour:
@@ -115217,7 +115216,7 @@ Transform:
   - {fileID: 1642726791}
   - {fileID: 1798826122}
   m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1251808200
 GameObject:
@@ -115683,7 +115682,7 @@ RectTransform:
   m_Children:
   - {fileID: 756706415}
   m_Father: {fileID: 1866620309}
-  m_RootOrder: 16
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -175032,7 +175031,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1288958686
 GameObject:
@@ -180599,7 +180598,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1343129542}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -4.663231, y: -0.34732246, z: 494.28693}
+  m_LocalPosition: {x: -4.663231, y: -0.34732246, z: 1000}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 1113185084}
@@ -180665,16 +180664,20 @@ MonoBehaviour:
   m_GameObject: {fileID: 1343129542}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 3a6e7fe9a7e85294fbf51884f7313f11, type: 3}
+  m_Script: {fileID: 11500000, guid: ce2c370efba4d2e43b409e7ec8429171, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   SpeakerName: 
   languageDetector:
-    InstanceTemplates: []
+    InstanceTemplates:
+    - Key: 1
+      Value: {fileID: 11400000, guid: 006af9d64adb4bd42be3d72e448ff86a, type: 2}
+    - Key: 0
+      Value: {fileID: 11400000, guid: 9717b0d7c5470e4488a2c05222380ace, type: 2}
   Dialogue: {fileID: 0}
   EndactionEventList: []
   keyToOpen: 101
-  CanBeOpened: 1
+  CanBeOpened: 0
   OpenInDefaultWay: 1
 --- !u!114 &1343129546
 MonoBehaviour:
@@ -180688,8 +180691,8 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: a13ccc76cd22a814287fc3a36a9cac71, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  Name: 
+  Name: Lumberjack
-  State: 1
+  State: 4
 --- !u!50 &1343129547
 Rigidbody2D:
   serializedVersion: 4
@@ -195633,7 +195636,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 7
+  m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1426214702
 GameObject:
@@ -212731,66 +212734,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1558260428}
   m_CullTransparentMesh: 1
---- !u!1 &1564453898
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1564453899}
-  - component: {fileID: 1564453900}
-  - component: {fileID: 1564453901}
-  m_Layer: 0
-  m_Name: GUIManager
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1564453899
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1564453898}
-  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: 557637066}
-  m_RootOrder: 2
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &1564453900
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1564453898}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7eb609cdc1298514cab9a9089dd8d0a1, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  LetterPanel: {fileID: 8636999769331509921, guid: 1a1e7f9847ca9ab44ba833cd1ab3f5fa, type: 3}
-  _panel: {fileID: 0}
---- !u!114 &1564453901
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1564453898}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 656bcb92d555a5648b47b93d932a64db, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  LetterPanel: {fileID: 8636999769331509921, guid: 3418fe5e426fc4c42948b088a01cb622, type: 3}
-  _panel: {fileID: 0}
 --- !u!1 &1564617193
 GameObject:
   m_ObjectHideFlags: 0
@@ -213734,6 +213677,119 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1648002761}
   m_CullTransparentMesh: 1
+--- !u!1 &1648011590
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1648011595}
+  - component: {fileID: 1648011594}
+  - component: {fileID: 1648011593}
+  - component: {fileID: 1648011592}
+  - component: {fileID: 1648011591}
+  m_Layer: 0
+  m_Name: GatewayCave
+  m_TagString: SceneTransition
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!114 &1648011591
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1648011590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 754d016cd82f48f408221e1d4f04a31a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  SaveController: {fileID: 1648011590}
+  gateway:
+    id: 0
+    currentMapName: 
+    coords: {x: 0.55, y: -10.48, z: 10}
+    nextMapName: TheCave
+    respawnCoords: {x: 0, y: -4.5, z: 10}
+  isEnabled: 1
+--- !u!114 &1648011592
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1648011590}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f8dbef2798cc8064f86e56d2bc02d2fa, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+--- !u!50 &1648011593
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1648011590}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 0
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 0
+--- !u!61 &1648011594
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1648011590}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 1, y: 1}
+  m_EdgeRadius: 0
+--- !u!4 &1648011595
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1648011590}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.55, y: -10.68, z: 0}
+  m_LocalScale: {x: 1.975, y: 1, z: 1}
+  m_Children: []
+  m_Father: {fileID: 0}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1650688809
 GameObject:
   m_ObjectHideFlags: 0
@@ -219114,7 +219170,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
       propertyPath: m_RootOrder
-      value: 6
+      value: 7
       objectReference: {fileID: 0}
     - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
       propertyPath: m_LocalPosition.x
@@ -219524,7 +219580,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 9
+  m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1767827228
 GameObject:
@@ -230602,10 +230658,10 @@ RectTransform:
   - {fileID: 41007156}
   - {fileID: 1677041282}
   - {fileID: 858875760}
-  - {fileID: 923578754}
   - {fileID: 1012123456}
-  - {fileID: 297422996}
+  - {fileID: 923578754}
   - {fileID: 1270194714}
+  - {fileID: 297422996}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -231400,7 +231456,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 557637066}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1933185460
 MonoBehaviour:
@@ -236486,7 +236542,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 17
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1960480817
 GameObject:

Assets/Scenes/TheCave.unity

@@ -1100,7 +1100,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &148988773
 MonoBehaviour:
@@ -1749,7 +1749,7 @@ PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Modification:
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 271685604}
     m_Modifications:
     - target: {fileID: 574776200439751497, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3}
       propertyPath: speed
@@ -1761,19 +1761,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3}
       propertyPath: m_RootOrder
-      value: 18
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -5.5
+      value: -0.55795527
       objectReference: {fileID: 0}
     - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 73.3
+      value: 3.4620895
       objectReference: {fileID: 0}
     - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 133.20683
+      value: 139.96782
       objectReference: {fileID: 0}
     - target: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3}
       propertyPath: m_LocalRotation.w
@@ -1809,6 +1809,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3}
+--- !u!4 &230804972 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 872844846741150863, guid: d17e5507719af6d41a75c8fe7ae731bf, type: 3}
+  m_PrefabInstance: {fileID: 230804971}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &241381573
 GameObject:
   m_ObjectHideFlags: 0
@@ -2262,7 +2267,8 @@ Transform:
   m_LocalPosition: {x: -4.9420447, y: 69.83791, z: -6.7609825}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 230804972}
   m_Father: {fileID: 0}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -207797,7 +207803,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
       propertyPath: m_RootOrder
-      value: 12
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 3079617781123838030, guid: 6b44df46620f48f41903e7858379f704, type: 3}
       propertyPath: m_LocalPosition.x

Assets/Scripts/REFACTORING/Application/Dialogue/Manager/DialogueManager.cs

@@ -110,8 +110,15 @@ public class DialogueManager : MonoBehaviour
             Dialogue.Dialogues.Add(new IndexValuePair<int, Dialogue>(dial.Key, Instantiate(dial.Value)));
         }*/
 
+        if(gameObject.GetComponent<NPC>().Name != null && gameObject.GetComponent<NPC>().Name != "")
+        {
+            Dialogue.SetSpeakerName(gameObject.GetComponent<NPC>().Name);
+        }
+        else
+        {
+            Dialogue.SetSpeakerName(PlayerPrefs.GetString("name"));
+        }
         
-        Dialogue.SetSpeakerName(PlayerPrefs.GetString("name"));
 
         // Bind setted actions
         BindEndActionsToDialogues();

Assets/Scripts/REFACTORING/Application/Tools/WindowPanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1fe885098cc096540acffbb0add86f45
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Sprites/NPCs/wizardattack.png.meta

@@ -0,0 +1,180 @@
+fileFormatVersion: 2
+guid: ebc6ad6d2c6846d49b3a7ba990eb7ac1
+TextureImporter:
+  internalIDToNameTable:
+  - first:
+      213: -1638209091992431666
+    second: wizardattack_0
+  - first:
+      213: -3421701355928184932
+    second: wizardattack_1
+  - first:
+      213: 6078624149011531771
+    second: wizardattack_2
+  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
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 0
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 2
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 16
+  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: 2048
+    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: 0
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites:
+    - serializedVersion: 2
+      name: wizardattack_0
+      rect:
+        serializedVersion: 2
+        x: 18
+        y: 98
+        width: 30
+        height: 29
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: ec3d9fba289e349e0800000000000000
+      internalID: -1638209091992431666
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: wizardattack_1
+      rect:
+        serializedVersion: 2
+        x: 56
+        y: 98
+        width: 33
+        height: 29
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: c979d68eebca380d0800000000000000
+      internalID: -3421701355928184932
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    - serializedVersion: 2
+      name: wizardattack_2
+      rect:
+        serializedVersion: 2
+        x: 96
+        y: 96
+        width: 28
+        height: 31
+      alignment: 0
+      pivot: {x: 0, y: 0}
+      border: {x: 0, y: 0, z: 0, w: 0}
+      outline: []
+      physicsShape: []
+      tessellationDetail: 0
+      bones: []
+      spriteID: bf781f4257c9b5450800000000000000
+      internalID: 6078624149011531771
+      vertices: []
+      indices: 
+      edges: []
+      weights: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+  spritePackingTag: 
+  pSDRemoveMatte: 0
+  pSDShowRemoveMatteOption: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: