This commit is contained in:
SweetJJuya 2024-10-28 13:24:04 +09:00
parent c3bdefa642
commit 5fb234e991
12 changed files with 390 additions and 64115 deletions

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: c142668ac9cb04544bb0250da1353ec5
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -2652,6 +2652,7 @@ MonoBehaviour:
card01: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} card01: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
card02: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} card02: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
card03: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3} card03: {fileID: 5785355462301107295, guid: 2116ffd228314c745b8615652b11d19e, type: 3}
upgradePopup: {fileID: 2044341158}
--- !u!1 &194818728 --- !u!1 &194818728
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -6196,7 +6197,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -230.00002} m_AnchoredPosition: {x: 0, y: -230}
m_SizeDelta: {x: -80, y: -540} m_SizeDelta: {x: -80, y: -540}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &526767281 --- !u!114 &526767281
@ -10383,6 +10384,81 @@ PrefabInstance:
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 15c02fef22ba8d0488bd2517167c117c, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 15c02fef22ba8d0488bd2517167c117c, type: 3}
--- !u!1 &880125816
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 880125817}
- component: {fileID: 880125819}
- component: {fileID: 880125818}
m_Layer: 5
m_Name: Information
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &880125817
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 880125816}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2044341159}
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: 1000, y: 1000}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &880125818
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 880125816}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 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: ea9a47744b51f7b46958a79a03d0cca6, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &880125819
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 880125816}
m_CullTransparentMesh: 1
--- !u!1 &887608711 --- !u!1 &887608711
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -11822,6 +11898,7 @@ RectTransform:
- {fileID: 1402684326} - {fileID: 1402684326}
- {fileID: 2055805161} - {fileID: 2055805161}
- {fileID: 1923064098} - {fileID: 1923064098}
- {fileID: 2044341159}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0} m_AnchorMin: {x: 0, y: 0}
@ -13017,6 +13094,118 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1108764854} m_GameObject: {fileID: 1108764854}
m_CullTransparentMesh: 1 m_CullTransparentMesh: 1
--- !u!1 &1125211609
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1125211610}
- component: {fileID: 1125211614}
- component: {fileID: 1125211613}
- component: {fileID: 1125211612}
- component: {fileID: 1125211611}
m_Layer: 5
m_Name: BackgroundPaper
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1125211610
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1125211609}
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_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2044341159}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1000, y: 600}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1125211611
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1125211609}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 17488a2bea6f4126a7877ce5d934f865, type: 3}
m_Name:
m_EditorClassIdentifier:
_animator: {fileID: 1125211612}
--- !u!95 &1125211612
Animator:
serializedVersion: 7
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1125211609}
m_Enabled: 1
m_Avatar: {fileID: 0}
m_Controller: {fileID: 9100000, guid: 321b6014bde8a4d44aa6a3c1200a26cc, type: 2}
m_CullingMode: 0
m_UpdateMode: 2
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!114 &1125211613
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1125211609}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 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: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &1125211614
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1125211609}
m_CullTransparentMesh: 1
--- !u!1 &1126097299 --- !u!1 &1126097299
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -16206,7 +16395,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &1368594307 --- !u!224 &1368594307
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -19656,7 +19845,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &1569753516 --- !u!224 &1569753516
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -25245,7 +25434,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 1 m_IsActive: 0
--- !u!224 &1923064098 --- !u!224 &1923064098
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -26856,6 +27045,57 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3} m_Script: {fileID: 11500000, guid: bbb4e96b2ebafc246b85623c547a7d01, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
--- !u!1 &2044341158
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2044341159}
- component: {fileID: 2044341160}
m_Layer: 5
m_Name: Upgrade_Popup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &2044341159
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2044341158}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.0007789, y: 1.0007789, z: 1.0007789}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1125211610}
- {fileID: 880125817}
m_Father: {fileID: 1049919592}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2044341160
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2044341158}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 53190759a9125774885ff29574bb98c0, type: 3}
m_Name:
m_EditorClassIdentifier:
_animationController: {fileID: 1125211611}
--- !u!1 &2048187805 --- !u!1 &2048187805
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -27369,7 +27609,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
m_IsActive: 0 m_IsActive: 1
--- !u!224 &2107551723 --- !u!224 &2107551723
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

