From: KG0104 <76601263+KG0104@users.noreply.github.com> Date: Sun, 29 Aug 2021 10:01:03 +0000 (+0200) Subject: Dialog-System v0.3 X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=d72799233ea9dca885573aa0602421a3e14507c8;p=SuperMouseAdventure.git Dialog-System v0.3 --- diff --git a/2DGame/Assets/Animations/speech_bubble.anim b/2DGame/Assets/Animations/speech_bubble.anim new file mode 100644 index 0000000..cc1cac0 --- /dev/null +++ b/2DGame/Assets/Animations/speech_bubble.anim @@ -0,0 +1,277 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: speech_bubble + serializedVersion: 6 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.5 + value: {x: 1.1, y: 1.1, z: 1} + inSlope: {x: 0.20000005, y: 0.20000005, z: 0} + outSlope: {x: 0.20000005, y: 0.20000005, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1 + value: {x: 1.2, y: 1.2, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5 + value: {x: 1.1, y: 1.1, z: 1} + inSlope: {x: -0.20000005, y: -0.20000005, z: 0} + outSlope: {x: -0.20000005, y: -0.20000005, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2 + value: {x: 1, y: 1, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: + m_FloatCurves: [] + m_PPtrCurves: [] + m_SampleRate: 10 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 2 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.1 + inSlope: 0.20000005 + outSlope: 0.20000005 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1.1 + inSlope: -0.20000005 + outSlope: -0.20000005 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.1 + inSlope: 0.20000005 + outSlope: 0.20000005 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1.2 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1.1 + inSlope: -0.20000005 + outSlope: -0.20000005 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: + classID: 4 + script: {fileID: 0} + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/2DGame/Assets/Animations/speech_bubble.anim.meta b/2DGame/Assets/Animations/speech_bubble.anim.meta new file mode 100644 index 0000000..5bc5b9e --- /dev/null +++ b/2DGame/Assets/Animations/speech_bubble.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e2be9914fdf608d45b31976944a3954e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Animations/speech_bubble.controller b/2DGame/Assets/Animations/speech_bubble.controller new file mode 100644 index 0000000..c11e817 --- /dev/null +++ b/2DGame/Assets/Animations/speech_bubble.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6657594844667950930 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: speech_bubble + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e2be9914fdf608d45b31976944a3954e, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-624500777285687584 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6657594844667950930} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6657594844667950930} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: speech_bubble + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -624500777285687584} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/2DGame/Assets/Animations/speech_bubble.controller.meta b/2DGame/Assets/Animations/speech_bubble.controller.meta new file mode 100644 index 0000000..4685cab --- /dev/null +++ b/2DGame/Assets/Animations/speech_bubble.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5b6703d573b0c6e458363c551bf5d5bf +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity index e7ebe64..eaed684 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity @@ -1035,7 +1035,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &87876804 RectTransform: m_ObjectHideFlags: 0 @@ -3945,7 +3945,7 @@ RectTransform: m_Children: - {fileID: 1975103216} m_Father: {fileID: 1304108837} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -4922,6 +4922,127 @@ Transform: m_Father: {fileID: 1452174929} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &631343912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 631343914} + - component: {fileID: 631343913} + - component: {fileID: 631343915} + - component: {fileID: 631343916} + m_Layer: 0 + m_Name: speech_bubble + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &631343913 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 631343912} + 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: 2 + m_Sprite: {fileID: 21300000, guid: 064d1cf1a8441c74d9244994baac7a5a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 6.27, y: 6.25} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &631343914 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 631343912} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -7.0460243, y: 9.578475, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 132 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &631343915 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 631343912} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5b6703d573b0c6e458363c551bf5d5bf, 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 +--- !u!114 &631343916 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 631343912} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aec751965eb08894180422494fd03a80, type: 3} + m_Name: + m_EditorClassIdentifier: + dialogueManager: {fileID: 2036393123} + speakers: + - {fileID: 1423490228} + - {fileID: 1423490228} + - {fileID: 1423490228} + - {fileID: 1423490228} --- !u!1 &650261600 GameObject: m_ObjectHideFlags: 0 @@ -10562,12 +10683,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1304108837} - m_RootOrder: 2 + m_RootOrder: 1 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.000091552734} - m_SizeDelta: {x: 298.3, y: 154.14} + m_AnchoredPosition: {x: -0.24603, y: 19.81} + m_SizeDelta: {x: 477.09, y: 131.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &746902508 MonoBehaviour: @@ -10736,6 +10857,36 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 51 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &791090329 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 791090330} + m_Layer: 0 + m_Name: bubblePos (1) + m_TagString: Untagged + m_Icon: {fileID: -1412012063857583412, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &791090330 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 791090329} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 5, y: 2.71, z: 0} + m_LocalScale: {x: -1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 936765971} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &794806973 GameObject: m_ObjectHideFlags: 0 @@ -11821,6 +11972,7 @@ Transform: m_Children: - {fileID: 972365582} - {fileID: 722593448} + - {fileID: 791090330} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -27902,7 +28054,6 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1691028830} - {fileID: 445692661} - {fileID: 746902507} m_Father: {fileID: 1107270362} @@ -28203,6 +28354,7 @@ GameObject: - component: {fileID: 1343376134} - component: {fileID: 1343376133} - component: {fileID: 1343376135} + - component: {fileID: 1343376136} m_Layer: 0 m_Name: prof_tutori m_TagString: Untagged @@ -28271,7 +28423,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0.25, y: 3.65, z: 0} m_LocalScale: {x: -1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1423490228} m_Father: {fileID: 0} m_RootOrder: 131 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -28301,6 +28454,19 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 4.6612864, y: 47.08811} m_EdgeRadius: 0 +--- !u!114 &1343376136 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1343376132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 04fb4457cc4eca346ae4b0599f20569e, type: 3} + m_Name: + m_EditorClassIdentifier: + DialogueManager: {fileID: 2036393123} --- !u!1 &1356534580 GameObject: m_ObjectHideFlags: 0 @@ -29277,6 +29443,36 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1423490227 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1423490228} + m_Layer: 0 + m_Name: bubblePos + m_TagString: Untagged + m_Icon: {fileID: -1412012063857583412, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1423490228 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1423490227} + m_LocalRotation: {x: -0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 8.3, y: 5.3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1343376134} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1452174928 GameObject: m_ObjectHideFlags: 0 @@ -31087,81 +31283,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: green: {fileID: 21300000, guid: f2a243993330e8e40857102cf3351e52, type: 3} ---- !u!1 &1691028829 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1691028830} - - component: {fileID: 1691028832} - - component: {fileID: 1691028831} - m_Layer: 0 - m_Name: Speaker - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1691028830 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1691028829} - 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: 1304108837} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 44.300003, y: -41.3} - m_SizeDelta: {x: 68.766, y: 68.489} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1691028831 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1691028829} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 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: 21300000, guid: e8c3141280d9cb64885a2cfaad7a1167, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1691028832 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1691028829} - m_CullTransparentMesh: 1 --- !u!1 &1723894137 GameObject: m_ObjectHideFlags: 0 @@ -34818,12 +34939,15 @@ MonoBehaviour: m_EditorClassIdentifier: continueButton: {fileID: 445692660} dialogueBox: {fileID: 1304108836} + SpeechBubble: {fileID: 631343912} + mouse: {fileID: 936765968} dialogueText: {fileID: 746902508} sentences: - Hallo, ich bin Professor Tutori. - Was geht ab? - "Ich werde dir alles erkl\xE4ren." - In Ordnung? + index: 0 typingSpeed: 0.04 --- !u!4 &2036393125 Transform: diff --git a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs index fd6cde1..d9fcebd 100644 --- a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs +++ b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs @@ -7,14 +7,23 @@ public class Dialogue : MonoBehaviour { public GameObject continueButton; public GameObject dialogueBox; + public GameObject SpeechBubble; + public GameObject mouse; + + SpeechBubble speechBubble; + public Text dialogueText; + public string[] sentences; - private int index; + public int index; + public float typingSpeed; void Start() { - StartCoroutine(Type()); + dialogueBox.SetActive(false); + SpeechBubble.SetActive(false); + speechBubble = SpeechBubble.GetComponent(); } void Update() @@ -25,8 +34,11 @@ public class Dialogue : MonoBehaviour } } - IEnumerator Type() + public IEnumerator Type() { + dialogueBox.SetActive(true); + speechBubble.NextSpeaker(); + SpeechBubble.SetActive(true); foreach (char letter in sentences[index].ToCharArray()) { dialogueText.text += letter; @@ -43,11 +55,14 @@ public class Dialogue : MonoBehaviour index++; dialogueText.text = ""; StartCoroutine(Type()); + speechBubble.NextSpeaker(); } else { dialogueText.text = ""; dialogueBox.SetActive(false); + SpeechBubble.SetActive(false); + mouse.GetComponent().constraints = RigidbodyConstraints2D.FreezeRotation; } } } diff --git a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs new file mode 100644 index 0000000..cb9eb62 --- /dev/null +++ b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DialogueTrigger : MonoBehaviour +{ + [SerializeField] + GameObject DialogueManager; + + Dialogue dialogue; + + void Start() + { + dialogue = DialogueManager.GetComponent(); + } + + private void OnTriggerEnter2D(Collider2D collision) + { + if(collision.gameObject.CompareTag("Player")) + { + StartCoroutine(dialogue.Type()); + collision.gameObject.GetComponent().constraints = RigidbodyConstraints2D.FreezeAll; + GetComponent().enabled = false; + } + } +} \ No newline at end of file diff --git a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs.meta b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs.meta new file mode 100644 index 0000000..3cd9bf6 --- /dev/null +++ b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 04fb4457cc4eca346ae4b0599f20569e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs b/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs new file mode 100644 index 0000000..4e31d8a --- /dev/null +++ b/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SpeechBubble : MonoBehaviour +{ + [SerializeField] + GameObject dialogueManager; + + Dialogue dialogue; + + public Transform[] speakers; + + void Start() + { + dialogue = dialogueManager.GetComponent(); + } + + public void NextSpeaker() + { + transform.position = speakers[dialogue.index].position; + } +} diff --git a/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs.meta b/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs.meta new file mode 100644 index 0000000..4aa4c44 --- /dev/null +++ b/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aec751965eb08894180422494fd03a80 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/2DGame/Assets/Sprites/speech_bubble.png b/2DGame/Assets/Sprites/speech_bubble.png new file mode 100644 index 0000000..bbc8084 Binary files /dev/null and b/2DGame/Assets/Sprites/speech_bubble.png differ diff --git a/2DGame/Assets/Sprites/speech_bubble.png.meta b/2DGame/Assets/Sprites/speech_bubble.png.meta new file mode 100644 index 0000000..62fe020 --- /dev/null +++ b/2DGame/Assets/Sprites/speech_bubble.png.meta @@ -0,0 +1,96 @@ +fileFormatVersion: 2 +guid: 064d1cf1a8441c74d9244994baac7a5a +TextureImporter: + internalIDToNameTable: [] + 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: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + 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: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: