diff --git a/Assets/Scenes/hospoda.unity b/Assets/Scenes/hospoda.unity index 4400cbfc31310e48afd55d90d4e0b7d07c6db524..7ea65a127bca5a511c79dc9730e5df4851d0b995 100644 --- a/Assets/Scenes/hospoda.unity +++ b/Assets/Scenes/hospoda.unity @@ -6064,6 +6064,36 @@ MonoBehaviour: FloatingText: Press [E] to interact FloatingTextOffset: {x: 0, y: 250} ForceStart: 0 + OnStart: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1050815512} + m_TargetAssemblyTypeName: Nudle.Scripts.AI.BeerMaster, Assembly-CSharp + m_MethodName: Pause + 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 + OnExit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1050815512} + m_TargetAssemblyTypeName: Nudle.Scripts.AI.BeerMaster, Assembly-CSharp + m_MethodName: Unpause + 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 --- !u!1001 &1359297625 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/namnesti_novy.unity b/Assets/Scenes/namnesti_novy.unity index 5c65b7980ff535c153aa4e9b8df93f699612b933..5a67d02fa57af3d60f94da6f601074ceda6ff42e 100644 --- a/Assets/Scenes/namnesti_novy.unity +++ b/Assets/Scenes/namnesti_novy.unity @@ -912,6 +912,11 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!4 &39363090 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8201883946458643714, guid: 6b14981bff1e2f841ae7e1218971a320, type: 3} + m_PrefabInstance: {fileID: 39363087} + m_PrefabAsset: {fileID: 0} --- !u!1 &44863509 GameObject: m_ObjectHideFlags: 0 @@ -6481,6 +6486,112 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6afd9393f70183f4dad8ecbf75716bd4, type: 3} +--- !u!1 &483004825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 483004826} + - component: {fileID: 483004827} + - component: {fileID: 483004829} + - component: {fileID: 483004828} + m_Layer: 0 + m_Name: Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &483004826 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 483004825} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.93} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1309976568} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &483004827 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 483004825} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &483004828 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 483004825} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09010dec34769a242bfca4c4e44f1455, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredSetFlags: [] + RequiredUnsetFlags: [] + OnEnter: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 483004829} + m_TargetAssemblyTypeName: Nudle.Scripts.FloatingTextSource, Assembly-CSharp + m_MethodName: Show + 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 + OnExit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 483004829} + m_TargetAssemblyTypeName: Nudle.Scripts.FloatingTextSource, Assembly-CSharp + m_MethodName: Hide + 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 +--- !u!114 &483004829 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 483004825} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a3c823489c78bdf45bbf1ff837a478dd, type: 3} + m_Name: + m_EditorClassIdentifier: + Text: You shall not pass! + Offset: {x: 0, y: 180} + Source: {fileID: 39363090} + Time: 0 --- !u!1 &483891953 GameObject: m_ObjectHideFlags: 0 @@ -9306,6 +9417,112 @@ Transform: m_Father: {fileID: 1036189904} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 4.311, z: 0} +--- !u!1 &749960281 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 749960282} + - component: {fileID: 749960285} + - component: {fileID: 749960284} + - component: {fileID: 749960283} + m_Layer: 0 + m_Name: Trigger + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &749960282 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749960281} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -0.82, y: 0, z: -0} + m_LocalScale: {x: 1, y: 1, z: 0.61} + m_Children: [] + m_Father: {fileID: 762742072} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &749960283 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749960281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 09010dec34769a242bfca4c4e44f1455, type: 3} + m_Name: + m_EditorClassIdentifier: + RequiredSetFlags: [] + RequiredUnsetFlags: [] + OnEnter: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 749960284} + m_TargetAssemblyTypeName: Nudle.Scripts.FloatingTextSource, Assembly-CSharp + m_MethodName: Show + 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 + OnExit: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 749960284} + m_TargetAssemblyTypeName: Nudle.Scripts.FloatingTextSource, Assembly-CSharp + m_MethodName: Hide + 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 +--- !u!114 &749960284 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749960281} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a3c823489c78bdf45bbf1ff837a478dd, type: 3} + m_Name: + m_EditorClassIdentifier: + Text: You shall not pass! + Offset: {x: 0, y: 180} + Source: {fileID: 39363090} + Time: 0 +--- !u!65 &749960285 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 749960281} + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} --- !u!1 &750214015 GameObject: m_ObjectHideFlags: 0 @@ -9453,9 +9670,10 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 762742071} m_LocalRotation: {x: 0, y: 0.80927855, z: 0, w: 0.5874252} - m_LocalPosition: {x: 30.8, y: 0.53, z: -16.3} + m_LocalPosition: {x: 30.77, y: 0.53, z: -16.39} m_LocalScale: {x: 1, y: 1, z: 14.103} - m_Children: [] + m_Children: + - {fileID: 749960282} m_Father: {fileID: 131510797} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 108.051, z: 0} @@ -18382,7 +18600,8 @@ Transform: m_LocalRotation: {x: -0, y: 0.80927855, z: -0, w: 0.5874252} m_LocalPosition: {x: 50.88, y: 0.54, z: 0.95} m_LocalScale: {x: 9.5529, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 483004826} m_Father: {fileID: 131510797} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -25878,10 +26097,46 @@ PrefabInstance: propertyPath: m_LocalScale.z value: 1 objectReference: {fileID: 0} + - target: {fileID: -3756473180518285571, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: -2647701988280917616, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: -1025663018108745142, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} propertyPath: m_Name value: fountain_2_test objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 2891746525080496957, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 2891746525080496957, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5233112405309087440, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 7961259676315642420, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} + propertyPath: m_StaticEditorFlags + value: 4294967295 + objectReference: {fileID: 0} + - target: {fileID: 7961259676315642420, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} + propertyPath: m_NavMeshLayer + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1a3e283494a2d7b46a3145eee1f0bac8, type: 3} --- !u!4 &1920181824 stripped diff --git a/Assets/Scenes/namnesti_novy/NavMesh.asset b/Assets/Scenes/namnesti_novy/NavMesh.asset index 924ecb7071e893e7ff4c388d212042dc69baf4a3..d9e3fa1d5f17ce9b884fc63ac242608f6db73c72 100644 Binary files a/Assets/Scenes/namnesti_novy/NavMesh.asset and b/Assets/Scenes/namnesti_novy/NavMesh.asset differ diff --git a/Assets/Scripts/FloatingTextSource.cs b/Assets/Scripts/FloatingTextSource.cs new file mode 100644 index 0000000000000000000000000000000000000000..2c3d9ca1d03fa5072ba1958655b8eafb78a66d46 --- /dev/null +++ b/Assets/Scripts/FloatingTextSource.cs @@ -0,0 +1,20 @@ +using UnityEngine; +using UnityEngine.UI; + +namespace Nudle.Scripts +{ + public class FloatingTextSource : MonoBehaviour + { + public string Text; + public Vector2 Offset; + public Transform Source; + + public float Time; + + private Text textobj; + + public void Show() => textobj = FindObjectOfType<FloatingTextManager>().ShowText(Text, Source, Offset, Time); + + public void Hide() => Destroy(textobj); + } +} \ No newline at end of file diff --git a/Assets/Scripts/FloatingTextSource.cs.meta b/Assets/Scripts/FloatingTextSource.cs.meta new file mode 100644 index 0000000000000000000000000000000000000000..1a2b5aa2dbb20c3aac319c493954b6f9baf7ef07 --- /dev/null +++ b/Assets/Scripts/FloatingTextSource.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a3c823489c78bdf45bbf1ff837a478dd +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: