Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

이상현상 22 refactoring #202

Merged
merged 1 commit into from
Dec 15, 2024
Merged

이상현상 22 refactoring #202

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 35 additions & 6 deletions 302/Assets/Scripts/SpecificAnomalyManager/Anomaly22Controller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ public class Anomaly22Controller : AbstractAnomalyObject
private List<Transform> floorTiles = new List<Transform>();
private Transform platformTile;


void Start()
public override bool StartAnomaly()
{
gameManager = GameObject.Find("GameManager").GetComponent<GameManager>();
playerController = GameObject.Find("Player").GetComponent<PlayerController>();
Expand All @@ -33,14 +32,43 @@ void Start()
floorTiles = new List<Transform>(floorTilesArray);
platformTile = FindPlatformTile();

StartCoroutine(AddBoxColliders()); // 타일 각각에 Collider 추가
StartCoroutine(DestroyFloorBoxCollider()); // Floor Parent의 통일된 Collider 제거
StartCoroutine(StartWithDelay());

bool res = base.StartAnomaly();
return res;
}

private IEnumerator StartWithDelay()
{
yield return new WaitForSeconds(5f);

StartCoroutine(InitializeCollidersAndDestroyParentCollider());
StartCoroutine(CountSeconds());
StartCoroutine(TriggerPlatformFall());
StartCoroutine(TriggerRandomTileShakeAndFallWithInterval());
}


private IEnumerator InitializeCollidersAndDestroyParentCollider()
{
yield return StartCoroutine(AddBoxColliders());
yield return StartCoroutine(DestroyFloorBoxCollider());
}

// 이상현상을 초기화하는 메서드
public override bool ResetAnomaly()
{
RestoreAllTiles();

bool res = base.ResetAnomaly();
return res;
}

private void Start()
{
StartAnomaly();
}

private Transform FindPlatformTile()
{
foreach (var tile in floorTiles)
Expand Down Expand Up @@ -79,6 +107,7 @@ private IEnumerator DestroyFloorBoxCollider()
if (boxCollider != null)
{
Destroy(boxCollider);

}
yield return null;
}
Expand All @@ -100,7 +129,7 @@ private IEnumerator AddBoxColliders()
Vector3 originalCenter = tileCollider.center;

tileCollider.size = new Vector3(originalSize.x, originalSize.y, originalSize.z * 20); // Change Y value to 3
tileCollider.center = new Vector3(originalCenter.x, originalCenter.y, originalCenter.z - originalSize.z * 20); // Adjust center for correct positioning
tileCollider.center = new Vector3(originalCenter.x, originalCenter.y, originalCenter.z - originalSize.z * 10); // Adjust center for correct positioning
}
}
yield return null;
Expand All @@ -118,7 +147,7 @@ private IEnumerator CountSeconds()
void Update()
{
// 아래로 떨어졌는지 확인해서 Game Over 처리
if (playerController.transform.position.y < -1f && !isPlayerDead && false)
if (playerController.transform.position.y < -5f && !isPlayerDead)
{
playerController.Sleep();
isPlayerDead = true;
Expand Down
Loading