UI换了很多,spine主视觉停用
This commit is contained in:
@@ -189,7 +189,7 @@ public class ScoreManager : MonoBehaviour
|
||||
perfectBonusHooked = false;
|
||||
}
|
||||
|
||||
var jm = JudgeManager.Instance ?? UnityEngine.Object.FindAnyObjectByType<JudgeManager>();
|
||||
var jm = JudgeManager.Instance ?? SceneObjectLookupCache.FindAny<JudgeManager>();
|
||||
if (jm == null) return;
|
||||
|
||||
jm.AllNotesJudged -= OnAllNotesJudgedForPerfectBonus;
|
||||
@@ -211,7 +211,7 @@ public class ScoreManager : MonoBehaviour
|
||||
|
||||
private int GetCurrentChartLogicalNoteCount()
|
||||
{
|
||||
var bmm = UnityEngine.Object.FindAnyObjectByType<BeatmapManager>();
|
||||
var bmm = SceneObjectLookupCache.FindAny<BeatmapManager>();
|
||||
if (bmm != null)
|
||||
{
|
||||
if (bmm.beatmap != null && bmm.beatmap.notes != null && bmm.beatmap.notes.Length > 0)
|
||||
@@ -226,7 +226,7 @@ public class ScoreManager : MonoBehaviour
|
||||
|
||||
private int GetCurrentChartLeftoverScore()
|
||||
{
|
||||
var bmm = UnityEngine.Object.FindAnyObjectByType<BeatmapManager>();
|
||||
var bmm = SceneObjectLookupCache.FindAny<BeatmapManager>();
|
||||
if (bmm == null) return 0;
|
||||
return Mathf.Max(0, bmm.leftoverScore);
|
||||
}
|
||||
@@ -289,11 +289,11 @@ public class ScoreManager : MonoBehaviour
|
||||
private void EnsureIdolscoreKeys()
|
||||
{
|
||||
// Try to resolve missing refs (GameObject.Find doesn't return inactive objects).
|
||||
if (_idolscoreKeys[0] == null) _idolscoreKeys[0] = GameObject.Find("idolscoreKey_red")?.transform;
|
||||
if (_idolscoreKeys[1] == null) _idolscoreKeys[1] = GameObject.Find("idolscoreKey_green")?.transform;
|
||||
if (_idolscoreKeys[2] == null) _idolscoreKeys[2] = GameObject.Find("idolscoreKey_yellow")?.transform;
|
||||
if (_idolscoreKeys[3] == null) _idolscoreKeys[3] = GameObject.Find("idolscoreKey_purple")?.transform;
|
||||
if (_idolscoreKeys[4] == null) _idolscoreKeys[4] = GameObject.Find("idolscoreKey_blue")?.transform;
|
||||
if (_idolscoreKeys[0] == null) _idolscoreKeys[0] = SceneObjectLookupCache.Find("idolscoreKey_red")?.transform;
|
||||
if (_idolscoreKeys[1] == null) _idolscoreKeys[1] = SceneObjectLookupCache.Find("idolscoreKey_green")?.transform;
|
||||
if (_idolscoreKeys[2] == null) _idolscoreKeys[2] = SceneObjectLookupCache.Find("idolscoreKey_yellow")?.transform;
|
||||
if (_idolscoreKeys[3] == null) _idolscoreKeys[3] = SceneObjectLookupCache.Find("idolscoreKey_purple")?.transform;
|
||||
if (_idolscoreKeys[4] == null) _idolscoreKeys[4] = SceneObjectLookupCache.Find("idolscoreKey_blue")?.transform;
|
||||
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
@@ -345,18 +345,17 @@ public class ScoreManager : MonoBehaviour
|
||||
|
||||
for (int i = 0; i < 5; i++)
|
||||
{
|
||||
if (allyCombatants[i] != null) continue;
|
||||
var current = allyCombatants[i];
|
||||
if (current != null) continue;
|
||||
|
||||
var go = allyObjects[i];
|
||||
if (go == null)
|
||||
{
|
||||
go = GameObject.Find($"ally_0{i + 1}");
|
||||
go = SceneObjectLookupCache.Find($"ally_0{i + 1}");
|
||||
allyObjects[i] = go;
|
||||
}
|
||||
if (go != null)
|
||||
{
|
||||
allyCombatants[i] = go.GetComponent<AllyCombatant>();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -436,19 +435,32 @@ public class ScoreManager : MonoBehaviour
|
||||
// Legacy Text fields on teamUIController
|
||||
try
|
||||
{
|
||||
if (ui.red_pmScore_sum != null) ui.red_pmScore_sum.text = red_pmScore_sum.ToString();
|
||||
if (ui.green_pmScore_sum != null) ui.green_pmScore_sum.text = green_pmScore_sum.ToString();
|
||||
if (ui.yellow_pmScore_sum != null) ui.yellow_pmScore_sum.text = yellow_pmScore_sum.ToString();
|
||||
if (ui.purple_pmScore_sum != null) ui.purple_pmScore_sum.text = purple_pmScore_sum.ToString();
|
||||
if (ui.blue_pmScore_sum != null) ui.blue_pmScore_sum.text = blue_pmScore_sum.ToString();
|
||||
if (ui.allSum_pmScore != null) ui.allSum_pmScore.text = allSum_pmScore.ToString();
|
||||
string redPmText = red_pmScore_sum.ToString();
|
||||
string greenPmText = green_pmScore_sum.ToString();
|
||||
string yellowPmText = yellow_pmScore_sum.ToString();
|
||||
string purplePmText = purple_pmScore_sum.ToString();
|
||||
string bluePmText = blue_pmScore_sum.ToString();
|
||||
string allPmText = allSum_pmScore.ToString();
|
||||
string redIdolText = red_idolScore_sum.ToString();
|
||||
string greenIdolText = green_idolScore_sum.ToString();
|
||||
string yellowIdolText = yellow_idolScore_sum.ToString();
|
||||
string purpleIdolText = purple_idolScore_sum.ToString();
|
||||
string blueIdolText = blue_idolScore_sum.ToString();
|
||||
string allIdolText = allSum_idolScore.ToString();
|
||||
|
||||
if (ui.red_idolScore_sum != null) ui.red_idolScore_sum.text = red_idolScore_sum.ToString();
|
||||
if (ui.green_idolScore_sum != null) ui.green_idolScore_sum.text = green_idolScore_sum.ToString();
|
||||
if (ui.yellow_idolScore_sum != null) ui.yellow_idolScore_sum.text = yellow_idolScore_sum.ToString();
|
||||
if (ui.purple_idolScore_sum != null) ui.purple_idolScore_sum.text = purple_idolScore_sum.ToString();
|
||||
if (ui.blue_idolScore_sum != null) ui.blue_idolScore_sum.text = blue_idolScore_sum.ToString();
|
||||
if (ui.allSum_idolScore != null) ui.allSum_idolScore.text = allSum_idolScore.ToString();
|
||||
if (ui.red_pmScore_sum != null) ui.red_pmScore_sum.text = redPmText;
|
||||
if (ui.green_pmScore_sum != null) ui.green_pmScore_sum.text = greenPmText;
|
||||
if (ui.yellow_pmScore_sum != null) ui.yellow_pmScore_sum.text = yellowPmText;
|
||||
if (ui.purple_pmScore_sum != null) ui.purple_pmScore_sum.text = purplePmText;
|
||||
if (ui.blue_pmScore_sum != null) ui.blue_pmScore_sum.text = bluePmText;
|
||||
if (ui.allSum_pmScore != null) ui.allSum_pmScore.text = allPmText;
|
||||
|
||||
if (ui.red_idolScore_sum != null) ui.red_idolScore_sum.text = redIdolText;
|
||||
if (ui.green_idolScore_sum != null) ui.green_idolScore_sum.text = greenIdolText;
|
||||
if (ui.yellow_idolScore_sum != null) ui.yellow_idolScore_sum.text = yellowIdolText;
|
||||
if (ui.purple_idolScore_sum != null) ui.purple_idolScore_sum.text = purpleIdolText;
|
||||
if (ui.blue_idolScore_sum != null) ui.blue_idolScore_sum.text = blueIdolText;
|
||||
if (ui.allSum_idolScore != null) ui.allSum_idolScore.text = allIdolText;
|
||||
}
|
||||
catch (System.Exception ex)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user