From 070dcf131ee8b105a5dd7b7514d782976d187a3f Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期日, 08 二月 2026 22:32:36 +0800
Subject: [PATCH] 484 子 【游历】增加体力补充 / 【游历】增加体力补充-客户端 357 子 【内政】红颜系统 / 【内政】红颜系统-客户端
---
Main/System/BeautyMM/BeautyMMSkinActiveWin.cs | 2 +-
Main/System/BeautyMM/BeautyMMSkinCell.cs | 9 +++++----
Main/System/ItemTip/ItemBatchUseWin.cs | 7 ++++++-
Main/System/BeautyMM/BeautyMMSkinWin.cs | 8 +++++---
Main/System/BeautyMM/BeautyMMManager.cs | 8 +++++---
5 files changed, 22 insertions(+), 12 deletions(-)
diff --git a/Main/System/BeautyMM/BeautyMMManager.cs b/Main/System/BeautyMM/BeautyMMManager.cs
index 431635a..7fea852 100644
--- a/Main/System/BeautyMM/BeautyMMManager.cs
+++ b/Main/System/BeautyMM/BeautyMMManager.cs
@@ -95,8 +95,9 @@
int activeSkinID = 0;
foreach (var beauty in data.BeautyList)
{
- if (DTC0403_tagPlayerLoginLoadOK.finishedLogin)
+ if (data.Count == 1)
{
+ //data.Count == 1 鍙互鐞嗚В涓鸿В閿佸洖鎶�
if (beautyMMDataDict.ContainsKey(beauty.BeautyID))
{
if (beautyMMDataDict[beauty.BeautyID].State != beauty.State)
@@ -120,8 +121,9 @@
foreach (var skin in beauty.SkinList)
{
- if (DTC0403_tagPlayerLoginLoadOK.finishedLogin)
+ if (data.Count == 1)
{
+ //data.Count == 1 鍙互鐞嗚В涓鸿В閿佸洖鎶�
if (beautyMMSkinDataDict.ContainsKey(skin.SkinID))
{
if (beautyMMSkinDataDict[skin.SkinID].State != skin.State)
@@ -151,7 +153,7 @@
{
UIManager.Instance.OpenWindow<BeautyMMActiveWin>(activeMMID);
}
- if (activeSkinID > 0)
+ else if (activeSkinID > 0)
{
UIManager.Instance.OpenWindow<BeautyMMSkinActiveWin>(activeSkinID);
}
diff --git a/Main/System/BeautyMM/BeautyMMSkinActiveWin.cs b/Main/System/BeautyMM/BeautyMMSkinActiveWin.cs
index 4504e5f..eacf537 100644
--- a/Main/System/BeautyMM/BeautyMMSkinActiveWin.cs
+++ b/Main/System/BeautyMM/BeautyMMSkinActiveWin.cs
@@ -22,7 +22,7 @@
void Display()
{
- var skinConfig = BeautySkinConfig.Get(this.skinID);
+ var skinConfig = BeautySkinConfig.Get(skinID);
nameText.text = skinConfig.Name;
roleImg.SetOrgSprite(skinConfig.BigRole, "BeautyMMBigRole");
roleImg.SetNativeSize();
diff --git a/Main/System/BeautyMM/BeautyMMSkinCell.cs b/Main/System/BeautyMM/BeautyMMSkinCell.cs
index e881d73..212fbd7 100644
--- a/Main/System/BeautyMM/BeautyMMSkinCell.cs
+++ b/Main/System/BeautyMM/BeautyMMSkinCell.cs
@@ -26,10 +26,11 @@
var skinData = BeautyMMManager.Instance.GetSkinData(skinID);
var mmData = BeautyMMManager.Instance.GetBeautyMMData(mmID);
var state = skinData.State;
- if (mmData != null && mmData.State != 0 && skinConfig.UnlockWay == 1)
- {
- state = 1;
- }
+ // if (mmData != null && mmData.State != 0 && skinConfig.UnlockWay == 1)
+ // {
+ // //榛樿绛惧埌鑷繁瑙ｉ攣
+ // state = 1;
+ // }
if (state != 0)
{
lockObj.SetActive(false);
diff --git a/Main/System/BeautyMM/BeautyMMSkinWin.cs b/Main/System/BeautyMM/BeautyMMSkinWin.cs
index 3a2ca5f..2a3027b 100644
--- a/Main/System/BeautyMM/BeautyMMSkinWin.cs
+++ b/Main/System/BeautyMM/BeautyMMSkinWin.cs
@@ -39,6 +39,7 @@
BeautyMMManager.Instance.selectSkinID = BeautyMMManager.Instance.GetUsedSkinID(mmID);
clothesScroller.OnRefreshCell += OnRefreshCell;
BeautyMMManager.Instance.OnSelectSkinIDChange += OnSelectSkinIDChange;
+ BeautyMMManager.Instance.OnBeautyMMDataUpdate += OnSelectSkinIDChange;
CreateScroller();
Display();
}
@@ -47,6 +48,7 @@
{
clothesScroller.OnRefreshCell -= OnRefreshCell;
BeautyMMManager.Instance.OnSelectSkinIDChange -= OnSelectSkinIDChange;
+ BeautyMMManager.Instance.OnBeautyMMDataUpdate -= OnSelectSkinIDChange;
}
void OnSelectSkinIDChange()
@@ -98,15 +100,15 @@
if (skinData.State == 0)
{
attrTipText.text = Language.Get("PhantasmPavilion11");
- attrValueText.text = UIHelper.AppendColor(TextColType.lightYellow, PlayerPropertyConfig.GetFullDescription(skinConfig.AttrIDList[0], skinConfig.InitAttrValueList[0]));
+ attrValueText.text = UIHelper.AppendColor(TextColType.NavyYellow, PlayerPropertyConfig.GetFullDescription(skinConfig.AttrIDList[0], skinConfig.InitAttrValueList[0]));
}
else
{
attrTipText.text = Language.Get("PhantasmPavilion07");
var value = skinConfig.InitAttrValueList[0] + skinData.Star * skinConfig.AttrPerStarAddList[0];
- attrValueText.text = UIHelper.AppendColor(TextColType.lightYellow, PlayerPropertyConfig.GetFullDescription(skinConfig.AttrIDList[0], value)) +
- Language.Get("PhantasmPavilion12", UIHelper.AppendColor(TextColType.Green, "+" + PlayerPropertyConfig.GetValueDescription(skinConfig.AttrIDList[0], skinConfig.AttrPerStarAddList[0])));
+ attrValueText.text = UIHelper.AppendColor(TextColType.NavyYellow, PlayerPropertyConfig.GetFullDescription(skinConfig.AttrIDList[0], value)) +
+ Language.Get("PhantasmPavilion12", UIHelper.AppendColor(TextColType.LightGreen, "+" + PlayerPropertyConfig.GetValueDescription(skinConfig.AttrIDList[0], skinConfig.AttrPerStarAddList[0])));
}
}
diff --git a/Main/System/ItemTip/ItemBatchUseWin.cs b/Main/System/ItemTip/ItemBatchUseWin.cs
index cdeb7e4..b5ee930 100644
--- a/Main/System/ItemTip/ItemBatchUseWin.cs
+++ b/Main/System/ItemTip/ItemBatchUseWin.cs
@@ -125,9 +125,14 @@
void OnOK()
{
CloseWindow();
+ if (curUseCount == 0)
+ {
+ SysNotifyMgr.Instance.ShowTip("UseItem1");
+ return;
+ }
if (ItemLogicUtility.CheckItemCount(PackType.Item, itemID, curUseCount, 2))
{
- ItemLogicUtility.Instance.UseItem(PackManager.Instance.GetItemGUIDByID(itemID));
+ ItemLogicUtility.Instance.UseItem(PackManager.Instance.GetItemGUIDByID(itemID), (int)curUseCount);
}
}
}
--
Gitblit v1.8.0