diff --git a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/DivaStatusParam.cs b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/DivaStatusParam.cs index f7b3af88..4f38f345 100644 --- a/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/DivaStatusParam.cs +++ b/Unity/Assets/UMAssets/Scripts/XeApp/Game/Menu/DivaStatusParam.cs @@ -802,8 +802,10 @@ private void UpdateSkillMisMatch(int dispIndex) } } int musicId = m_musicData != null ? m_musicData.DLAEJOBELBH_MusicId : 0; - if(dispIndex == 0) + if(dispIndex != 1) { + if(dispIndex != 0) + return; string lbl = "05"; string lbl2 = "05"; if(m_sceneList[0] == null) @@ -847,7 +849,7 @@ private void UpdateSkillMisMatch(int dispIndex) m_centerSkillMisMatch.StartChildrenAnimGoStop(lbl); m_activeSkillMisMatch.StartChildrenAnimGoStop(lbl2); } - else if(dispIndex == 1) + else { string lbl = "05"; if(m_sceneList[0] == null) @@ -869,7 +871,7 @@ private void UpdateSkillMisMatch(int dispIndex) } if(skillId > 0) { - if(!m_isCenterDiva) + if(m_isCenterDiva) { if(m_sceneList[0].DCLLIDMKNGO_IsDivaCompatible(m_divaData.AHHJLDLAPAN_DivaId)) { @@ -890,43 +892,40 @@ private void UpdateSkillMisMatch(int dispIndex) } } m_liveSkillMisMatch[0].StartChildrenAnimGoStop(lbl); - for(int i = 1; i < m_sceneList.Count; i++) + } + for(int i = 1; i < m_sceneList.Count; i++) + { + string lbl = "05"; + if(m_sceneList[i] == null) { - lbl = "05"; - if(m_sceneList[i] == null) + m_regulationButtons[i].Setup(0, RegulationButton.Type.Live, null); + } + else + { + m_regulationButtons[i].Setup(musicId, RegulationButton.Type.Live, m_sceneList[i]); + + int skillId; + if(m_musicData == null) { - m_regulationButtons[i].Setup(0, RegulationButton.Type.Live, null); + skillId = m_sceneList[i].FILPDDHMKEJ_GetLiveSkillId(false, 0, 0); } else { - m_regulationButtons[i].Setup(musicId, RegulationButton.Type.Live, m_sceneList[i]); - - int skillId; - if(m_musicData == null) - { - skillId = m_sceneList[i].FILPDDHMKEJ_GetLiveSkillId(false, 0, 0); - } - else - { - skillId = m_sceneList[i].FILPDDHMKEJ_GetLiveSkillId(false, m_musicData.FKDCCLPGKDK_JacketAttr, m_musicData.AIHCEGFANAM_Serie); - } - if(skillId > 0) + skillId = m_sceneList[i].FILPDDHMKEJ_GetLiveSkillId(false, m_musicData.FKDCCLPGKDK_JacketAttr, m_musicData.AIHCEGFANAM_Serie); + } + if(skillId > 0) + { + lbl = "01"; + if(m_sceneList[i].DCLLIDMKNGO_IsDivaCompatible(m_divaData.AHHJLDLAPAN_DivaId)) { - if(m_sceneList[i].DCLLIDMKNGO_IsDivaCompatible(m_divaData.AHHJLDLAPAN_DivaId)) - { - if(m_regulationButtons[i].IsMisMatchAttr) - lbl = "08"; - if(m_regulationButtons[i].IsMisMatchMusic) - lbl = "06"; - } - else - { - lbl = "01"; - } + if(m_regulationButtons[i].IsMisMatchAttr) + lbl = "08"; + if(m_regulationButtons[i].IsMisMatchMusic) + lbl = "06"; } } - m_liveSkillMisMatch[i].StartChildrenAnimGoStop(lbl); } + m_liveSkillMisMatch[i].StartChildrenAnimGoStop(lbl); } }