From c2250c28bfb0e2f1e10f69f556bf1f655d4eefd2 Mon Sep 17 00:00:00 2001 From: HaeinLEE Date: Tue, 6 May 2025 03:09:43 +0900 Subject: [PATCH] =?UTF-8?q?[Feat]=20=EB=93=9C=EB=9E=98=EA=B7=B8=20?= =?UTF-8?q?=EC=95=A0=EB=8B=88=EB=A9=94=EC=9D=B4=EC=85=98=20=EC=B6=94?= =?UTF-8?q?=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../LIN/Animations/Drag Down Animation.anim | 3 ++ .../Drag Down Animation.anim.meta} | 5 ++- .../LIN/Animations/Drag Left Animation.anim | 3 ++ .../Drag Left Animation.anim.meta} | 5 ++- .../LIN/Animations/Drag Right Animation.anim | 3 ++ .../Animations/Drag Right Animation.anim.meta | 8 ++++ Assets/LIN/Animations/Drag Up Animation.anim | 3 ++ .../Animations/Drag Up Animation.anim.meta | 8 ++++ .../Finger Animator Controller.controller | 4 +- ...Finger Animator Controller.controller.meta | 2 +- Assets/LIN/Animations/FingerImage.controller | 3 ++ .../Animations/FingerImage.controller.meta | 8 ++++ Assets/LIN/Animations/Touch Animation.anim | 3 ++ .../LIN/Animations/Touch Animation.anim.meta | 8 ++++ Assets/LIN/Housing Copy.unity | 4 +- .../Interaction Animation Panel.prefab | 3 -- Assets/LIN/Prefabs/Player.prefab | 3 -- .../LIN/Prefabs/TutorialExamplePanel.prefab | 3 ++ .../TutorialExamplePanel.prefab.meta | 0 .../Tutorial/FingerAnimationController.cs | 37 +++++++++++++++++ .../FingerAnimationController.cs.meta | 11 +++++ .../Scripts/Tutorial/PanelTmpController.cs | 15 +++++++ .../Tutorial/PanelTmpController.cs.meta | 11 +++++ .../Tutorial/TutorialExamplePanel.prefab | 3 -- .../Tutorial/TutorialPanelController.cs | 3 +- .../LIN/Scripts/Tutorial/TutorialStep4.asset | 41 ++++--------------- .../LIN/Scripts/Tutorial/TutorialStep5.asset | 26 ++++++++++++ .../Scripts/Tutorial/TutorialStep5.asset.meta | 8 ++++ 28 files changed, 181 insertions(+), 53 deletions(-) create mode 100644 Assets/LIN/Animations/Drag Down Animation.anim rename Assets/LIN/{Prefabs/Interaction Animation Panel.prefab.meta => Animations/Drag Down Animation.anim.meta} (52%) create mode 100644 Assets/LIN/Animations/Drag Left Animation.anim rename Assets/LIN/{Prefabs/Player.prefab.meta => Animations/Drag Left Animation.anim.meta} (52%) create mode 100644 Assets/LIN/Animations/Drag Right Animation.anim create mode 100644 Assets/LIN/Animations/Drag Right Animation.anim.meta create mode 100644 Assets/LIN/Animations/Drag Up Animation.anim create mode 100644 Assets/LIN/Animations/Drag Up Animation.anim.meta create mode 100644 Assets/LIN/Animations/FingerImage.controller create mode 100644 Assets/LIN/Animations/FingerImage.controller.meta create mode 100644 Assets/LIN/Animations/Touch Animation.anim create mode 100644 Assets/LIN/Animations/Touch Animation.anim.meta delete mode 100644 Assets/LIN/Prefabs/Interaction Animation Panel.prefab delete mode 100644 Assets/LIN/Prefabs/Player.prefab create mode 100644 Assets/LIN/Prefabs/TutorialExamplePanel.prefab rename Assets/LIN/{Scripts/Tutorial => Prefabs}/TutorialExamplePanel.prefab.meta (100%) create mode 100644 Assets/LIN/Scripts/Tutorial/FingerAnimationController.cs create mode 100644 Assets/LIN/Scripts/Tutorial/FingerAnimationController.cs.meta create mode 100644 Assets/LIN/Scripts/Tutorial/PanelTmpController.cs create mode 100644 Assets/LIN/Scripts/Tutorial/PanelTmpController.cs.meta delete mode 100644 Assets/LIN/Scripts/Tutorial/TutorialExamplePanel.prefab create mode 100644 Assets/LIN/Scripts/Tutorial/TutorialStep5.asset create mode 100644 Assets/LIN/Scripts/Tutorial/TutorialStep5.asset.meta diff --git a/Assets/LIN/Animations/Drag Down Animation.anim b/Assets/LIN/Animations/Drag Down Animation.anim new file mode 100644 index 00000000..66fb6531 --- /dev/null +++ b/Assets/LIN/Animations/Drag Down Animation.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3fffbe9b85d58069c33dc202e70b3a3b8af13cf5f88b248080c8597ce83e648a +size 7263 diff --git a/Assets/LIN/Prefabs/Interaction Animation Panel.prefab.meta b/Assets/LIN/Animations/Drag Down Animation.anim.meta similarity index 52% rename from Assets/LIN/Prefabs/Interaction Animation Panel.prefab.meta rename to Assets/LIN/Animations/Drag Down Animation.anim.meta index a1967bb4..65e15a11 100644 --- a/Assets/LIN/Prefabs/Interaction Animation Panel.prefab.meta +++ b/Assets/LIN/Animations/Drag Down Animation.anim.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 66016880ee1ff09429065e570a748578 -PrefabImporter: +guid: f27b3abad6872c44e97912eebec8d88f +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/LIN/Animations/Drag Left Animation.anim b/Assets/LIN/Animations/Drag Left Animation.anim new file mode 100644 index 00000000..4d12afa9 --- /dev/null +++ b/Assets/LIN/Animations/Drag Left Animation.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8fd626b2b544043134a4c1ff58ef989f182a0a74bf9ff1f3e5727987f483f466 +size 9257 diff --git a/Assets/LIN/Prefabs/Player.prefab.meta b/Assets/LIN/Animations/Drag Left Animation.anim.meta similarity index 52% rename from Assets/LIN/Prefabs/Player.prefab.meta rename to Assets/LIN/Animations/Drag Left Animation.anim.meta index cc58ec1a..51017116 100644 --- a/Assets/LIN/Prefabs/Player.prefab.meta +++ b/Assets/LIN/Animations/Drag Left Animation.anim.meta @@ -1,7 +1,8 @@ fileFormatVersion: 2 -guid: 0a190a5b9816abf478788174c2c55c62 -PrefabImporter: +guid: 1508ea9e5623cf14ab2378f0cef9e4f9 +NativeFormatImporter: externalObjects: {} + mainObjectFileID: 7400000 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/LIN/Animations/Drag Right Animation.anim b/Assets/LIN/Animations/Drag Right Animation.anim new file mode 100644 index 00000000..837d994a --- /dev/null +++ b/Assets/LIN/Animations/Drag Right Animation.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:125fa2e38a92fbae4474768b166c76afdae57b5d1672054b46304c47a7d1718a +size 9258 diff --git a/Assets/LIN/Animations/Drag Right Animation.anim.meta b/Assets/LIN/Animations/Drag Right Animation.anim.meta new file mode 100644 index 00000000..5d8ecffa --- /dev/null +++ b/Assets/LIN/Animations/Drag Right Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8702846e8ccd4b34e9e500d748366282 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/Animations/Drag Up Animation.anim b/Assets/LIN/Animations/Drag Up Animation.anim new file mode 100644 index 00000000..4f910117 --- /dev/null +++ b/Assets/LIN/Animations/Drag Up Animation.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:f99b0015366ffe4c3f1caa83d8e581e39a572cf38ae6c34c9c083585e8635bb1 +size 6927 diff --git a/Assets/LIN/Animations/Drag Up Animation.anim.meta b/Assets/LIN/Animations/Drag Up Animation.anim.meta new file mode 100644 index 00000000..e90ac20f --- /dev/null +++ b/Assets/LIN/Animations/Drag Up Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 8731d87063872e443b687cb8fde04d4d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/Animations/Finger Animator Controller.controller b/Assets/LIN/Animations/Finger Animator Controller.controller index c3f44fd5..ddbf4438 100644 --- a/Assets/LIN/Animations/Finger Animator Controller.controller +++ b/Assets/LIN/Animations/Finger Animator Controller.controller @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:662feb51281a7590e32b4a7fca90cabf9d2ed51606808a3da357132e8378bc13 -size 1231 +oid sha256:366a1c7763b9ad47d29283041d58a762637a8b7d605c7e54e839b64504f96519 +size 9451 diff --git a/Assets/LIN/Animations/Finger Animator Controller.controller.meta b/Assets/LIN/Animations/Finger Animator Controller.controller.meta index 98599ee6..b33cae66 100644 --- a/Assets/LIN/Animations/Finger Animator Controller.controller.meta +++ b/Assets/LIN/Animations/Finger Animator Controller.controller.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b46b59f307f451f4d828a8d3b4bb549f +guid: e9f04be805588144f91257ba68a51876 NativeFormatImporter: externalObjects: {} mainObjectFileID: 9100000 diff --git a/Assets/LIN/Animations/FingerImage.controller b/Assets/LIN/Animations/FingerImage.controller new file mode 100644 index 00000000..a2bd7cb4 --- /dev/null +++ b/Assets/LIN/Animations/FingerImage.controller @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:0a49043f7f6ff144df5fa892e7e7f57fdd93ec36ea31f90da4f7da9d8d0fed7e +size 2033 diff --git a/Assets/LIN/Animations/FingerImage.controller.meta b/Assets/LIN/Animations/FingerImage.controller.meta new file mode 100644 index 00000000..08458775 --- /dev/null +++ b/Assets/LIN/Animations/FingerImage.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5905112edad17434fb13083581ef0f4f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/Animations/Touch Animation.anim b/Assets/LIN/Animations/Touch Animation.anim new file mode 100644 index 00000000..4ffdd712 --- /dev/null +++ b/Assets/LIN/Animations/Touch Animation.anim @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3d8634abaebb7d2c1757f9971089bf7b19108ea0d491f96179da04ecddde5117 +size 7051 diff --git a/Assets/LIN/Animations/Touch Animation.anim.meta b/Assets/LIN/Animations/Touch Animation.anim.meta new file mode 100644 index 00000000..2d82983a --- /dev/null +++ b/Assets/LIN/Animations/Touch Animation.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd99c947dee3d52458ca54e58f038438 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/Housing Copy.unity b/Assets/LIN/Housing Copy.unity index b8290699..b9596720 100644 --- a/Assets/LIN/Housing Copy.unity +++ b/Assets/LIN/Housing Copy.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:ef1eafc60cac5859b7b0bed9c0dd74ab242083cb9a561d0062f5e7b56408b196 -size 265834 +oid sha256:243765a59e3126abd17abc02258bff6f2428294a5d373dacfe09c3ba123b5b96 +size 338192 diff --git a/Assets/LIN/Prefabs/Interaction Animation Panel.prefab b/Assets/LIN/Prefabs/Interaction Animation Panel.prefab deleted file mode 100644 index 6261894e..00000000 --- a/Assets/LIN/Prefabs/Interaction Animation Panel.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:649bb0c3ed866a0c1fb162446352487e1431a6debd30729c9f7ce357597cba4c -size 9586 diff --git a/Assets/LIN/Prefabs/Player.prefab b/Assets/LIN/Prefabs/Player.prefab deleted file mode 100644 index 6aa84751..00000000 --- a/Assets/LIN/Prefabs/Player.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:0553b7a35d53197953565057a3417200ab8578e6a355275b67f63fb426c3f3c1 -size 78560 diff --git a/Assets/LIN/Prefabs/TutorialExamplePanel.prefab b/Assets/LIN/Prefabs/TutorialExamplePanel.prefab new file mode 100644 index 00000000..5071a7c0 --- /dev/null +++ b/Assets/LIN/Prefabs/TutorialExamplePanel.prefab @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6d996355527e9a0aa940a2d0a503ba8e7c6e660cb7f0b7f9d403435862da11ee +size 44871 diff --git a/Assets/LIN/Scripts/Tutorial/TutorialExamplePanel.prefab.meta b/Assets/LIN/Prefabs/TutorialExamplePanel.prefab.meta similarity index 100% rename from Assets/LIN/Scripts/Tutorial/TutorialExamplePanel.prefab.meta rename to Assets/LIN/Prefabs/TutorialExamplePanel.prefab.meta diff --git a/Assets/LIN/Scripts/Tutorial/FingerAnimationController.cs b/Assets/LIN/Scripts/Tutorial/FingerAnimationController.cs new file mode 100644 index 00000000..11ae8e3c --- /dev/null +++ b/Assets/LIN/Scripts/Tutorial/FingerAnimationController.cs @@ -0,0 +1,37 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public enum fingerAnimationType +{ + None = 0, + Touch = 1, + DragUp = 2, + DragDown = 3, + DragRight = 4, + DragLeft = 5, +} +[RequireComponent(typeof(Animator))] +public class FingerAnimationController : MonoBehaviour +{ + private static readonly int AnimationType = Animator.StringToHash("AnimationType"); + public fingerAnimationType fingerAnimationType = fingerAnimationType.None; + + private Animator animator; + private int _animType; + + private void Awake() + { + animator = GetComponent(); + animator.SetInteger(AnimationType,(int)fingerAnimationType); + } + + private void Update() + { + if ((int)fingerAnimationType == animator.GetInteger(AnimationType)) + { + return; + } + animator.SetInteger(AnimationType,(int)fingerAnimationType); + } +} diff --git a/Assets/LIN/Scripts/Tutorial/FingerAnimationController.cs.meta b/Assets/LIN/Scripts/Tutorial/FingerAnimationController.cs.meta new file mode 100644 index 00000000..c19a6025 --- /dev/null +++ b/Assets/LIN/Scripts/Tutorial/FingerAnimationController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: aebdd610e1140f644acb596cc9acec39 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/Scripts/Tutorial/PanelTmpController.cs b/Assets/LIN/Scripts/Tutorial/PanelTmpController.cs new file mode 100644 index 00000000..9a9ae0e2 --- /dev/null +++ b/Assets/LIN/Scripts/Tutorial/PanelTmpController.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(InteractionAnimationPanelController))] +public class PanelTmpController : MonoBehaviour +{ + InteractionAnimationPanelController interactionAnimationPanelController; + + private void Awake() + { + interactionAnimationPanelController = GetComponent(); + interactionAnimationPanelController.TutorialSleepAnimation(); + } +} diff --git a/Assets/LIN/Scripts/Tutorial/PanelTmpController.cs.meta b/Assets/LIN/Scripts/Tutorial/PanelTmpController.cs.meta new file mode 100644 index 00000000..1591cc6b --- /dev/null +++ b/Assets/LIN/Scripts/Tutorial/PanelTmpController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 11e12f4334717874d87ff58d5053e430 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/LIN/Scripts/Tutorial/TutorialExamplePanel.prefab b/Assets/LIN/Scripts/Tutorial/TutorialExamplePanel.prefab deleted file mode 100644 index 002f9c15..00000000 --- a/Assets/LIN/Scripts/Tutorial/TutorialExamplePanel.prefab +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4ca7e9d2bfcb5f0e0b44a8e69510b6dfb2405315777944848e0659b75262f9df -size 22377 diff --git a/Assets/LIN/Scripts/Tutorial/TutorialPanelController.cs b/Assets/LIN/Scripts/Tutorial/TutorialPanelController.cs index a3e39bb1..01953d3f 100644 --- a/Assets/LIN/Scripts/Tutorial/TutorialPanelController.cs +++ b/Assets/LIN/Scripts/Tutorial/TutorialPanelController.cs @@ -11,7 +11,7 @@ public class TutorialPanelController : MonoBehaviour [Header("튜토리얼 터치 타겟들")] [SerializeField] public GameObject[] touchTargets; - [Header("튜토리얼에서 보여줄 이미지들")] + [Header("튜토리얼에서 보여줄 이미지 혹은 판넬들")] [SerializeField] private GameObject[] images; public void setTutorialText(string tutorialText) @@ -38,4 +38,5 @@ public class TutorialPanelController : MonoBehaviour { images[index].SetActive(false); } + } diff --git a/Assets/LIN/Scripts/Tutorial/TutorialStep4.asset b/Assets/LIN/Scripts/Tutorial/TutorialStep4.asset index 288e7cb5..4920ff03 100644 --- a/Assets/LIN/Scripts/Tutorial/TutorialStep4.asset +++ b/Assets/LIN/Scripts/Tutorial/TutorialStep4.asset @@ -12,41 +12,14 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b22d834cf5e26e647be215074940d40e, type: 3} m_Name: TutorialStep4 m_EditorClassIdentifier: - message: "\uC9C0\uAE08 \uD654\uBA74\uC740 \uC544\uBB34\uB370\uB098 \uD074\uB9AD\uD558\uBA74 - \uC5C6\uC5B4\uC9D1\uB2C8\uB2E4." - timeout: 0 + message: + timeout: 2 onStepBegin: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 9146572361147244306, guid: 66016880ee1ff09429065e570a748578, - type: 3} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 + m_Calls: [] onStepComplete: m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 9146572361147244306, guid: 66016880ee1ff09429065e570a748578, - type: 3} - m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine - m_MethodName: - m_Mode: 0 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 - touchTargetIndex: 1 - imageIndex: -1 - nextStep: {fileID: 0} + m_Calls: [] + touchTargetIndex: -1 + imageIndex: 1 + nextStep: {fileID: 11400000, guid: e3d4da4e50044c54394663ac9e7b2afa, type: 2} diff --git a/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset b/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset new file mode 100644 index 00000000..dc7e68ad --- /dev/null +++ b/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset @@ -0,0 +1,26 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b22d834cf5e26e647be215074940d40e, type: 3} + m_Name: TutorialStep5 + m_EditorClassIdentifier: + message: "\uB2E4\uC591\uD55C \uC0C1\uD638\uC791\uC6A9\uC744 \uD1B5\uD574 \uB2A5\uB825\uCE58\uB97C + \uC62C\uB9AC\uACE0 \uB358\uC804\uC744 \uACF5\uB7B5\uD574\uBCF4\uC138\uC694." + timeout: 0 + onStepBegin: + m_PersistentCalls: + m_Calls: [] + onStepComplete: + m_PersistentCalls: + m_Calls: [] + touchTargetIndex: 1 + imageIndex: -1 + nextStep: {fileID: 0} diff --git a/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset.meta b/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset.meta new file mode 100644 index 00000000..6cc8f6cf --- /dev/null +++ b/Assets/LIN/Scripts/Tutorial/TutorialStep5.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e3d4da4e50044c54394663ac9e7b2afa +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: