zzy/bansonic_beta_main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

UI HUGE UPDATE

Browse Source
This commit is contained in:
FloatGaming
2026-06-25 11:48:56 +08:00
parent bd2a06f4c7
commit b2a1e307a4
1806 changed files with 359863 additions and 20822 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/scripts/gamePlay_gameplay/settlementController.cs
+14 -18
View File
@@ -560,7 +560,10 @@ public class settlementController : MonoBehaviour
if(sm != null)
{
songName_Text.text = bmm.parsedTitle;
thisSong_backPic.sprite = bmm.assignedSongData.fullscreen_songPicture;
if (bmm.assignedSongData != null)
{
thisSong_backPic.sprite = bmm.assignedSongData.GetResolvedFullscreenSongPicture();
}
targetPmScore = sm.allSum_pmScore;
targetIdolScore = sm.allSum_idolScore;
@@ -1379,35 +1382,27 @@ public class settlementController : MonoBehaviour
return;
}
dlcData[] allDlcs = RuntimeResourcesCache.LoadAllDlcs();
dlcData foundDlc = null;
dlcData foundDlc = SongDlcContentResolver.GetOwningDlc(thisSong_so);
AudioClip resolvedSettlementMusic = thisSong_so.GetResolvedSettlementMusic();
for (int i = 0; i < allDlcs.Length; i++)
{
dlcData dlc = allDlcs[i];
if (dlc == null || dlc.songList == null) continue;
if (!dlc.songList.Contains(thisSong_so)) continue;
foundDlc = dlc;
break;
}
if (foundDlc == null)
if (foundDlc == null && resolvedSettlementMusic == null)
{
Debug.LogWarning($"[SettlementController] No DLC found containing song '{thisSong_so.songName}'");
return;
}
if (foundDlc.settlementMusic == null)
if (resolvedSettlementMusic == null)
{
Debug.LogWarning($"[SettlementController] DLC '{foundDlc.dlcName}' does not have settlement music assigned");
string dlcName = foundDlc != null ? foundDlc.dlcName : thisSong_so.belongsTo_whichDLC;
Debug.LogWarning($"[SettlementController] DLC '{dlcName}' does not have settlement music assigned");
return;
}
bool clipChanged = settlementAudioSource.clip != foundDlc.settlementMusic;
bool clipChanged = settlementAudioSource.clip != resolvedSettlementMusic;
if (clipChanged)
{
settlementAudioSource.Stop();
settlementAudioSource.clip = foundDlc.settlementMusic;
settlementAudioSource.clip = resolvedSettlementMusic;
settlementAudioSource.time = 0f;
}
@@ -1416,7 +1411,8 @@ public class settlementController : MonoBehaviour
settlementAudioSource.volume = 1f;
settlementAudioSource.mute = false;
Debug.Log($"[SettlementController] Prepared settlement music from DLC '{foundDlc.dlcName}': {foundDlc.settlementMusic.name}");
string resolvedDlcName = foundDlc != null ? foundDlc.dlcName : (thisSong_so.belongsTo_whichDLC ?? "DLC");
Debug.Log($"[SettlementController] Prepared settlement music from DLC '{resolvedDlcName}': {resolvedSettlementMusic.name}");
}
/// <summary>