From 7085c695618bb1cc1c043fc2b6ebc8b3a26ae399 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期二, 30 十二月 2025 17:04:51 +0800
Subject: [PATCH] 357 子 【内政】红颜系统 / 【内政】红颜系统-客户端
---
Main/System/BeautyMM/BeautyMMTalentEffectCell.cs | 4 ++--
Main/System/BeautyMM/BeautyMMManager.cs | 6 ++++++
Main/System/BeautyMM/BeautyMMShowWin.cs | 7 +++----
3 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/Main/System/BeautyMM/BeautyMMManager.cs b/Main/System/BeautyMM/BeautyMMManager.cs
index 58ea35b..b8cc6f3 100644
--- a/Main/System/BeautyMM/BeautyMMManager.cs
+++ b/Main/System/BeautyMM/BeautyMMManager.cs
@@ -171,6 +171,12 @@
{
return isActiveA ? -1 : 1;
}
+ var qualityA = BeautyConfig.Get(mmIDA).BeautyQuality;
+ var qualityB = BeautyConfig.Get(mmIDB).BeautyQuality;
+ if (qualityA != qualityB)
+ {
+ return qualityB - qualityA;
+ }
return mmIDA - mmIDB;
}
diff --git a/Main/System/BeautyMM/BeautyMMShowWin.cs b/Main/System/BeautyMM/BeautyMMShowWin.cs
index 64320d9..3dd7dea 100644
--- a/Main/System/BeautyMM/BeautyMMShowWin.cs
+++ b/Main/System/BeautyMM/BeautyMMShowWin.cs
@@ -113,7 +113,6 @@
protected override void OnPreOpen()
{
-
mmID = functionOrder;
loveScroller.OnRefreshCell += OnRefreshCell;
BeautyMMManager.Instance.OnBeautyMMDataUpdate += OnBeautyMMDataUpdate;
@@ -197,7 +196,7 @@
needExp = nextLVConfig.LVNeedExp;
expText.text = (mmData != null ? mmData.Exp.ToString() : "0") + "/" + needExp;
- process.fillAmount = mmData != null ? mmData.Exp / needExp : 0;
+ process.fillAmount = mmData != null ? mmData.Exp*1.0f / needExp : 0;
showAwardCell.SetActive(true);
int itemID = nextLVConfig.AwardItemList[0][0];
showAwardCell.Init(new ItemCellModel(itemID, false, nextLVConfig.AwardItemList[0][1]));
@@ -223,8 +222,8 @@
nextAddAttrText.text = Language.Get("BeautyMM23") + PlayerPropertyConfig.GetFullDescription(nextLVConfig.AttrIDList[0], nextLVConfig.AttrValueList[0], format);
ShowTalent();
- nextLVTalentTipRect.SetActive(true);
- nextLVTalentTip.text = Language.Get("BeautyMM26", beforeRank * BeautyMMManager.Instance.needLVForTalent);
+ nextLVTalentTipRect.SetActive(isActive);
+ nextLVTalentTip.text = Language.Get("BeautyMM26", (beforeRank + 1)* BeautyMMManager.Instance.needLVForTalent);
giftOPRect.SetActive(true);
fullRect.SetActive(false);
}
diff --git a/Main/System/BeautyMM/BeautyMMTalentEffectCell.cs b/Main/System/BeautyMM/BeautyMMTalentEffectCell.cs
index 34ae68b..ac075a3 100644
--- a/Main/System/BeautyMM/BeautyMMTalentEffectCell.cs
+++ b/Main/System/BeautyMM/BeautyMMTalentEffectCell.cs
@@ -24,8 +24,8 @@
}
lvBGImg.gray = !isRankActive;
ShowTalent(mmID, rank, isRankActive);
- activeImg.SetActive(isRankActive && lvValue/BeautyMMManager.Instance.needLVForTalent == rank);
- nameText.text = isRankActive ? Language.Get($"BeautyMMLVName{rank + 1}") : UIHelper.AppendColor(TextColType.NavyGray, Language.Get($"BeautyMMLVName{rank}"));
+ activeImg.SetActive(isRankActive && lvValue / BeautyMMManager.Instance.needLVForTalent == rank);
+ nameText.text = isRankActive ? Language.Get($"BeautyMMLVName{rank + 1}") : UIHelper.AppendColor(TextColType.NavyGray, Language.Get($"BeautyMMLVName{rank + 1}"));
}
--
Gitblit v1.8.0