484 子 【游历】增加体力补充 / 【游历】增加体力补充-客户端 357 子 【内政】红颜系统 / 【内政】红颜系统-客户端

hch

7 小时以前 070dcf131ee8b105a5dd7b7514d782976d187a3f

484 子 【游历】增加体力补充 / 【游历】增加体力补充-客户端
357 子 【内政】红颜系统 / 【内政】红颜系统-客户端

 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);
        }

 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();

 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);

 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])));
            }
        }


 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);
        }
    }
}