From: KG0104 Date: Tue, 5 Oct 2021 10:50:14 +0000 (+0200) Subject: dialogue-system v0.7 X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=6baee168a7047c6d7312798fca13c2108018caac;p=SuperMouseAdventure.git dialogue-system v0.7 --- 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 0ae4b97..9cf3402 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_1.unity @@ -2484,6 +2484,7 @@ MonoBehaviour: volume: 0.2 pitch: 1 source: {fileID: 0} + music: flowers --- !u!4 &292106544 Transform: m_ObjectHideFlags: 0 @@ -11864,6 +11865,8 @@ MonoBehaviour: speed: 36 jumpForce: 54 jumptime: 0.4 + coyoteTime: 0 + jumpBufferLength: 0 isGrounded: 0 groundcheck: {fileID: 972365582} checkRadius: 0.5 @@ -11995,7 +11998,6 @@ MonoBehaviour: m_EditorClassIdentifier: countText: {fileID: 1283337208} cheesecount: 0 - collected: 0 --- !u!114 &936765976 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12030,6 +12032,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e51156189eaae2245924b136bb893dfb, type: 3} m_Name: m_EditorClassIdentifier: + cheeseCoin: {fileID: 0} --- !u!114 &936765978 MonoBehaviour: m_ObjectHideFlags: 0 @@ -12102,6 +12105,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: stampingSpeed: 100 + groundCheck: {fileID: 0} + dustEffect: {fileID: 0} --- !u!95 &936765983 Animator: serializedVersion: 3 @@ -27116,8 +27121,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bc2cf8de166e6c04fba789ac331ec852, type: 3} m_Name: m_EditorClassIdentifier: - groundCheck: {fileID: 972365581} - dustEffect: {fileID: 723835315} --- !u!1 &1152173203 GameObject: m_ObjectHideFlags: 0 @@ -31112,7 +31115,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 2036393124} m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp - m_MethodName: Skip + m_MethodName: NextSentence m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity index 1c50fc8..7629fab 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity @@ -293,7 +293,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1583346861} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -12745,7 +12745,7 @@ MonoBehaviour: agroRange: 20 MoveSpeed: 5 distToPlayer: 0 - followsMouse: 0 + followsMouse: 1 --- !u!70 &1006420617 CapsuleCollider2D: m_ObjectHideFlags: 0 @@ -12850,6 +12850,108 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 27 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1006741758 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1006741759} + - component: {fileID: 1006741761} + - component: {fileID: 1006741760} + m_Layer: 5 + m_Name: skipButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1006741759 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006741758} + 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: + - {fileID: 2004005840} + m_Father: {fileID: 1583346861} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -163.79, y: -174.9} + m_SizeDelta: {x: 150, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1006741760 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006741758} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 0} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1988001243} + m_TargetAssemblyTypeName: BossDialogue, Assembly-CSharp + m_MethodName: NextSentence + 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: 1 +--- !u!222 &1006741761 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1006741758} + m_CullTransparentMesh: 1 --- !u!1 &1016078926 GameObject: m_ObjectHideFlags: 0 @@ -26490,6 +26592,7 @@ RectTransform: m_LocalScale: {x: 1.00008, y: 1.00008, z: 1.00008} m_Children: - {fileID: 1400511867} + - {fileID: 1006741759} - {fileID: 30332657} m_Father: {fileID: 1107270362} m_RootOrder: 0 @@ -28933,6 +29036,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: continueButton: {fileID: 1400511866} + skipButton: {fileID: 1006741758} dialogueBox: {fileID: 1583346860} SpeechBubble: {fileID: 678625800} mouse: {fileID: 936765968} @@ -29016,6 +29120,85 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 38 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2004005839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2004005840} + - component: {fileID: 2004005842} + - component: {fileID: 2004005841} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2004005840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004005839} + 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: 1006741759} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2004005841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004005839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0.18039216, b: 0.9960785, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 20 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 2 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: "\xDCberspringen" +--- !u!222 &2004005842 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2004005839} + m_CullTransparentMesh: 1 --- !u!1 &2023394537 GameObject: m_ObjectHideFlags: 0 diff --git a/2DGame/Assets/Scripts/Dialogue/BossDialogue.cs b/2DGame/Assets/Scripts/Dialogue/BossDialogue.cs index b4042e6..c084555 100644 --- a/2DGame/Assets/Scripts/Dialogue/BossDialogue.cs +++ b/2DGame/Assets/Scripts/Dialogue/BossDialogue.cs @@ -6,6 +6,7 @@ using UnityEngine.UI; public class BossDialogue : MonoBehaviour { public GameObject continueButton; + public GameObject skipButton; public GameObject dialogueBox; public GameObject SpeechBubble; public GameObject mouse; @@ -30,7 +31,8 @@ public class BossDialogue : MonoBehaviour { dialogueBox.SetActive(false); continueButton.SetActive(false); - //SpeechBubble.SetActive(false); + skipButton.SetActive(false); + SpeechBubble.SetActive(false); speechBubble = SpeechBubble.GetComponent(); boss = bossObject.GetComponent(); } @@ -46,6 +48,7 @@ public class BossDialogue : MonoBehaviour public IEnumerator Type() { dialogueBox.SetActive(true); + skipButton.SetActive(true); SpeechBubble.SetActive(true); speechBubble.NextSpeaker(); foreach (char letter in sentences[index].ToCharArray()) @@ -79,4 +82,13 @@ public class BossDialogue : MonoBehaviour FindObjectOfType().Play("snail_fight"); } } + + public void Skip() + { + dialogueText.text = ""; + dialogueBox.SetActive(false); + SpeechBubble.SetActive(false); + mouse.GetComponent().constraints = RigidbodyConstraints2D.FreezeRotation; + mouse.GetComponent().enabled = true; + } } diff --git a/2DGame/UserSettings/EditorUserSettings.asset b/2DGame/UserSettings/EditorUserSettings.asset index d84c05a..d4ab26f 100644 --- a/2DGame/UserSettings/EditorUserSettings.asset +++ b/2DGame/UserSettings/EditorUserSettings.asset @@ -30,10 +30,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6c0417050c192f3a23352367083debf42d flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe721130082beb + value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe6c4a2b0f36e613 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe6c4a2b0f36e613 + value: 22424703114646680e0b0227036c17415f573f38292d280f042d043feeaf332ae7e238d6ee3e2630353dbe721130082beb flags: 0 vcSharedLogLevel: value: 0d5e400f0650