Update - 1.7.0.89

EN: 1.7.0.89 CN: 1.7.0.91 JP: 1.7.0.92 KR: 1.7.0.95
2026-02-28 15:00:00 +09:00
parent 86d82306fe
commit e01012cbcc
92 changed files with 1562 additions and 936 deletions
@@ -565,19 +565,16 @@ function FormationDisc_ListCtrl:PlayDiscBGM(nDiscId, tbMain, tbSub)
 		if mapDiscCfg ~= nil then
 			tbCharInDisc = mapDiscCfg.CharId
 		end
-		local nRandomCharId = self.tbCharId[math.random(1, #self.tbCharId)]
 		local bInTeam = false
-		for _, v in ipairs(tbCharInDisc) do
-			if nRandomCharId == v then
+		for _, v in ipairs(self.tbCharId) do
+			if table.indexof(tbCharInDisc, v) > 0 then
 				bInTeam = true
-				break
+				sVoiceKey = "uniMusic"
+				return v
 			end
 		end
-		if not bInTeam then
-			sVoiceKey = "music"
-		else
-			sVoiceKey = "uniMusic"
-		end
+		local nRandomCharId = self.tbCharId[math.random(1, #self.tbCharId)]
+		sVoiceKey = "music"
 		return nRandomCharId
 	end
 	if nDiscId == nil then