diff --git a/Assets/Scenes/hospoda.unity b/Assets/Scenes/hospoda.unity
index 001ae2ec939992ae2b40648c98f8baa41e0119a5..9951f5b8e9d17b492052ab2204c60ea385c5350c 100644
--- a/Assets/Scenes/hospoda.unity
+++ b/Assets/Scenes/hospoda.unity
@@ -154,9 +154,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LoadingScreen: {fileID: 1974316356}
- SceneToLoadIndex: 1
+ SceneToLoad: namnesti_novy
ProgressBar: {fileID: 1974316355}
ProgressText: {fileID: 1974316353}
+ FloatingTextOffset: {x: 0, y: 200}
--- !u!65 &11079407
BoxCollider:
m_ObjectHideFlags: 0
@@ -4801,6 +4802,7 @@ Transform:
- {fileID: 2001424749}
- {fileID: 1121604066}
- {fileID: 11079408}
+ - {fileID: 1311516297}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -5919,6 +5921,36 @@ CapsuleCollider:
m_Height: 2.2
m_Direction: 1
m_Center: {x: 0, y: 0.8, z: 0}
+--- !u!1 &1311516296
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1311516297}
+ m_Layer: 0
+ m_Name: From_namnesti_novy
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1311516297
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1311516296}
+ m_LocalRotation: {x: 0, y: 0.92718387, z: 0, w: 0.37460664}
+ m_LocalPosition: {x: -7.51, y: 0, z: 5.08}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 991757214}
+ m_RootOrder: 3
+ m_LocalEulerAnglesHint: {x: 0, y: 136, z: 0}
--- !u!1 &1345257644 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8561182705715936555, guid: fc0569a6e82f9c54f89a1d2fa7aa68e9, type: 3}
@@ -7793,6 +7825,7 @@ Transform:
m_Children:
- {fileID: 1974316354}
- {fileID: 219852386}
+ - {fileID: 1830083851}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8241,6 +8274,68 @@ Transform:
m_CorrespondingSourceObject: {fileID: 90222651654754150, guid: 09d90488eb053fb4a9f2a96f428c1598, type: 3}
m_PrefabInstance: {fileID: 1500118682}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1830083850
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1712369299}
+ m_Modifications:
+ - target: {fileID: 3903489558206960120, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_Name
+ value: FloatingTextManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+--- !u!4 &1830083851 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ m_PrefabInstance: {fileID: 1830083850}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1855542355
GameObject:
m_ObjectHideFlags: 0
diff --git a/Assets/Scenes/les_novy.unity b/Assets/Scenes/les_novy.unity
index be8d63660bc51a0056bed34a91bdc93399ddc2d0..6adc782766c3e975eb19b975a80fdd067ac7583b 100644
--- a/Assets/Scenes/les_novy.unity
+++ b/Assets/Scenes/les_novy.unity
@@ -4872,6 +4872,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
PossibleDialogues:
- {fileID: 11400000, guid: e1584bd15ea0aea42a07d7bfe9108752, type: 2}
+ FloatingText: Press [E] to interact
+ FloatingTextOffset: {x: 0, y: 50}
+ ForceStart: 1
--- !u!1 &516962723
GameObject:
m_ObjectHideFlags: 0
@@ -7664,9 +7667,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LoadingScreen: {fileID: 1092580957}
- SceneToLoadIndex: 1
+ SceneToLoad: namnesti_novy
ProgressBar: {fileID: 1635875659}
ProgressText: {fileID: 205781563}
+ FloatingTextOffset: {x: 0, y: 200}
--- !u!1 &892624290
GameObject:
m_ObjectHideFlags: 0
@@ -8940,6 +8944,36 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1023938855}
m_Mesh: {fileID: -8007423518850538223, guid: 58282512c6ad5a7469a551ac36f87ef6, type: 3}
+--- !u!1 &1028412129
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1028412130}
+ m_Layer: 0
+ m_Name: From_namnesti_novy
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1028412130
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1028412129}
+ m_LocalRotation: {x: 0, y: 0.79499733, z: -0, w: -0.606613}
+ m_LocalPosition: {x: 16.921, y: 13.974, z: 8.447}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 1217830212}
+ m_RootOrder: 7
+ m_LocalEulerAnglesHint: {x: 0, y: 254.69, z: 0}
--- !u!1 &1030858697
GameObject:
m_ObjectHideFlags: 0
@@ -9360,6 +9394,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
PossibleDialogues:
- {fileID: 11400000, guid: 973712aba4604984da8a55ec85da2528, type: 2}
+ FloatingText: Press [E] to interact
+ FloatingTextOffset: {x: 0, y: 50}
+ ForceStart: 0
--- !u!135 &1063036810
SphereCollider:
m_ObjectHideFlags: 0
@@ -9715,7 +9752,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1130892409}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 0.126, y: 0, z: -0.177}
+ m_LocalPosition: {x: 0.149, y: 0.087, z: -0.605}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2076104775}
@@ -9732,8 +9769,8 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: -0.15, y: 0.75, z: 0.3}
+ m_Size: {x: 1, y: 0.78, z: 0.12}
+ m_Center: {x: -0.15, y: 0.84, z: 0.3}
--- !u!114 &1130892412
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -9748,6 +9785,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
PossibleDialogues:
- {fileID: 11400000, guid: 0f94634927524df47afa39d178418a55, type: 2}
+ FloatingText: Press [E] to interact
+ FloatingTextOffset: {x: 0, y: 230}
+ ForceStart: 0
--- !u!1 &1132145397
GameObject:
m_ObjectHideFlags: 0
@@ -10023,6 +10063,68 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a641e6842beaa0f4d98eea8f2892caa0, type: 3}
+--- !u!1001 &1148820654
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1244367655}
+ m_Modifications:
+ - target: {fileID: 3903489558206960120, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_Name
+ value: FloatingTextManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+--- !u!4 &1148820655 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ m_PrefabInstance: {fileID: 1148820654}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &1151110896 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 26e8be1521eb48f4ba2b4e81d67e31b2, type: 3}
@@ -10205,6 +10307,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
PossibleDialogues:
- {fileID: 11400000, guid: 953b59e411b02674e8b9552ae1fd56ca, type: 2}
+ FloatingText: Press [E] to interact
+ FloatingTextOffset: {x: 0, y: 50}
+ ForceStart: 0
--- !u!1001 &1194226080
PrefabInstance:
m_ObjectHideFlags: 0
@@ -10382,6 +10487,8 @@ Transform:
- {fileID: 1036935248}
- {fileID: 1563023586}
- {fileID: 878303734}
+ - {fileID: 1520151793}
+ - {fileID: 1028412130}
- {fileID: 1653808971}
m_Father: {fileID: 0}
m_RootOrder: 2
@@ -10678,6 +10785,7 @@ Transform:
m_Children:
- {fileID: 1092580958}
- {fileID: 1679171972}
+ - {fileID: 1148820655}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -13079,6 +13187,50 @@ Transform:
m_CorrespondingSourceObject: {fileID: 7610190878843345269, guid: b06f73fab0dde8249b133433815ec665, type: 3}
m_PrefabInstance: {fileID: 1504199897}
m_PrefabAsset: {fileID: 0}
+--- !u!1 &1520151792
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1520151793}
+ - component: {fileID: 1520151794}
+ m_Layer: 0
+ m_Name: Block
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 8
+ m_IsActive: 1
+--- !u!4 &1520151793
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1520151792}
+ m_LocalRotation: {x: -0, y: 0.056564998, z: -0, w: 0.99839896}
+ m_LocalPosition: {x: 24.01, y: 15.36, z: 8.49}
+ m_LocalScale: {x: 2.91, y: 3.9, z: 6.71}
+ m_Children: []
+ m_Father: {fileID: 1217830212}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 6.485, z: 0}
+--- !u!65 &1520151794
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1520151792}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 1, z: 1}
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1001 &1526423122
PrefabInstance:
m_ObjectHideFlags: 0
@@ -13220,6 +13372,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
PossibleDialogues:
- {fileID: 11400000, guid: 3e13b84e3a872f74cb2f0144c87e8fc2, type: 2}
+ FloatingText: Press [E] to interact
+ FloatingTextOffset: {x: 0, y: 50}
+ ForceStart: 0
--- !u!1001 &1541672909
PrefabInstance:
m_ObjectHideFlags: 0
@@ -14884,7 +15039,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1217830212}
- m_RootOrder: 6
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1653808972
MonoBehaviour:
@@ -14900,6 +15055,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
PossibleDialogues:
- {fileID: 11400000, guid: 55347ae24b2989d4191e4415290b17b9, type: 2}
+ FloatingText: Press [E] to interact
+ FloatingTextOffset: {x: 0, y: 50}
+ ForceStart: 1
--- !u!65 &1653808973
BoxCollider:
m_ObjectHideFlags: 0
@@ -14972,6 +15130,9 @@ MonoBehaviour:
m_EditorClassIdentifier:
PossibleDialogues:
- {fileID: 11400000, guid: 9e9b774a74a400a45b32b374e6386fbc, type: 2}
+ FloatingText: Press [E] to interact
+ FloatingTextOffset: {x: 0, y: 50}
+ ForceStart: 0
--- !u!1001 &1669022502
PrefabInstance:
m_ObjectHideFlags: 0
@@ -19225,15 +19386,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 192294369846045554, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
propertyPath: m_LocalPosition.x
- value: -13.05
+ value: -11.18
objectReference: {fileID: 0}
- target: {fileID: 192294369846045554, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
propertyPath: m_LocalPosition.y
- value: 14.743
+ value: 15.13
objectReference: {fileID: 0}
- target: {fileID: 192294369846045554, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
propertyPath: m_LocalPosition.z
- value: -2.21
+ value: 0.77
objectReference: {fileID: 0}
- target: {fileID: 192294369846045554, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
propertyPath: m_LocalRotation.x
diff --git a/Assets/Scenes/namnesti_novy.unity b/Assets/Scenes/namnesti_novy.unity
index c97b1224ff7757d045c1f0eed5c08cff9bedeae4..68bf256966ab0d10bd7fe45899e67902a5409011 100644
--- a/Assets/Scenes/namnesti_novy.unity
+++ b/Assets/Scenes/namnesti_novy.unity
@@ -192,11 +192,11 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3806098}
m_LocalRotation: {x: -0, y: 0.19751753, z: -0, w: 0.9802994}
- m_LocalPosition: {x: -6.25, y: 2.23, z: 4.48}
- m_LocalScale: {x: 1, y: 1, z: 1}
+ m_LocalPosition: {x: -4.008, y: 2.23, z: 7.209}
+ m_LocalScale: {x: 2.01, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356118354}
- m_RootOrder: 0
+ m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 22.784, z: 0}
--- !u!114 &3806101
MonoBehaviour:
@@ -211,9 +211,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LoadingScreen: {fileID: 183921478}
- SceneToLoadIndex: 0
+ SceneToLoad: les_novy
ProgressBar: {fileID: 183921477}
ProgressText: {fileID: 183921475}
+ FloatingTextOffset: {x: 0, y: 200}
--- !u!1 &7332591
GameObject:
m_ObjectHideFlags: 0
@@ -804,6 +805,10 @@ PrefabInstance:
propertyPath: m_StepOffset
value: 0.4
objectReference: {fileID: 0}
+ - target: {fileID: 8834128784280332218, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
+ propertyPath: m_Enabled
+ value: 1
+ objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3}
--- !u!1 &39363088 stripped
@@ -2511,6 +2516,68 @@ Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 43c3101c7f8346c4ebda8c3bc2fa0d92, type: 3}
m_PrefabInstance: {fileID: 182873767}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &172976034
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1515016271}
+ m_Modifications:
+ - target: {fileID: 3903489558206960120, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_Name
+ value: FloatingTextManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+--- !u!4 &172976035 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ m_PrefabInstance: {fileID: 172976034}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &183921474
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4930,9 +4997,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LoadingScreen: {fileID: 183921478}
- SceneToLoadIndex: 4
+ SceneToLoad: podzemi
ProgressBar: {fileID: 183921477}
ProgressText: {fileID: 183921475}
+ FloatingTextOffset: {x: 0, y: 200}
--- !u!65 &340743736
BoxCollider:
m_ObjectHideFlags: 0
@@ -4958,7 +5026,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356118354}
- m_RootOrder: 3
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: -73.334, z: 0}
--- !u!1 &352170653
GameObject:
@@ -5021,9 +5089,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LoadingScreen: {fileID: 183921478}
- SceneToLoadIndex: 2
+ SceneToLoad: hospoda
ProgressBar: {fileID: 183921477}
ProgressText: {fileID: 183921475}
+ FloatingTextOffset: {x: 0, y: 200}
--- !u!65 &354605923
BoxCollider:
m_ObjectHideFlags: 0
@@ -5049,7 +5118,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356118354}
- m_RootOrder: 1
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 11.294, z: 0}
--- !u!1 &356089031
GameObject:
@@ -5173,10 +5242,15 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
+ - {fileID: 1743125236}
- {fileID: 3806100}
+ - {fileID: 987192332}
- {fileID: 354605924}
+ - {fileID: 581202375}
- {fileID: 2143177432}
+ - {fileID: 1274213785}
- {fileID: 340743737}
+ - {fileID: 1541301165}
m_Father: {fileID: 65396993}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -7842,6 +7916,36 @@ MonoBehaviour:
pathIndex: 0
stopped: 0
leavingTown: 0
+--- !u!1 &581202374
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 581202375}
+ m_Layer: 0
+ m_Name: From_hospoda
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &581202375
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 581202374}
+ m_LocalRotation: {x: 0, y: 0.9961947, z: -0, w: -0.08715578}
+ m_LocalPosition: {x: 13.63, y: 0.26, z: 8.45}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 356118354}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: 190, z: 0}
--- !u!1001 &583503377
PrefabInstance:
m_ObjectHideFlags: 0
@@ -12691,6 +12795,36 @@ Transform:
m_Father: {fileID: 1764521202}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &987192331
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 987192332}
+ m_Layer: 0
+ m_Name: From_les_novy
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &987192332
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 987192331}
+ m_LocalRotation: {x: -0, y: 0.7963982, z: -0, w: 0.6047726}
+ m_LocalPosition: {x: -1.9, y: -0.14, z: 6.35}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 356118354}
+ m_RootOrder: 2
+ m_LocalEulerAnglesHint: {x: 0, y: 105.575, z: 0}
--- !u!1 &987965381 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -803139315038684655, guid: f3e3340fa93a0ef41bd284e4220e3f81, type: 3}
@@ -16274,6 +16408,36 @@ Transform:
m_Father: {fileID: 361365147}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 80.133, z: 0}
+--- !u!1 &1274213784
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1274213785}
+ m_Layer: 0
+ m_Name: From_radnice
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1274213785
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1274213784}
+ m_LocalRotation: {x: 0, y: 0.99554557, z: 0, w: 0.09428225}
+ m_LocalPosition: {x: 25.293, y: 0.33, z: 7.947}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 356118354}
+ m_RootOrder: 6
+ m_LocalEulerAnglesHint: {x: 0, y: 169.18, z: 0}
--- !u!1 &1278005938
GameObject:
m_ObjectHideFlags: 0
@@ -18572,6 +18736,7 @@ Transform:
m_Children:
- {fileID: 183921476}
- {fileID: 821848963}
+ - {fileID: 172976035}
m_Father: {fileID: 65396993}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -18766,6 +18931,36 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 2186430941476567602, guid: 03d07971b42795e46af9be9e12610ef5, type: 3}
+--- !u!1 &1541301164
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1541301165}
+ m_Layer: 0
+ m_Name: From_podzemi
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1541301165
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1541301164}
+ m_LocalRotation: {x: 0, y: 0.86065316, z: 0, w: 0.5091917}
+ m_LocalPosition: {x: 49.65, y: 0.231, z: 14.39}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 356118354}
+ m_RootOrder: 8
+ m_LocalEulerAnglesHint: {x: 0, y: 118.78, z: 0}
--- !u!1 &1542491001
GameObject:
m_ObjectHideFlags: 0
@@ -21234,6 +21429,50 @@ Transform:
m_Father: {fileID: 866842224}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &1743125235
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 1743125236}
+ - component: {fileID: 1743125238}
+ m_Layer: 0
+ m_Name: GateCollider
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &1743125236
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1743125235}
+ m_LocalRotation: {x: -0, y: 0.19751753, z: -0, w: 0.9802994}
+ m_LocalPosition: {x: -5.285, y: 2.23, z: 7.749}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 356118354}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 22.784, z: 0}
+--- !u!65 &1743125238
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 1743125235}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 1, y: 4.66, z: 10.26}
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &1754104681
GameObject:
m_ObjectHideFlags: 0
@@ -27245,9 +27484,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LoadingScreen: {fileID: 183921478}
- SceneToLoadIndex: 3
+ SceneToLoad: radnice
ProgressBar: {fileID: 183921477}
ProgressText: {fileID: 183921475}
+ FloatingTextOffset: {x: 0, y: 200}
--- !u!65 &2143177431
BoxCollider:
m_ObjectHideFlags: 0
@@ -27273,7 +27513,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 356118354}
- m_RootOrder: 2
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: -10.074, z: 0}
--- !u!23 &728604225990079094
MeshRenderer:
diff --git a/Assets/Scenes/podzemi.unity b/Assets/Scenes/podzemi.unity
index 31861c6ef579e619858a27c8696f58c50107e18c..64ff9602382467fc8ac05add54b05ef4d435240b 100644
--- a/Assets/Scenes/podzemi.unity
+++ b/Assets/Scenes/podzemi.unity
@@ -254,6 +254,68 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 36763567}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &42208627
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 522439370}
+ m_Modifications:
+ - target: {fileID: 3903489558206960120, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_Name
+ value: FloatingTextManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_RootOrder
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+--- !u!4 &42208628 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ m_PrefabInstance: {fileID: 42208627}
+ m_PrefabAsset: {fileID: 0}
--- !u!1001 &59802826
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1342,9 +1404,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LoadingScreen: {fileID: 1195526262}
- SceneToLoadIndex: 1
+ SceneToLoad: namnesti_novy
ProgressBar: {fileID: 1195526261}
ProgressText: {fileID: 1195526259}
+ FloatingTextOffset: {x: 0, y: 200}
--- !u!4 &207651122
Transform:
m_ObjectHideFlags: 0
@@ -2981,6 +3044,7 @@ Transform:
m_Children:
- {fileID: 1195526260}
- {fileID: 1265150572}
+ - {fileID: 42208628}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -4689,6 +4753,36 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 763ef5fb9f344e249be4b2167c232af8, type: 3}
+--- !u!1 &891848638
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 891848639}
+ m_Layer: 0
+ m_Name: From_namnesti_novy
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &891848639
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 891848638}
+ m_LocalRotation: {x: 0, y: 0.41786712, z: 0, w: 0.9085082}
+ m_LocalPosition: {x: 0.1756, y: 1.321, z: -11.1009}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 2135169221}
+ m_RootOrder: 1
+ m_LocalEulerAnglesHint: {x: 0, y: 49.4, z: 0}
--- !u!1 &903171182
GameObject:
m_ObjectHideFlags: 0
@@ -13413,6 +13507,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 207651122}
+ - {fileID: 891848639}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/Scenes/radnice.unity b/Assets/Scenes/radnice.unity
index 41559a429bab25fde88c052777d02d3f0b39ea8b..1d8e2eb23c2d5d76ffd5f7a9b715df7c7fc1b228 100644
--- a/Assets/Scenes/radnice.unity
+++ b/Assets/Scenes/radnice.unity
@@ -1701,6 +1701,9 @@ MonoBehaviour:
PossibleDialogues:
- {fileID: 11400000, guid: 2f39ebddd95744446a8495e91872e932, type: 2}
- {fileID: 11400000, guid: 8e8ae232cffff444783690dbebcfeefb, type: 2}
+ FloatingText: Press [E] to interact
+ FloatingTextOffset: {x: 0, y: 50}
+ ForceStart: 0
--- !u!65 &591014474
BoxCollider:
m_ObjectHideFlags: 0
@@ -3666,7 +3669,7 @@ BoxCollider:
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 1.1927673, y: 1, z: 1.2557275}
+ m_Size: {x: 1.73, y: 1, z: 1.2557275}
m_Center: {x: 0.09638368, y: 0, z: -0.0038945505}
--- !u!23 &1274824730
MeshRenderer:
@@ -3744,9 +3747,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
LoadingScreen: {fileID: 1462084838}
- SceneToLoadIndex: 1
+ SceneToLoad: namnesti_novy
ProgressBar: {fileID: 1462084837}
ProgressText: {fileID: 1462084836}
+ FloatingTextOffset: {x: 0, y: 200}
--- !u!4 &1344310453 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: c3bb32993c63ecf428b3c21431c46df5, type: 3}
@@ -3782,8 +3786,9 @@ Transform:
- {fileID: 1462084835}
- {fileID: 1861556606}
- {fileID: 1744015705}
+ - {fileID: 1533570785}
m_Father: {fileID: 0}
- m_RootOrder: 4
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1364988645 stripped
Transform:
@@ -4284,6 +4289,68 @@ Transform:
m_CorrespondingSourceObject: {fileID: 90222651654754150, guid: 09d90488eb053fb4a9f2a96f428c1598, type: 3}
m_PrefabInstance: {fileID: 1845972665}
m_PrefabAsset: {fileID: 0}
+--- !u!1001 &1533570784
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ m_TransformParent: {fileID: 1353409665}
+ m_Modifications:
+ - target: {fileID: 3903489558206960120, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_Name
+ value: FloatingTextManager
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_RootOrder
+ value: 3
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+--- !u!4 &1533570785 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: 3903489558206960123, guid: 67033b8396c8c6c4da47b8d93154ff3c, type: 3}
+ m_PrefabInstance: {fileID: 1533570784}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &1542030600
GameObject:
m_ObjectHideFlags: 0
@@ -5235,7 +5302,7 @@ Transform:
m_Children:
- {fileID: 74337563}
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &1780761854 stripped
Transform:
@@ -6554,6 +6621,36 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2109225216}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &2124714750
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 2124714751}
+ m_Layer: 0
+ m_Name: From_namnesti_novy
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &2124714751
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 2124714750}
+ m_LocalRotation: {x: 0, y: -0.36706942, z: 0, w: 0.93019354}
+ m_LocalPosition: {x: 8.095, y: 0.46000004, z: -9.837}
+ m_LocalScale: {x: 1, y: 1, z: 1}
+ m_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 4
+ m_LocalEulerAnglesHint: {x: 0, y: -43.07, z: 0}
--- !u!1001 &3614203982928736856
PrefabInstance:
m_ObjectHideFlags: 0
diff --git a/Assets/Scripts/Dialogue/Interactable.cs b/Assets/Scripts/Dialogue/Interactable.cs
index 38dd18fbeaa3d8e19243be6644104c4cc645b078..a77a6e886bbb1791f233000ca4b84bc2e00e9b6a 100644
--- a/Assets/Scripts/Dialogue/Interactable.cs
+++ b/Assets/Scripts/Dialogue/Interactable.cs
@@ -8,8 +8,9 @@ namespace Nudle.Scripts.Dialogue
//public Dialogue dialogue;
public Dialogue[] PossibleDialogues;
- public string FloatingText = "Press [E] to interact.";
- public Vector2 FloatingTextOffset = Vector2.zero;
+ public string FloatingText = "Press [E] to interact";
+ public Vector2 FloatingTextOffset = new Vector2(0f, 50f);
+ public bool ForceStart;
private Text Floater;
@@ -41,9 +42,15 @@ namespace Nudle.Scripts.Dialogue
if (!other.gameObject.CompareTag("Player"))
return;
+ if (ForceStart)
+ {
+ TriggerDialogue();
+ return;
+ }
+
if (FloatingText != null && Floater == null)
{
- Floater = FindObjectOfType<FloatingTextManager>().ShowText(FloatingText, gameObject.transform.position, FloatingTextOffset);
+ Floater = FindObjectOfType<FloatingTextManager>().ShowText(FloatingText, gameObject.transform, FloatingTextOffset);
}
other.gameObject.GetComponent<PlayerController>().OnIteract = () => {
if (Floater != null)
@@ -64,6 +71,7 @@ namespace Nudle.Scripts.Dialogue
Destroy(Floater.gameObject);
Floater = null;
}
+ other.gameObject.GetComponent<PlayerController>().OnIteract = null;
}
}
}
\ No newline at end of file
diff --git a/Assets/Scripts/FloatingText.cs b/Assets/Scripts/FloatingText.cs
index 4be4f14ebf1dcba1612c1e17dd1ffd51d441143d..22aac7dcf09c6330da1be1e96677637b09e9d96e 100644
--- a/Assets/Scripts/FloatingText.cs
+++ b/Assets/Scripts/FloatingText.cs
@@ -4,7 +4,7 @@ namespace Nudle.Scripts
{
public class FloatingText : MonoBehaviour
{
- public Vector3 SourcePosition;
+ public Transform Source;
public Vector2 Offset;
private RectTransform Transform;
@@ -16,7 +16,7 @@ namespace Nudle.Scripts
internal void Update()
{
- var screenPos = Camera.main.WorldToScreenPoint(SourcePosition);
+ var screenPos = Camera.main.WorldToScreenPoint(Source.position);
Transform.anchoredPosition = new Vector2(screenPos.x / Screen.width * 1920, screenPos.y / Screen.height * 1080) + Offset;
}
}
diff --git a/Assets/Scripts/FloatingTextManager.cs b/Assets/Scripts/FloatingTextManager.cs
index 33a16ca62f8749e4c879ad23de0ac281f379b3d3..7ac8ce2d6c5b111ead610648b15a9776aae94df1 100644
--- a/Assets/Scripts/FloatingTextManager.cs
+++ b/Assets/Scripts/FloatingTextManager.cs
@@ -10,20 +10,20 @@ namespace Nudle.Scripts
public Canvas FloatingTextCanvas;
public Text TextPrefab;
- internal Text ShowText(string text, Vector3 sourcePos, Vector2 offset, float time = -1f)
+ internal Text ShowText(string text, Transform source, Vector2 offset, float time = -1f)
{
var uiText = Instantiate(TextPrefab);
uiText.transform.SetParent(FloatingTextCanvas.transform);
uiText.text = text;
uiText.transform.localScale = Vector3.one;
var floatingText = uiText.gameObject.GetComponent<FloatingText>();
- floatingText.SourcePosition = sourcePos;
+ floatingText.Source = source;
floatingText.Offset = offset;
if (time > 0f)
StartCoroutine(Util.DeleteAfter(uiText.gameObject, time));
return uiText;
}
- internal void ShowText(string text, Vector3 sourcePos, float time = -1f) => ShowText(text, sourcePos, Vector2.zero, time);
+ internal void ShowText(string text, Transform source, float time = -1f) => ShowText(text, source, Vector2.zero, time);
}
}
diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs
index 052f9d256af7d988323b60c1fcd5227c0fc99512..68d8352d8692d4383e146b0bac22ce79ef23b5d0 100644
--- a/Assets/Scripts/PlayerController.cs
+++ b/Assets/Scripts/PlayerController.cs
@@ -31,6 +31,17 @@ namespace Nudle.Scripts
private bool IsInDialogue() => DialogueManager != null && DialogueManager.IsInDialogue();
+ internal void Start()
+ {
+ var lastScene = SceneSwitcher.LastScene;
+ if (lastScene == null)
+ return;
+ Debug.Log(lastScene);
+ var tf = GameObject.Find($"From_{lastScene}").transform;
+ transform.position = tf.position;
+ transform.rotation = tf.rotation;
+ }
+
internal void Update()
{
DoMove();
diff --git a/Assets/Scripts/SceneSwitcher.cs b/Assets/Scripts/SceneSwitcher.cs
index f05f1bcfa6c6709e1954cff51de83b57730d0c54..dc9139e3a689bf6c95bdc6b3a1f5474f69e0a01f 100644
--- a/Assets/Scripts/SceneSwitcher.cs
+++ b/Assets/Scripts/SceneSwitcher.cs
@@ -8,24 +8,31 @@ namespace Nudle.Scripts
public class SceneSwitcher : MonoBehaviour
{
public GameObject LoadingScreen;
- public int SceneToLoadIndex;
+ public string SceneToLoad;
public Slider ProgressBar;
public Text ProgressText;
+ public Vector2 FloatingTextOffset = new Vector2(0f, 50f);
+
+ private Text Floater;
+
+ internal static string LastScene;
+
public void LoadScene()
{
+ LastScene = SceneManager.GetActiveScene().name;
StartCoroutine(LoadSceneCoroutine());
}
internal IEnumerator LoadSceneCoroutine()
{
- var op = SceneManager.LoadSceneAsync(SceneToLoadIndex);
+ var op = SceneManager.LoadSceneAsync(SceneToLoad);
LoadingScreen.SetActive(true);
while (!op.isDone)
{
var progress = Mathf.Clamp01(op.progress / .9f);
- ProgressText.text = $"{progress:P}";
+ ProgressText.text = $"{progress:P0}";
ProgressBar.value = progress;
yield return null;
@@ -34,10 +41,33 @@ namespace Nudle.Scripts
internal void OnTriggerEnter(Collider other)
{
- if (other.gameObject.layer != LayerMask.NameToLayer("Player"))
+ if (!other.gameObject.CompareTag("Player"))
+ return;
+ if (Floater == null)
+ {
+ Floater = FindObjectOfType<FloatingTextManager>().ShowText("Press [E] to change location", other.transform, FloatingTextOffset);
+ }
+ other.gameObject.GetComponent<PlayerController>().OnIteract = () =>
{
+ if (Floater != null)
+ {
+ Destroy(Floater.gameObject);
+ Floater = null;
+ }
LoadScene();
+ };
+ }
+
+ internal void OnTriggerExit(Collider other)
+ {
+ if (!other.gameObject.CompareTag("Player"))
+ return;
+ if (Floater != null)
+ {
+ Destroy(Floater.gameObject);
+ Floater = null;
}
+ other.gameObject.GetComponent<PlayerController>().OnIteract = null;
}
}
}
\ No newline at end of file
diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset
index 8458ac4ef667e4a268247edf71a270eb4925d2b1..befcff790bede1e0291b09ad9fd02b11e7f80ba4 100644
--- a/ProjectSettings/ProjectSettings.asset
+++ b/ProjectSettings/ProjectSettings.asset
@@ -121,11 +121,11 @@ PlayerSettings:
vulkanEnableSetSRGBWrite: 0
vulkanEnableLateAcquireNextImage: 0
m_SupportedAspectRatios:
- 4:3: 1
- 5:4: 1
- 16:10: 1
+ 4:3: 0
+ 5:4: 0
+ 16:10: 0
16:9: 1
- Others: 1
+ Others: 0
bundleVersion: 0.1
preloadedAssets: []
metroInputSource: 0