diff --git a/data/bin/Buff.json b/data/bin/Buff.json index 60efe1d2..4ad4910c 100644 --- a/data/bin/Buff.json +++ b/data/bin/Buff.json @@ -15958,8 +15958,8 @@ "BuffTag4": 0, "BuffTag5": 0, "BindEffect": "", - "Icon": "", - "IsShow": false, + "Icon": "Icon/Buff/Icon_CommonBuff_DefenseDown", + "IsShow": true, "TopofHeadEffect": "", "BuffNumEffectLevel": [], "NotRemove": false, diff --git a/data/bin/MonsterValueTempleteAdjust.json b/data/bin/MonsterValueTempleteAdjust.json index cb0053e0..f1004d26 100644 --- a/data/bin/MonsterValueTempleteAdjust.json +++ b/data/bin/MonsterValueTempleteAdjust.json @@ -24054,7 +24054,7 @@ 4, 3 ], - "HpRatio": 0, + "HpRatio": -2000, "HpFix": 0, "AtkRatio": 0, "AtkFix": 0, diff --git a/data/bin/buff.bytes b/data/bin/buff.bytes index b83b14b4..b70821cc 100644 Binary files a/data/bin/buff.bytes and b/data/bin/buff.bytes differ diff --git a/data/bin/monstervaluetempleteadjust.bytes b/data/bin/monstervaluetempleteadjust.bytes index d8411b41..59cc70f2 100644 Binary files a/data/bin/monstervaluetempleteadjust.bytes and b/data/bin/monstervaluetempleteadjust.bytes differ diff --git a/data/bubble/bubbleoffset.json b/data/bubble/bubbleoffset.json index b486ef07..185272b2 100644 --- a/data/bubble/bubbleoffset.json +++ b/data/bubble/bubbleoffset.json @@ -476,8 +476,8 @@ "cgX": 0, "cgY": 0, "left": false, - "x": -2, - "y": -57 + "x": -54, + "y": -18 }, "14901": { "cgLeft": false, diff --git a/data/gave_up/LanguageCommon.zh_cn.json b/data/gave_up/LanguageCommon.zh_cn.json index 40e39897..ab12e563 100644 --- a/data/gave_up/LanguageCommon.zh_cn.json +++ b/data/gave_up/LanguageCommon.zh_cn.json @@ -35682,7 +35682,7 @@ "UIText.Disc_StoryLimitTip.1": "暂未解锁", "UIText.Disc_SubSkill_ActiveConditions.1": "激活条件：", "UIText.Disc_SubSkill_ActiveLevel.1": "≥{num_0}个", - "UIText.Disc_SubSkill_Level.1": "{num_0}个", + "UIText.Disc_SubSkill_Level.1": "{num_0}级", "UIText.Disc_SubSkill_Tip.1": "进入星塔时，获得以下音符", "UIText.Disc_SubSkill_Title.1": "协奏技能", "UIText.Disc_SubSkill_TitleTip.1": "可通过收集音符激活与升级", diff --git a/data/language/en_us/scorebossability.json b/data/language/en_us/scorebossability.json index 5db35f04..56f47643 100644 --- a/data/language/en_us/scorebossability.json +++ b/data/language/en_us/scorebossability.json @@ -18,7 +18,7 @@ "ScoreBossAbility.100008.1": "Focus", "ScoreBossAbility.100008.2": "The boss gains a stack of Focus after taking DMG for &Param1& times, boosting its DMG Dealt by &Param2&.\nTriggering a Mark &Param4& times within &Param3&s clears all Focus stacks. For the next &Param5&s, the boss takes &Param6& more DMG from Support Skills. This effect triggers up to once every &Param7&s. Retriggering resets the duration.", "ScoreBossAbility.100009.1": "Baron Stance", - "ScoreBossAbility.100009.2": "The boss alternates between Warrior and Honeypot forms, switching every &Param1&s and clearing all its debuffs (Resilience Break does not count toward the timer).\nIn Warrior form, Count of the Duloos's Ultimate DMG Taken decraeses additionally by &Param2&, and Auto Attack DMG Taken increases additionally by &Param3&.\nIn Honeypot form, Count of the Duloos's Mark DMG Taken decerases additionally by &Param4&, and Skill DMG Taken increases additionally by &Param5&.", + "ScoreBossAbility.100009.2": "The boss alternates between Warrior and Honeypot forms, switching every &Param1&s and clearing all its debuffs (Resilience Break does not count toward the timer).\nIn Warrior form, Count of the Duloos's Ultimate DMG Taken decreases additionally by &Param2&, and Auto Attack DMG Taken increases additionally by &Param3&.\nIn Honeypot form, Count of the Duloos's Mark DMG Taken decreases additionally by &Param4&, and Skill DMG Taken increases additionally by &Param5&.", "ScoreBossAbility.100010.1": "Aqua Ring", "ScoreBossAbility.100010.2": "While the boss possesses Water Ring, its DMG is increased by &Param1&, and it deals AoE DMG every 5s.\nDealing &Param2& instances of DMG to the boss within 5s disables Water Ring for &Param3&s. When Water Ring is disabled:\nDealing &Param4& instances of Support DMG to the boss within 5s increases the Auto Attack DMG the boss takes by&Param5&.\nDealing &Param6& instances of Main Trekker DMG within 5s increases the Skill DMG the boss takes from Support Trekkers by &Param7&." } \ No newline at end of file diff --git a/data/language/en_us/uitext.json b/data/language/en_us/uitext.json index 173c8938..4e0a87df 100644 --- a/data/language/en_us/uitext.json +++ b/data/language/en_us/uitext.json @@ -2128,8 +2128,8 @@ "UIText.PenguinCard_LeftRound.1": "{{num_0} round(s) left", "UIText.PenguinCard_LeftTurn.1": "{num_0} turns left", "UIText.PenguinCard_Level_BestScore.1": "Best", - "UIText.PenguinCard_Level_LockLevel.1": "Unlocked after completing the previous stage.", - "UIText.PenguinCard_Level_LockLevelTips.1": "Clear prerequisite stage to unlock", + "UIText.PenguinCard_Level_LockLevel.1": "Locked", + "UIText.PenguinCard_Level_LockLevelTips.1": "Unlocked after completing the previous stage.", "UIText.PenguinCard_Log_TurnCount.1": "Turn {num_0}", "UIText.PenguinCard_Log_TurnScore.1": "Total income this turn", "UIText.PenguinCard_NextRoundTip.1": "Tap Deal to proceed", diff --git a/data/language/zh_cn/uitext.json b/data/language/zh_cn/uitext.json index dd8aafa2..f8a82808 100644 --- a/data/language/zh_cn/uitext.json +++ b/data/language/zh_cn/uitext.json @@ -847,7 +847,7 @@ "UIText.Disc_StoryLimitTip.1": "暂未解锁", "UIText.Disc_SubSkill_ActiveConditions.1": "激活条件：", "UIText.Disc_SubSkill_ActiveLevel.1": "≥{num_0}个", - "UIText.Disc_SubSkill_Level.1": "{num_0}个", + "UIText.Disc_SubSkill_Level.1": "{num_0}级", "UIText.Disc_SubSkill_Tip.1": "进入星塔时，获得以下音符", "UIText.Disc_SubSkill_Title.1": "协奏技能", "UIText.Disc_SubSkill_TitleTip.1": "可通过收集音符激活与升级", diff --git a/lua/game/ui/play_penguincard/penguincardpreparectrl.lua b/lua/game/ui/play_penguincard/penguincardpreparectrl.lua index f141c1e0..59e1b8cf 100644 --- a/lua/game/ui/play_penguincard/penguincardpreparectrl.lua +++ b/lua/game/ui/play_penguincard/penguincardpreparectrl.lua @@ -348,6 +348,7 @@ function PenguinCardPrepareCtrl:OnEvent_ChangeScore(nBefore, nBeforeStar, nStar) self:RefreshAddRoundCost() self:RefreshAddSlotCost() self:RefreshAddRollCost() + self:RefreshRollCost() if nBefore < self._panel.mapLevel.nScore and self._panel.mapLevel.nGameState == 1 then WwiseManger:PostEvent("Mode_Card_coin") end diff --git a/versions.txt b/versions.txt index 8f38e1a2..41a037d9 100644 --- a/versions.txt +++ b/versions.txt @@ -1,4 +1,4 @@ -EN: 1.7.0.89 -CN: 1.7.0.91 -JP: 1.7.0.92 -KR: 1.7.0.95 +EN: 1.7.0.90 +CN: 1.7.0.92 +JP: 1.7.0.93 +KR: 1.7.0.96