File diff suppressed because it is too large Load Diff

View File

@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 220707b92d9118b428f678148448058a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -40,6 +40,11 @@ namespace BlueWater
// Methods // Methods
#region Methods #region Methods
public void PlayAnimation(string stateName, int layer = 0)
{
_animator.Play(stateName, 0);
}
public void SetAnimationParameter(string parameter, bool value) public void SetAnimationParameter(string parameter, bool value)
{ {
if (!_animator) return; if (!_animator) return;
@ -120,6 +125,8 @@ namespace BlueWater
_animator.speed = 1f; _animator.speed = 1f;
} }
#endregion #endregion
} }
} }

View File

@ -87,6 +87,14 @@ namespace BlueWater
OnLevelUp?.Invoke(levelData); OnLevelUp?.Invoke(levelData);
} }
// 플레이어
// 레벨업 업그레이드 ui 표시 이벤트
public static Action<LevelData> OnUpgradeUi;
public static void InvokeUpgradeUi(LevelData levelData)
{
OnUpgradeUi?.Invoke(levelData);
}
// 경험치 변경 이벤트 // 경험치 변경 이벤트
public static Action<int> OnChangeExp; public static Action<int> OnChangeExp;
public static void InvokeChangeExp(int addedExp) public static void InvokeChangeExp(int addedExp)

View File

