diff --git a/Assets/JAY/Main-Jay.unity b/Assets/JAY/Main-Jay.unity index a5a677d..c1f58f8 100644 --- a/Assets/JAY/Main-Jay.unity +++ b/Assets/JAY/Main-Jay.unity @@ -138,7 +138,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &81838205 Transform: m_ObjectHideFlags: 0 @@ -178,6 +178,7 @@ GameObject: m_Component: - component: {fileID: 271965289} - component: {fileID: 271965290} + - component: {fileID: 271965292} m_Layer: 0 m_Name: GameManager m_TagString: Untagged @@ -402,6 +403,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!224 &561421648 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} + m_PrefabInstance: {fileID: 1794075754} + m_PrefabAsset: {fileID: 0} --- !u!1 &740636828 GameObject: m_ObjectHideFlags: 0 @@ -470,7 +476,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1545261105 +--- !u!1001 &1794075754 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -478,223 +484,95 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1867732347} m_Modifications: - - target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 180756268084732627, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1545261107} - - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: OnClickGameStart - objectReference: {fileID: 0} - - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: MainPanelController, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 713532354933724924, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 4282069284025755619, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4733773333797619672, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 5033979732381400892, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_Pivot.x value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_Pivot.y value: 0.5 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_AnchorMax.x value: 1 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_AnchorMax.y value: 1 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_AnchorMin.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_AnchoredPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 7963582976605285404, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8446481687955831510, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8564394481744056992, guid: e1835a90a4d722a4b99be61179de8789, type: 3} + - target: {fileID: 8383435151006156655, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} propertyPath: m_Name - value: Main Panel - objectReference: {fileID: 0} - - target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8768541925252566370, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 + value: Lose Effect Panel objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: e1835a90a4d722a4b99be61179de8789, type: 3} ---- !u!224 &1545261106 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 6110152713294678410, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - m_PrefabInstance: {fileID: 1545261105} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1545261107 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 7488082087611091670, guid: e1835a90a4d722a4b99be61179de8789, type: 3} - m_PrefabInstance: {fileID: 1545261105} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b4dc3fd9e59f47df80e344680d1b9803, type: 3} - m_Name: - m_EditorClassIdentifier: + m_SourcePrefab: {fileID: 100100000, guid: 89231ebcfccd7b94d9a0f5f1c502f3dc, type: 3} --- !u!1 &1867732343 GameObject: m_ObjectHideFlags: 0 @@ -772,7 +650,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 0 m_SortingOrder: 0 @@ -788,7 +666,8 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 561421648} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} diff --git a/Assets/Resources/Prefabs/Effects/Lose Effect Panel.prefab b/Assets/Resources/Prefabs/Effects/Lose Effect Panel.prefab index 0dad469..04cee9a 100644 --- a/Assets/Resources/Prefabs/Effects/Lose Effect Panel.prefab +++ b/Assets/Resources/Prefabs/Effects/Lose Effect Panel.prefab @@ -374,6 +374,7 @@ GameObject: - component: {fileID: 8139433458976667477} - component: {fileID: 8635639988778983738} - component: {fileID: 4545556044007292713} + - component: {fileID: 3229800624310508893} m_Layer: 5 m_Name: Lose Effect Panel m_TagString: Untagged @@ -451,3 +452,20 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!114 &3229800624310508893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8383435151006156655} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 72737ad525374cd18ae35ca10da520e9, type: 3} + m_Name: + m_EditorClassIdentifier: + bannerText: {fileID: 5108301403921453943} + characterOpenEyes: {fileID: 1632927645355555415} + characterCloseEyes: {fileID: 3881260292094838299} + fullText: "\uD328\uBC30\uD588\uC2B5\uB2C8\uB2E4" + interval: 0.1 diff --git a/Assets/Resources/Prefabs/Panels/Main Panel.prefab b/Assets/Resources/Prefabs/Panels/Main Panel.prefab index c60cb91..2de521e 100644 --- a/Assets/Resources/Prefabs/Panels/Main Panel.prefab +++ b/Assets/Resources/Prefabs/Panels/Main Panel.prefab @@ -1470,7 +1470,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &405965270916774547 RectTransform: m_ObjectHideFlags: 0 @@ -1714,7 +1714,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uAE40\uBCC4\uBA85" + m_text: "\uD638\uB7AD\uC774" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 85a19688db53c77469fc4406b01045da, type: 2} m_sharedMaterial: {fileID: -2477908578676791210, guid: 85a19688db53c77469fc4406b01045da, type: 2} @@ -1800,7 +1800,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &8172929902404983356 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/Script/UI/Effect/LoseEffectController.cs b/Assets/Script/UI/Effect/LoseEffectController.cs index 862d84d..b0f7a8e 100644 --- a/Assets/Script/UI/Effect/LoseEffectController.cs +++ b/Assets/Script/UI/Effect/LoseEffectController.cs @@ -1,16 +1,20 @@ using System.Collections; +using System.Threading; using TMPro; using UnityEngine; public class LoseEffectController : MonoBehaviour { [SerializeField] private TextMeshProUGUI bannerText; + [SerializeField] private GameObject characterOpenEyes; + [SerializeField] private GameObject characterCloseEyes; [SerializeField] private string fullText = "패배했습니다"; // 원하는 문구를 인스펙터에서 설정 가능 [SerializeField] private float interval = 0.1f; // 글자 추가 속도 조정 가능 private int currentLength = 0; - + private CancellationTokenSource cancellationTokenSource; + private void Start() { ShowWinEffect(); @@ -20,9 +24,10 @@ public class LoseEffectController : MonoBehaviour { // 패널 활성화 gameObject.SetActive(true); - // cancellationTokenSource = new CancellationTokenSource(); + cancellationTokenSource = new CancellationTokenSource(); StartCoroutine(AnimateLoadingText()); // 텍스트 타이핑 효과 + StartCoroutine(AnimateCharacterEyes()); // 텍스트 타이핑 효과 } // 글자 하나씩 나타나는 타이핑 효과 @@ -36,4 +41,17 @@ public class LoseEffectController : MonoBehaviour yield return new WaitForSeconds(interval); } } + + private IEnumerator AnimateCharacterEyes() + { + while (!cancellationTokenSource.IsCancellationRequested) + { + characterOpenEyes.SetActive(true); + characterCloseEyes.SetActive(false); + yield return new WaitForSeconds(2f); + characterOpenEyes.SetActive(false); + characterCloseEyes.SetActive(true); + yield return new WaitForSeconds(0.2f); + } + } }