From 24b541f0394255f51b7ad85e529fef23d094a6f3 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 14 三月 2026 12:30:17 +0800
Subject: [PATCH] 546 子 【红颜系统】新增红颜 / 【红颜系统】新增红颜-客户端
---
Main/System/BeautyMM/BeautyMMActiveWin.cs | 13 ++----
Main/System/BeautyMM/BeautyMMTalentEffectCell.cs | 13 ++----
Main/System/BeautyMM/BeautyMMManager.cs | 8 ++++
Main/System/BeautyMM/BeautyMMShowWin.cs | 14 ++-----
Main/System/BeautyMM/BeautyMMUpgradeWin.cs | 13 ++----
5 files changed, 27 insertions(+), 34 deletions(-)
diff --git a/Main/System/BeautyMM/BeautyMMActiveWin.cs b/Main/System/BeautyMM/BeautyMMActiveWin.cs
index cffa2cc..fe00515 100644
--- a/Main/System/BeautyMM/BeautyMMActiveWin.cs
+++ b/Main/System/BeautyMM/BeautyMMActiveWin.cs
@@ -94,17 +94,14 @@
talentTexts[talentIndex].SetActive(true);
switch (mmConfig.EffType)
{
- case 1:
- talentTexts[i].text = Language.Get($"BeautyMMTalent1", talentValue);
- break;
case 2:
- talentTexts[i].text = Language.Get($"BeautyMMTalent2", talentValue / 100, ItemConfig.Get(mmConfig.EffTypeValue).ItemName);
- break;
- case 3:
- talentTexts[i].text = Language.Get($"BeautyMMTalent3", talentValue);
+ talentTexts[i].text = Language.Get("BeautyMMTalent2", talentValue / 100, ItemConfig.Get(mmConfig.EffTypeValue).ItemName);
break;
case 4:
- talentTexts[i].text = Language.Get($"BeautyMMTalent4", ItemConfig.Get(mmConfig.EffTypeValue).ItemName, talentValue);
+ talentTexts[i].text = Language.Get("BeautyMMTalent4", ItemConfig.Get(mmConfig.EffTypeValue).ItemName, talentValue);
+ break;
+ default:
+ talentTexts[i].text = Language.Get($"BeautyMMTalent{mmConfig.EffType}", talentValue);
break;
}
}
diff --git a/Main/System/BeautyMM/BeautyMMManager.cs b/Main/System/BeautyMM/BeautyMMManager.cs
index b8781dc..978a0bd 100644
--- a/Main/System/BeautyMM/BeautyMMManager.cs
+++ b/Main/System/BeautyMM/BeautyMMManager.cs
@@ -668,6 +668,14 @@
return 3;
}
break;
+
+ case 8:
+ WarlordPavilionManager.Instance.TryGetHistoryMaxFinishProgress(out int layerNum, out int levelNum);
+ if (layerNum > beauty.UnlockValue)
+ {
+ return 3;
+ }
+ break;
}
diff --git a/Main/System/BeautyMM/BeautyMMShowWin.cs b/Main/System/BeautyMM/BeautyMMShowWin.cs
index 385d8ef..aa02820 100644
--- a/Main/System/BeautyMM/BeautyMMShowWin.cs
+++ b/Main/System/BeautyMM/BeautyMMShowWin.cs
@@ -336,20 +336,14 @@
talentTexts[talentIndex].SetActive(true);
switch (mmConfig.EffType)
{
- case 1:
- talentTexts[i].text = Language.Get($"BeautyMMTalent1", talentValue);
- break;
case 2:
- talentTexts[i].text = Language.Get($"BeautyMMTalent2", talentValue / 100, ItemConfig.Get(mmConfig.EffTypeValue).ItemName);
- break;
- case 3:
- talentTexts[i].text = Language.Get($"BeautyMMTalent3", talentValue);
+ talentTexts[i].text = Language.Get("BeautyMMTalent2", talentValue / 100, ItemConfig.Get(mmConfig.EffTypeValue).ItemName);
break;
case 4:
- talentTexts[i].text = Language.Get($"BeautyMMTalent4", ItemConfig.Get(mmConfig.EffTypeValue).ItemName, talentValue);
+ talentTexts[i].text = Language.Get("BeautyMMTalent4", ItemConfig.Get(mmConfig.EffTypeValue).ItemName, talentValue);
break;
- case 5:
- talentTexts[i].text = Language.Get($"BeautyMMTalent5", talentValue);
+ default:
+ talentTexts[i].text = Language.Get($"BeautyMMTalent{mmConfig.EffType}", talentValue);
break;
}
}
diff --git a/Main/System/BeautyMM/BeautyMMTalentEffectCell.cs b/Main/System/BeautyMM/BeautyMMTalentEffectCell.cs
index ac075a3..6972702 100644
--- a/Main/System/BeautyMM/BeautyMMTalentEffectCell.cs
+++ b/Main/System/BeautyMM/BeautyMMTalentEffectCell.cs
@@ -67,17 +67,14 @@
talentTexts[talentIndex].SetActive(true);
switch (mmConfig.EffType)
{
- case 1:
- talentTexts[i].text = Language.Get($"BeautyMMTalent1", talentValue);
- break;
case 2:
- talentTexts[i].text = Language.Get($"BeautyMMTalent2", talentValue / 100, ItemConfig.Get(mmConfig.EffTypeValue).ItemName);
- break;
- case 3:
- talentTexts[i].text = Language.Get($"BeautyMMTalent3", talentValue);
+ talentTexts[i].text = Language.Get("BeautyMMTalent2", talentValue / 100, ItemConfig.Get(mmConfig.EffTypeValue).ItemName);
break;
case 4:
- talentTexts[i].text = Language.Get($"BeautyMMTalent4", ItemConfig.Get(mmConfig.EffTypeValue).ItemName, talentValue);
+ talentTexts[i].text = Language.Get("BeautyMMTalent4", ItemConfig.Get(mmConfig.EffTypeValue).ItemName, talentValue);
+ break;
+ default:
+ talentTexts[i].text = Language.Get($"BeautyMMTalent{mmConfig.EffType}", talentValue);
break;
}
}
diff --git a/Main/System/BeautyMM/BeautyMMUpgradeWin.cs b/Main/System/BeautyMM/BeautyMMUpgradeWin.cs
index 3c21ffe..dbe2b38 100644
--- a/Main/System/BeautyMM/BeautyMMUpgradeWin.cs
+++ b/Main/System/BeautyMM/BeautyMMUpgradeWin.cs
@@ -80,17 +80,14 @@
talentTexts[talentIndex].SetActive(true);
switch (mmConfig.EffType)
{
- case 1:
- talentTexts[i].text = Language.Get($"BeautyMMTalent1", talentValue);
- break;
case 2:
- talentTexts[i].text = Language.Get($"BeautyMMTalent2", talentValue / 100, ItemConfig.Get(mmConfig.EffTypeValue).ItemName);
- break;
- case 3:
- talentTexts[i].text = Language.Get($"BeautyMMTalent3", talentValue);
+ talentTexts[i].text = Language.Get("BeautyMMTalent2", talentValue / 100, ItemConfig.Get(mmConfig.EffTypeValue).ItemName);
break;
case 4:
- talentTexts[i].text = Language.Get($"BeautyMMTalent4", ItemConfig.Get(mmConfig.EffTypeValue).ItemName, talentValue);
+ talentTexts[i].text = Language.Get("BeautyMMTalent4", ItemConfig.Get(mmConfig.EffTypeValue).ItemName, talentValue);
+ break;
+ default:
+ talentTexts[i].text = Language.Get($"BeautyMMTalent{mmConfig.EffType}", talentValue);
break;
}
}
--
Gitblit v1.8.0