Commit d39a7441 authored by 18신대성's avatar 18신대성

스테이지 셀렉터 문제들 해결

parent 7cd0d9c7
...@@ -386,7 +386,7 @@ GameObject: ...@@ -386,7 +386,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 &238561069 --- !u!224 &238561069
RectTransform: RectTransform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1975,6 +1975,16 @@ PrefabInstance: ...@@ -1975,6 +1975,16 @@ PrefabInstance:
m_Modification: m_Modification:
m_TransformParent: {fileID: 0} m_TransformParent: {fileID: 0}
m_Modifications: m_Modifications:
- target: {fileID: 52444459818764334, guid: 42247a938bb6e554eb00dc08303a72d6,
type: 3}
propertyPath: m_Name
value: GameManager
objectReference: {fileID: 0}
- target: {fileID: 52444459818764334, guid: 42247a938bb6e554eb00dc08303a72d6,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2122327709, guid: 42247a938bb6e554eb00dc08303a72d6, type: 3} - target: {fileID: 2122327709, guid: 42247a938bb6e554eb00dc08303a72d6, type: 3}
propertyPath: uiGenerator propertyPath: uiGenerator
value: value:
...@@ -2007,16 +2017,6 @@ PrefabInstance: ...@@ -2007,16 +2017,6 @@ PrefabInstance:
propertyPath: clearUINextText propertyPath: clearUINextText
value: value:
objectReference: {fileID: 1463021450} objectReference: {fileID: 1463021450}
- target: {fileID: 52444459818764334, guid: 42247a938bb6e554eb00dc08303a72d6,
type: 3}
propertyPath: m_Name
value: GameManager
objectReference: {fileID: 0}
- target: {fileID: 52444459818764334, guid: 42247a938bb6e554eb00dc08303a72d6,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 52444459818764335, guid: 42247a938bb6e554eb00dc08303a72d6, - target: {fileID: 52444459818764335, guid: 42247a938bb6e554eb00dc08303a72d6,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
......
...@@ -128,7 +128,16 @@ public class GameManager : SingletonBehaviour<GameManager> ...@@ -128,7 +128,16 @@ public class GameManager : SingletonBehaviour<GameManager>
public void LoadNextStage() public void LoadNextStage()
{ {
StageSelector.selectedStage = StageSelector.nextStage; StageSelector.selectedStage = StageSelector.nextStage;
StageSelector.nextStage = (StageSelector.inst.stageIdxs.Count > StageSelector.inst.stageIdx + 1) ? StageSelector.inst.stageIdxs[StageSelector.inst.stageIdx + 1] : "0-0" ; if (StageSelector.inst.stageIdxs.Count > StageSelector.inst.stageIdx + 1)
{
StageSelector.nextStage = StageSelector.inst.stageIdxs[StageSelector.inst.stageIdx + 1];
StageSelector.inst.stageIdx++;
}
else
{
StageSelector.nextStage = "1_1";
StageSelector.inst.stageIdx = 0;
}
StartCoroutine(RestartStage()); StartCoroutine(RestartStage());
} }
......
...@@ -54,9 +54,9 @@ public class StageSelector : SingletonBehaviour<StageSelector> ...@@ -54,9 +54,9 @@ public class StageSelector : SingletonBehaviour<StageSelector>
var uiText = uiInst.GetComponentInChildren<Text>(); var uiText = uiInst.GetComponentInChildren<Text>();
string uiStage = (i + 1) + "_" + (j + 1); string uiStage = (i + 1) + "_" + (j + 1);
stageIdxs.Add(uiStage); stageIdxs.Add(uiStage);
string nextStage = (j + 1 < categoryCounts[i]) ? ((i + 1) + "_" + (j + 2)) : ((i + 2) + "_0"); string nextStage = (j < categoryCounts[i]) ? ((i + 1) + "_" + (j + 2)) : ((i + 2) + "_0");
uiInst.GetComponent<Button>().onClick.AddListener(() => StartSelectedStage(uiStage, nextStage, stageIdxCounter)); int _stageidx = stageIdxCounter++;
stageIdxCounter++; uiInst.GetComponent<Button>().onClick.AddListener(() => StartSelectedStage(uiStage, nextStage, _stageidx));
uiInst.transform.localPosition = generatePoint; uiInst.transform.localPosition = generatePoint;
uiText.text = (j + 1).ToString(); uiText.text = (j + 1).ToString();
if (playerData.isCleared.ContainsKey(uiStage) && playerData.isCleared[uiStage]) if (playerData.isCleared.ContainsKey(uiStage) && playerData.isCleared[uiStage])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment