From 161708f288a2560d1df2bd8b2c9b9203c76b2ede Mon Sep 17 00:00:00 2001 From: KG0104 Date: Sat, 30 Oct 2021 16:48:39 +0200 Subject: [PATCH] fixed visual size transition to gardener power up --- .../Animations/Mouse/mouse_to_gardener.anim | 79 ++++++--------- .../(1) Green_Idyll/green_idyll_10.unity | 97 ++++--------------- 2DGame/Assets/Scripts/Dialogue/Dialogue.cs | 81 ---------------- .../Assets/Scripts/Dialogue/Dialogue.cs.meta | 11 --- .../Scripts/Dialogue/DialogueTrigger.cs | 26 ----- .../Scripts/Dialogue/DialogueTrigger.cs.meta | 11 --- .../Assets/Scripts/Dialogue/SpeechBubble.cs | 23 ----- .../Scripts/Dialogue/SpeechBubble.cs.meta | 11 --- 2DGame/Assets/Scripts/Level_Elements/Lock.cs | 2 + 9 files changed, 52 insertions(+), 289 deletions(-) delete mode 100644 2DGame/Assets/Scripts/Dialogue/Dialogue.cs delete mode 100644 2DGame/Assets/Scripts/Dialogue/Dialogue.cs.meta delete mode 100644 2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs delete mode 100644 2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs.meta delete mode 100644 2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs delete mode 100644 2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs.meta diff --git a/2DGame/Assets/Animations/Mouse/mouse_to_gardener.anim b/2DGame/Assets/Animations/Mouse/mouse_to_gardener.anim index 9df36ca..097f810 100644 --- a/2DGame/Assets/Animations/Mouse/mouse_to_gardener.anim +++ b/2DGame/Assets/Animations/Mouse/mouse_to_gardener.anim @@ -20,52 +20,37 @@ AnimationClip: m_PPtrCurves: - curve: - time: 0 - value: {fileID: 1779178863233599495, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: e8c3141280d9cb64885a2cfaad7a1167, type: 3} - time: 0.083333336 - value: {fileID: 85519693702481214, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} + value: {fileID: 21300000, guid: fdef657a8b03cd175b4f3fe43c6bfe45, type: 3} - time: 0.16666667 - value: {fileID: -257356044669065320, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: def8dcdfed4c47458b8d1e87470267ce, type: 3} - time: 0.25 - value: {fileID: -3244637711366124157, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 02ba39f994722b6e4ad30abb5f3b5739, type: 3} - time: 0.33333334 - value: {fileID: 957274874031791340, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: ab5485c79359a40f8b725a1e89ad76ca, type: 3} - time: 0.41666666 - value: {fileID: 1229577534439203458, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 3d4a2927ed20a41bfbf2d35451696eb9, type: 3} - time: 0.5 - value: {fileID: 182620595634371242, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 4f52d81a53018a23b98a4c08329c9f67, type: 3} - time: 0.5833333 - value: {fileID: -2263122352877315130, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 0f3a287b6cd3ec995a7c2aab15307e44, type: 3} - time: 0.6666667 - value: {fileID: 6683104405142862146, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 7e9f1eead3daef783a4108f74a3f0608, type: 3} - time: 0.75 - value: {fileID: -1767054865041919481, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 538c1947d06a78b248c23046248eeca0, type: 3} - time: 0.8333333 - value: {fileID: -1335576132014134309, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 63412cd7dc28bb24ebd11e0154889a10, type: 3} - time: 0.9166667 - value: {fileID: 1877373937256157187, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: a3b1c953c239f0716b1e1cd922dbde23, type: 3} - time: 1 - value: {fileID: -181719003187105045, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: a3b1c953c239f0716b1e1cd922dbde23, type: 3} - time: 1.0833334 - value: {fileID: -3985870593778221772, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 8bee2d2d39116c658a96f27678c8092c, type: 3} - time: 1.1666666 - value: {fileID: 4641877437209557871, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 271bdcfc69abf13c6b106a4b19dfe364, type: 3} - time: 1.25 - value: {fileID: 4641877437209557871, guid: e2c8d138bb4461841ac2d2a2b71d2e12, - type: 3} + value: {fileID: 21300000, guid: 271bdcfc69abf13c6b106a4b19dfe364, type: 3} attribute: m_Sprite path: classID: 212 @@ -85,22 +70,22 @@ AnimationClip: customType: 23 isPPtrCurve: 1 pptrCurveMapping: - - {fileID: 1779178863233599495, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: 85519693702481214, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: -257356044669065320, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: -3244637711366124157, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: 957274874031791340, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: 1229577534439203458, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: 182620595634371242, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: -2263122352877315130, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: 6683104405142862146, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: -1767054865041919481, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: -1335576132014134309, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: 1877373937256157187, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: -181719003187105045, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: -3985870593778221772, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: 4641877437209557871, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} - - {fileID: 4641877437209557871, guid: e2c8d138bb4461841ac2d2a2b71d2e12, type: 3} + - {fileID: 21300000, guid: e8c3141280d9cb64885a2cfaad7a1167, type: 3} + - {fileID: 21300000, guid: fdef657a8b03cd175b4f3fe43c6bfe45, type: 3} + - {fileID: 21300000, guid: def8dcdfed4c47458b8d1e87470267ce, type: 3} + - {fileID: 21300000, guid: 02ba39f994722b6e4ad30abb5f3b5739, type: 3} + - {fileID: 21300000, guid: ab5485c79359a40f8b725a1e89ad76ca, type: 3} + - {fileID: 21300000, guid: 3d4a2927ed20a41bfbf2d35451696eb9, type: 3} + - {fileID: 21300000, guid: 4f52d81a53018a23b98a4c08329c9f67, type: 3} + - {fileID: 21300000, guid: 0f3a287b6cd3ec995a7c2aab15307e44, type: 3} + - {fileID: 21300000, guid: 7e9f1eead3daef783a4108f74a3f0608, type: 3} + - {fileID: 21300000, guid: 538c1947d06a78b248c23046248eeca0, type: 3} + - {fileID: 21300000, guid: 63412cd7dc28bb24ebd11e0154889a10, type: 3} + - {fileID: 21300000, guid: a3b1c953c239f0716b1e1cd922dbde23, type: 3} + - {fileID: 21300000, guid: a3b1c953c239f0716b1e1cd922dbde23, type: 3} + - {fileID: 21300000, guid: 8bee2d2d39116c658a96f27678c8092c, type: 3} + - {fileID: 21300000, guid: 271bdcfc69abf13c6b106a4b19dfe364, type: 3} + - {fileID: 21300000, guid: 271bdcfc69abf13c6b106a4b19dfe364, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {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 9e7353b..96b1284 100644 --- a/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity +++ b/2DGame/Assets/Scenes/(1) Green_Idyll/green_idyll_10.unity @@ -1068,6 +1068,7 @@ MonoBehaviour: doorOpen: 0 waitingToOpen: 0 isDoor: 0 + connectedToDialogue: 0 --- !u!61 &164304316 BoxCollider2D: m_ObjectHideFlags: 0 @@ -3185,7 +3186,7 @@ SpriteRenderer: m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 - m_DrawMode: 2 + m_DrawMode: 0 m_Size: {x: 280, y: 64.8} m_AdaptiveModeThreshold: 0 m_SpriteTileMode: 1 @@ -3201,7 +3202,7 @@ Transform: m_GameObject: {fileID: 547884906} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.4, y: -5.4, z: 0} - m_LocalScale: {x: 1.5, y: 1.5, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} m_RootOrder: 37 @@ -3396,7 +3397,6 @@ GameObject: - component: {fileID: 678625804} - component: {fileID: 678625803} - component: {fileID: 678625802} - - component: {fileID: 678625801} m_Layer: 0 m_Name: speech_bubble m_TagString: Untagged @@ -3404,23 +3404,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &678625801 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 678625800} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5c29d09f2b5174b07812a2ca95ed3316, type: 3} - m_Name: - m_EditorClassIdentifier: - dialogueManager: {fileID: 1988001242} - speakers: - - {fileID: 848268148} - - {fileID: 477672911} - - {fileID: 610596341} --- !u!95 &678625802 Animator: serializedVersion: 3 @@ -10130,7 +10113,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1988001243} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp m_MethodName: Skip m_Mode: 1 @@ -10597,7 +10580,6 @@ GameObject: m_Component: - component: {fileID: 1091878262} - component: {fileID: 1091878263} - - component: {fileID: 1091878261} m_Layer: 0 m_Name: bossTrigger m_TagString: Untagged @@ -10605,21 +10587,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1091878261 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1091878260} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04fb4457cc4eca346ae4b0599f20569e, type: 3} - m_Name: - m_EditorClassIdentifier: - DialogueManager: {fileID: 1988001242} - stringFromFile: - - {fileID: 4900000, guid: 99663c588e5c94c75bfaf569863566eb, type: 3} --- !u!4 &1091878262 Transform: m_ObjectHideFlags: 0 @@ -12378,7 +12345,7 @@ MonoBehaviour: m_OnClick: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 1988001243} + - m_Target: {fileID: 0} m_TargetAssemblyTypeName: Dialogue, Assembly-CSharp m_MethodName: NextSentence m_Mode: 1 @@ -14672,7 +14639,6 @@ GameObject: - component: {fileID: 1559449785} - component: {fileID: 1559449784} - component: {fileID: 1559449787} - - component: {fileID: 1559449786} m_Layer: 0 m_Name: james m_TagString: Untagged @@ -14877,22 +14843,6 @@ Rigidbody2D: m_SleepingMode: 1 m_CollisionDetection: 0 m_Constraints: 0 ---- !u!114 &1559449786 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1559449781} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 04fb4457cc4eca346ae4b0599f20569e, type: 3} - m_Name: - m_EditorClassIdentifier: - DialogueManager: {fileID: 1988001242} - stringFromFile: - - {fileID: 4900000, guid: 9e3ebf127de46d54980942349187e001, type: 3} - - {fileID: 4900000, guid: c2af20065458e364780ce893c92cbb9d, type: 3} --- !u!61 &1559449787 BoxCollider2D: m_ObjectHideFlags: 0 @@ -14930,6 +14880,7 @@ GameObject: - component: {fileID: 1583346861} - component: {fileID: 1583346863} - component: {fileID: 1583346862} + - component: {fileID: 1583346864} m_Layer: 5 m_Name: DialogueBox m_TagString: Untagged @@ -14997,6 +14948,18 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1583346860} m_CullTransparentMesh: 1 +--- !u!114 &1583346864 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1583346860} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4067ff4ae353511e96589aad288250c, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1592579562 GameObject: m_ObjectHideFlags: 0 @@ -16120,7 +16083,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1988001244} - - component: {fileID: 1988001243} m_Layer: 0 m_Name: DialogueManager m_TagString: Untagged @@ -16128,29 +16090,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &1988001243 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1988001242} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 84f62f9206a55914bb1e69401b9a1b82, type: 3} - m_Name: - m_EditorClassIdentifier: - continueButton: {fileID: 1400511866} - skipButton: {fileID: 1006741758} - dialogueBox: {fileID: 1583346860} - SpeechBubble: {fileID: 678625800} - mouse: {fileID: 936765968} - dialogueText: {fileID: 30332658} - index: 0 - typingSpeed: 0.04 - dialogueTriggerer: - - {fileID: 1559449786} - - {fileID: 1091878261} --- !u!4 &1988001244 Transform: m_ObjectHideFlags: 0 diff --git a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs deleted file mode 100644 index c492288..0000000 --- a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs +++ /dev/null @@ -1,81 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class Dialogue : MonoBehaviour -{ - public GameObject continueButton; - public GameObject skipButton; - public GameObject dialogueBox; - public GameObject SpeechBubble; - public GameObject mouse; - - SpeechBubble speechBubble; - - public Text dialogueText; - - int sffIndex = 0; - int dtIndex = 0; - - public float typingSpeed; - - [SerializeField] DialogueTrigger[] dialogueTriggerer; - - void Start() - { - dialogueBox.SetActive(false); - continueButton.SetActive(false); - skipButton.SetActive(false); - SpeechBubble.SetActive(false); - speechBubble = SpeechBubble.GetComponent(); - } - - void Update() - { - if (dialogueText.text == dialogueTriggerer[dtIndex].stringFromFile[sffIndex].text) - { - continueButton.SetActive(true); - skipButton.SetActive(true); - } - else - { - continueButton.SetActive(false); - } - } - - public IEnumerator Type() - { - dialogueBox.SetActive(true); - skipButton.SetActive(true); - speechBubble.NextSpeaker(); - SpeechBubble.SetActive(true); - dialogueText.text = ""; - - foreach (char letter in dialogueTriggerer[dtIndex].stringFromFile[sffIndex].text.ToCharArray()) - { - dialogueText.text += letter; - yield return new WaitForSeconds(typingSpeed); - } - } - - public void NextSentence() - { - if(sffIndex < (dialogueTriggerer[dtIndex].stringFromFile.Length - 1)) { - sffIndex++; - } - else if (sffIndex == (dialogueTriggerer[dtIndex].stringFromFile.Length - 1)) - { - sffIndex = 0; - dtIndex++; - } - - StartCoroutine(Type()); - } - - public void Skip() - { - dialogueText.text = dialogueTriggerer[dtIndex].stringFromFile[sffIndex].text; - } -} \ No newline at end of file diff --git a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs.meta b/2DGame/Assets/Scripts/Dialogue/Dialogue.cs.meta deleted file mode 100644 index 1a75468..0000000 --- a/2DGame/Assets/Scripts/Dialogue/Dialogue.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 84f62f9206a55914bb1e69401b9a1b82 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs deleted file mode 100644 index eb2f2c9..0000000 --- a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs +++ /dev/null @@ -1,26 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class DialogueTrigger : MonoBehaviour -{ - [SerializeField] GameObject DialogueManager; - - Dialogue dialogue; - - public TextAsset[] stringFromFile; - - void Start() - { - dialogue = DialogueManager.GetComponent(); - } - - private void OnTriggerEnter2D(Collider2D collision) - { - if(collision.tag == "Player") - { - GetComponent().enabled = false; - StartCoroutine(dialogue.Type()); - } - } -} \ No newline at end of file diff --git a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs.meta b/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs.meta deleted file mode 100644 index 3cd9bf6..0000000 --- a/2DGame/Assets/Scripts/Dialogue/DialogueTrigger.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -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 deleted file mode 100644 index 832a0b1..0000000 --- a/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs +++ /dev/null @@ -1,23 +0,0 @@ -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[0].position; - } -} diff --git a/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs.meta b/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs.meta deleted file mode 100644 index b1c8d7a..0000000 --- a/2DGame/Assets/Scripts/Dialogue/SpeechBubble.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5c29d09f2b5174b07812a2ca95ed3316 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/2DGame/Assets/Scripts/Level_Elements/Lock.cs b/2DGame/Assets/Scripts/Level_Elements/Lock.cs index 6dfaef2..72d9e7b 100644 --- a/2DGame/Assets/Scripts/Level_Elements/Lock.cs +++ b/2DGame/Assets/Scripts/Level_Elements/Lock.cs @@ -14,6 +14,8 @@ public class Lock : MonoBehaviour public bool isDoor; + [SerializeField] bool connectedToDialogue; + // Start is called before the first frame update void Start() { -- 2.44.0