@ -81,7 +81,7 @@ public class TycoonGameOver : MonoBehaviour
while (timer < shakeDuration) while (timer < shakeDuration)
{ {
ShakeObject(); ShakeObject();
timer += Time.deltaTime; timer += Time.unscaledDeltaTime;
yield return null; // 다음 프레임까지 대기 yield return null; // 다음 프레임까지 대기
} }
@ -97,13 +97,13 @@ public class TycoonGameOver : MonoBehaviour
while (timer < fallDuration) while (timer < fallDuration)
{ {
elapsedTime += Time.deltaTime; elapsedTime += Time.unscaledDeltaTime;
imageColor.a = Mathf.Clamp01(elapsedTime / fallDuration); imageColor.a = Mathf.Clamp01(elapsedTime / fallDuration);
_text.color = imageColor; _text.color = imageColor;
MoveDown(); MoveDown();
ShakeObject(); ShakeObject();
timer += Time.deltaTime; timer += Time.unscaledDeltaTime;
_titleBtn.SetActive(true); _titleBtn.SetActive(true);
_retryBtn.SetActive(true); _retryBtn.SetActive(true);
@ -120,7 +120,7 @@ public class TycoonGameOver : MonoBehaviour
// 흔들림 구현 함수 // 흔들림 구현 함수
void ShakeObject() void ShakeObject()
{ {
shakeTimer += Time.deltaTime; shakeTimer += Time.unscaledDeltaTime;
// 흔들림 타이머가 주기보다 크면 새로운 흔들림 값을 생성 // 흔들림 타이머가 주기보다 크면 새로운 흔들림 값을 생성
if (shakeTimer > shakeInterval) if (shakeTimer > shakeInterval)
@ -144,7 +144,7 @@ public class TycoonGameOver : MonoBehaviour
void MoveDown() void MoveDown()
{ {
// 점점 밑으로 내려가는 부분 (Y 축 감소, anchoredPosition 사용) // 점점 밑으로 내려가는 부분 (Y 축 감소, anchoredPosition 사용)
originalPosition.y -= fallSpeed * Time.deltaTime; originalPosition.y -= fallSpeed * Time.unscaledDeltaTime;
// 현재 오브젝트 위치도 업데이트 // 현재 오브젝트 위치도 업데이트
_shipRectTransform.anchoredPosition = originalPosition+ shakeOffset; _shipRectTransform.anchoredPosition = originalPosition+ shakeOffset;

View File

@ -115,9 +115,9 @@ public class ManualBook : MonoBehaviour
var createCocktailMenu = new CocktailsBtn(element ,cocktail ,element.Idx,element.Name); var createCocktailMenu = new CocktailsBtn(element ,cocktail ,element.Idx,element.Name);
foreach (var element2 in element.GetValidIngredients()) //들어가는 리큐르, 가니쉬 종류 foreach (var element2 in element.ValidIngredients) //들어가는 리큐르, 가니쉬 종류
{ {
if (element2.Idx.Equals("LiquidA")) {createCocktailMenu.LiquidA = element2.Amount; createCocktailMenu.Sibling -= 1; }; if (element2.Idx.Equals("LiquidA")) {createCocktailMenu.LiquidA = element2.Ratio; createCocktailMenu.Sibling -= 1; };
if (element2.Idx.Equals("LiquidB")) {createCocktailMenu.LiquidB = element2.Amount; createCocktailMenu.Sibling -= 2; }; if (element2.Idx.Equals("LiquidB")) {createCocktailMenu.LiquidB = element2.Amount; createCocktailMenu.Sibling -= 2; };
if (element2.Idx.Equals("LiquidC")) {createCocktailMenu.LiquidC = element2.Amount; createCocktailMenu.Sibling -= 4; }; if (element2.Idx.Equals("LiquidC")) {createCocktailMenu.LiquidC = element2.Amount; createCocktailMenu.Sibling -= 4; };
if (element2.Idx.Equals("LiquidD")) {createCocktailMenu.LiquidD = element2.Amount; createCocktailMenu.Sibling -= 8; }; if (element2.Idx.Equals("LiquidD")) {createCocktailMenu.LiquidD = element2.Amount; createCocktailMenu.Sibling -= 8; };
@ -156,7 +156,7 @@ public class ManualBook : MonoBehaviour
var element = _cocktailsBtn[key]; var element = _cocktailsBtn[key];
check = false; check = false;
foreach (var element2 in element.Cocktail.GetValidIngredients()) foreach (var element2 in element.Cocktail.ValidIngredients)
{ {
if (element2.Idx.Equals("LiquidA")) {}; if (element2.Idx.Equals("LiquidA")) {};
if (element2.Idx.Equals("LiquidB") && playerLv < 5) { check = true; break; } if (element2.Idx.Equals("LiquidB") && playerLv < 5) { check = true; break; }

View File

@ -33,6 +33,10 @@ namespace BlueWater.Uis
private LevelData _lvData; private LevelData _lvData;
[field: SerializeField, CLabel("업그레이드 팝업")]
private GameObject upgradePopup;
private void Awake() private void Awake()
{ {
EventManager.OnLevelUp += Test; EventManager.OnLevelUp += Test;
@ -209,7 +213,7 @@ namespace BlueWater.Uis
RectTransform rect02; RectTransform rect02;
RectTransform rect03; RectTransform rect03;
rect03 = currTycoonCard.GetComponent<RectTransform>(); rect03 = currTycoonCard.GetComponent<RectTransform>();
startPosition03 = rect03.anchoredPosition; startPosition03 = rect03.anchoredPosition;
endPosition03 = new Vector2(0.0f, 0.0f); endPosition03 = new Vector2(0.0f, 0.0f);
@ -261,7 +265,8 @@ namespace BlueWater.Uis
rect02.anchoredPosition = Vector2.Lerp(startPosition02, endPosition02, t); rect02.anchoredPosition = Vector2.Lerp(startPosition02, endPosition02, t);
// 선형 보간을 사용하여 위치와 크기 조정 // 선형 보간을 사용하여 위치와 크기 조정
rect03.anchoredPosition = Vector2.Lerp(startPosition03, endPosition03, EaseEffect.ExpoOut((time / 1.0f) + 1.0f)); // 정규화된 시간 rect03.anchoredPosition =
Vector2.Lerp(startPosition03, endPosition03, EaseEffect.ExpoOut((time / 1.0f) + 1.0f)); // 정규화된 시간
rect03.localScale = Vector3.Lerp(Vector3.one, Vector3.zero, t); rect03.localScale = Vector3.Lerp(Vector3.one, Vector3.zero, t);
// 포물선 효과 추가 // 포물선 효과 추가
@ -280,16 +285,29 @@ namespace BlueWater.Uis
{ {
Destroy(_currentCard01); Destroy(_currentCard01);
} }
if (_currentCard02 != null) if (_currentCard02 != null)
{ {
Destroy(_currentCard02); Destroy(_currentCard02);
} }
if (_currentCard03 != null) if (_currentCard03 != null)
{ {
Destroy(_currentCard03); Destroy(_currentCard03);
} }
VisualFeedbackManager.Instance.ResetTimeScale(); var currentLevelData = TycoonManager.Instance.GetCurrentLevelData();
if (int.Parse(currentLevelData.Idx) % 5 == 0)
{
upgradePopup.SetActive(true);
EventManager.InvokeUpgradeUi(currentLevelData);
}
else
{
VisualFeedbackManager.Instance.ResetTimeScale();
}
} }
} }
} }

View File

@ -1,16 +1,49 @@
using System.Collections;
using BlueWater;
using UnityEngine; using UnityEngine;
public class Upgrade_Popup : MonoBehaviour public class Upgrade_Popup : MonoBehaviour
{ {
[SerializeField]
private AnimationController _animationController;
private bool isReversing = false; // 애니메이션 상태를 체크할 변수
// Start is called once before the first execution of Update after the MonoBehaviour is created // Start is called once before the first execution of Update after the MonoBehaviour is created
void Start() void OnEnable()
{ {
StartCoroutine(StartUpgradePopup());
} }
// Update is called once per frame // ReSharper disable Unity.PerformanceAnalysis
void Update() private IEnumerator StartUpgradePopup()
{ {
float normalizedTime = _animationController.GetCurrentAnimationNormalizedTime();
Debug.Log(normalizedTime);
if (normalizedTime >= 1f)
{
yield return new WaitForSeconds(_animationController.GetCurrentAnimationLength());
}
float timer = 0f;
while (timer < 3.0)
{
timer += Time.unscaledDeltaTime;
yield return null;
}
_animationController.PlayAnimation("CardUpgrade_Reverse");
normalizedTime = _animationController.GetCurrentAnimationNormalizedTime();
Debug.Log(normalizedTime);
if (normalizedTime >= 1f)
{
yield return new WaitForSeconds(_animationController.GetCurrentAnimationLength());
}
VisualFeedbackManager.Instance.ResetTimeScale();
gameObject.SetActive(false);
} }
} }

View File

@ -11,17 +11,61 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 8619181993400042153} m_State: {fileID: 8619181993400042153}
m_Position: {x: 510, y: 150, z: 0} m_Position: {x: 370, y: 140, z: 0}
- serializedVersion: 1
m_State: {fileID: -1545452693241412291}
m_Position: {x: 370, y: 230, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions:
- {fileID: -1408823913477841588}
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 320, y: 80, z: 0} m_AnyStatePosition: {x: 150, y: 110, z: 0}
m_EntryPosition: {x: 330, y: 150, z: 0} m_EntryPosition: {x: 150, y: 150, z: 0}
m_ExitPosition: {x: 730, y: 150, z: 0} m_ExitPosition: {x: 370, y: 300, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8619181993400042153} m_DefaultState: {fileID: 8619181993400042153}
--- !u!1102 &-1545452693241412291
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: CardUpgrade_Reverse
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: 9638333bc5f5e5a4c9260ca14309f58e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1109 &-1408823913477841588
AnimatorTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -1545452693241412291}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 1
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0