Update - 1.7.0.92

EN: 1.7.0.92
CN: 1.7.0.94
JP: 1.7.0.95
KR: 1.7.0.98
This commit is contained in:
SL1900
2026-03-10 15:00:00 +09:00
parent c23483b27a
commit 4e310712a3
15 changed files with 60 additions and 45 deletions
+1 -1
View File
@@ -1090,7 +1090,7 @@ return {
"",
false,
"",
"괜찮아요. 꽃은 내년에 또 필 테니까",
"괜찮아. 내년에 또 필 테니까",
""
}
},
+1 -1
View File
@@ -209,7 +209,7 @@ return {
icon = "Icon/Head/head_14901_S",
name = "그레이",
landmark = "아모르 실버 에리어 은혜 대성전",
signature = "께 문자 드렸는데, 서비스 지역이 아니라고 합니다"
signature = "께 문자 드렸는데, 서비스 지역이 아니라고 합니다"
},
{
id = 150,
+1 -1
View File
@@ -58,7 +58,7 @@ end
function JointDrillBattlePanel:OnEnable()
local wait = function()
coroutine.yield(CS.UnityEngine.WaitForEndOfFrame())
EventManager.Hit(EventId.OpenPanel, PanelId.Hud, self.nType)
EventManager.Hit(EventId.OpenPanel, PanelId.Hud, false, false, self.nType)
EventManager.Hit(EventId.ClosePanel, PanelId.MainlineFormation)
EventManager.Hit(EventId.ClosePanel, PanelId.RegionBossFormation)
coroutine.yield(CS.UnityEngine.WaitForEndOfFrame())
+6 -4
View File
@@ -128,7 +128,8 @@ EliteMonsterHudCtrl._mapNodeConfig = {
EliteMonsterHudCtrl._mapEventConfig = {}
local multipleBossIcon = {
[GameEnum.monsterBloodType.BOSS] = "icon_story_boss1",
[GameEnum.monsterBloodType.MINIBOSS] = "icon_story_boss2"
[GameEnum.monsterBloodType.MINIBOSS] = "icon_story_boss2",
[GameEnum.monsterBloodType.JOINTDRILLBOSS] = "icon_story_boss1"
}
function EliteMonsterHudCtrl:PlayTweenHp(hp, hpMax)
local nWidth = 1 <= hp / hpMax and BarWidth or hp / hpMax * BarWidth
@@ -296,7 +297,7 @@ function EliteMonsterHudCtrl:OnDisable()
end
function EliteMonsterHudCtrl:OnDestroy()
end
function EliteMonsterHudCtrl:SetMonsterId(monsterId, nDataId, nType, bMultipleBoss)
function EliteMonsterHudCtrl:SetMonsterId(monsterId, nDataId, nType)
if self.monsterId == monsterId then
return
end
@@ -306,8 +307,9 @@ function EliteMonsterHudCtrl:SetMonsterId(monsterId, nDataId, nType, bMultipleBo
return
end
self.monsterId = monsterId
self._mapNode.imgBossIcon.gameObject:SetActive(bMultipleBoss)
if bMultipleBoss then
local bShowBossIcon = nType == GameEnum.monsterBloodType.BOSS or nType == GameEnum.monsterBloodType.MINIBOSS or nType == GameEnum.monsterBloodType.JOINTDRILLBOSS
self._mapNode.imgBossIcon.gameObject:SetActive(bShowBossIcon)
if bShowBossIcon then
local sIcon = multipleBossIcon[nType]
self:SetAtlasSprite(self._mapNode.imgBossIcon, "15_battle", sIcon)
NovaAPI.SetImageNativeSize(self._mapNode.imgBossIcon)
+4 -3
View File
@@ -65,6 +65,7 @@ function HudMainCtrl:OnEnable()
local tbParam = self:GetPanelParam()
self.isVampireInstance = tbParam[1] or false
local bNotAdventureEnter = tbParam[2]
self.jointDrillType = tbParam[3]
if not bNotAdventureEnter then
self._mapNode.BattleTarget.gameObject:SetActive(true)
end
@@ -141,7 +142,7 @@ function HudMainCtrl:MonsterShowChanged(id, showed, nType, nDataId)
self.monsterHuds[id] = nil
end
end
function HudMainCtrl:MonsterAdvShowChanged(id, showed, nType, nDataId, bMultipleBoss)
function HudMainCtrl:MonsterAdvShowChanged(id, showed, nType, nDataId)
local monsterHud = self.monsterAdvHuds[id]
local isPlayerSummoner = nType == GameEnum.monsterBloodType.PLAYERSUMMON
if showed then
@@ -157,7 +158,7 @@ function HudMainCtrl:MonsterAdvShowChanged(id, showed, nType, nDataId, bMultiple
monsterHud.gameObject.transform.localScale = Vector3.one
end
if monsterHud ~= nil then
monsterHud:SetMonsterId(id, nDataId, nType, bMultipleBoss)
monsterHud:SetMonsterId(id, nDataId, nType)
local height = AdventureModuleHelper.GetEntityMonsterBarHeight(id)
local offset = Vector3(0, height, 0)
AdventureModuleHelper.SetHudFollowTarget(id, monsterHud.gameObject, offset, true)
@@ -170,7 +171,7 @@ end
function HudMainCtrl:OnEvent_ShowBossHUD(bossId, nType, showed, nDataId, nBloodType)
self.nBloodType = nBloodType
showed = showed and self.tbBossBloodState[bossId] == true
self:MonsterAdvShowChanged(bossId, showed, nType, nDataId, true)
self:MonsterAdvShowChanged(bossId, showed, nType, nDataId)
end
function HudMainCtrl:OnEvent_MonsterHUDChange(id, nType, showed, nDataId)
if nType == GameEnum.monsterBloodType.BOSSRUSH then
@@ -195,7 +195,7 @@ function PenguinCardFlipCtrl:RefreshRoundScore()
NovaAPI.SetTMPText(self._mapNode.txtRoundScore, self:ThousandsNumber(clearFloat(self._panel.mapLevel.nRoundScore)))
NovaAPI.SetTMPText(self._mapNode.txtRoundScoreBase, self:ThousandsNumber(clearFloat(self._panel.mapLevel.nRoundValue)))
local nRatio = self._panel.mapLevel.nRoundMultiRatio > 0 and self._panel.mapLevel.nRoundRatio * self._panel.mapLevel.nRoundMultiRatio or self._panel.mapLevel.nRoundRatio
NovaAPI.SetTMPText(self._mapNode.txtRoundScoreRatio, string.format("%.1f", nRatio))
NovaAPI.SetTMPText(self._mapNode.txtRoundScoreRatio, math.floor(nRatio * 10 + 0.5 + 1.0E-9) / 10)
end
function PenguinCardFlipCtrl:RefreshButton()
self:RefreshAuto()
@@ -661,7 +661,11 @@ function PenguinLevel:ChangeRoundScore(nAddValue, nAddRatio, nAddMultiRatio, bFr
self.nRoundValue = self.nRoundValue + nAddValue
self.nRoundMultiRatio = self.nRoundMultiRatio + nAddMultiRatio
self.nRoundRatio = self.nRoundRatio + nAddRatio
self.nRoundScore = self.nRoundMultiRatio > 0 and self.nRoundValue * self.nRoundRatio * self.nRoundMultiRatio or self.nRoundValue * self.nRoundRatio
local nBeforeAllRatio = 0 < nBeforeMultiRatio and nBeforeMultiRatio * nBeforeRatio or nBeforeRatio
local nAfterAllRatio = self.nRoundMultiRatio > 0 and self.nRoundRatio * self.nRoundMultiRatio or self.nRoundRatio
nBeforeAllRatio = math.floor(nBeforeAllRatio * 10 + 0.5 + 1.0E-9) / 10
nAfterAllRatio = math.floor(nAfterAllRatio * 10 + 0.5 + 1.0E-9) / 10
self.nRoundScore = self.nRoundValue * nAfterAllRatio
local nAddScore = self.nRoundScore - nBeforeScore
self.nTurnScore = self.nTurnScore + nAddScore
if self.nTurnScore > self.nBestTurnScore then
@@ -670,8 +674,6 @@ function PenguinLevel:ChangeRoundScore(nAddValue, nAddRatio, nAddMultiRatio, bFr
if self.nRoundScore > self.nBestRoundScore then
self.nBestRoundScore = self.nRoundScore
end
local nBeforeAllRatio = 0 < nBeforeMultiRatio and nBeforeMultiRatio * nBeforeRatio or nBeforeRatio
local nAfterAllRatio = self.nRoundMultiRatio > 0 and self.nRoundRatio * self.nRoundMultiRatio or self.nRoundRatio
EventManager.Hit("PenguinCard_ChangeRoundScore", nBeforeBase, nBeforeAllRatio, nBeforeScore, bFromHandRank)
if NovaAPI.IsEditorPlatform() then
printLog("轮积分变化:" .. nAddScore .. " (" .. nBeforeScore .. " -> " .. self.nRoundScore .. ")")