10360 仙匠大会

lcy

2025-02-17 7cb5ac380fa2b493d67bfff3e0cd1b09cdbe2a00

10360 仙匠大会

1.没有辅助物品或已达使用次数上限,进入使用辅助物品面板后点使用不进入选择物品阶段,弹提示.
2.修复仙露最大可用数量
3.体力不足时弹出使用仙露框

 System/LianQi/LianQiActWin.cs

@@ -215,6 +215,12 @@
            if (!isEnergyEnough)

            {

                SysNotifyMgr.Instance.ShowTip("LianQiAct01");

                model.isUseTool = true;

                int index = 3;

                model.nowAssistiveItemNum = index + 1;

                int itemID = model.assistiveItemArr[index];

                model.nowAssistiveItemId = itemID;

                WindowCenter.Instance.Open<LianQiItemInfoDoubleWin>();

                return;

            }



@@ -448,6 +454,10 @@
            {

                if (WindowCenter.Instance.IsOpen<LianQiRoundSettlementWin>())

                    return;

                if (WindowCenter.Instance.IsOpen<LianQiItemInfoDoubleWin>())

                    return;

                if (WindowCenter.Instance.IsOpen<LianQiItemInfoWin>())

                    return;

                if (!model.IsJoin)

                    return;

                if (model.isWaitReStart)


 System/LianQi/LianQiItemInfoDoubleWin.cs

@@ -32,9 +32,28 @@
            btnUse.SetListener(() =>

            {

                int itemID = model.nowAssistiveItemId;

                int num = model.nowAssistiveItemNum;

                if (!ItemConfig.Has(itemID))

                    return;

                ItemConfig itemConfig = ItemConfig.Get(itemID);



                //道具数量不足

                if (packModel.GetItemCountByID(PackType.Item, itemID) <= 0)

                {

                    SysNotifyMgr.Instance.ShowTip("LianQiAct02");

                    return;

                }



                //该道具该局已达使用次数上限

                if (!model.limitUsesToolCntDict.TryGetValue(itemID, out int cnt))

                    return;

                int useItemCnt = model.GetUseItemCnt(model.nowPlayerInfo.UseItemCntList, num);

                if (useItemCnt >= cnt)

                {

                    SysNotifyMgr.Instance.ShowTip("LianQiAct03");

                    return;

                }



                ConfirmCancel.ShowPopConfirmEx(Language.Get("Mail101"), Language.Get("LianQi20", (int)splitSlider.value, itemConfig.ItemName), OnConfirm4, OnConfirm4);

                CloseClick();

            });

@@ -48,7 +67,7 @@
            btnAdd.SetListener(() =>

            {

                int hasCount = packModel.GetItemCountByID(PackType.Item, itemID);

                if (hasCount < 0)

                if (hasCount <= 0)

                {

                    SysNotifyMgr.Instance.ShowTip("LianQiAct02");

                    return;

@@ -63,7 +82,7 @@
            btnReduce.SetListener(() =>

            {

                int hasCount = packModel.GetItemCountByID(PackType.Item, itemID);

                if (hasCount < 0)

                if (hasCount <= 0)

                {

                    SysNotifyMgr.Instance.ShowTip("LianQiAct02");

                    return;

@@ -121,9 +140,10 @@
            if (!model.limitUsesToolCntDict.TryGetValue(itemID, out int limitCnt))

                return;

            int useItemCnt = model.GetUseItemCnt(model.nowPlayerInfo.UseItemCntList, model.nowAssistiveItemNum);

            int hasCnt = hasCount > limitCnt ? limitCnt : hasCount;

            txtCount.text = Language.Get("LianQi15", Mathf.Max(0, limitCnt - useItemCnt), limitCnt);

            splitSlider.maxValue = Mathf.Min(hasCount, limitCnt);

            splitSlider.minValue = 1;

            splitSlider.maxValue = Mathf.Min(Mathf.Max(0, hasCnt - useItemCnt), limitCnt);

            splitSlider.minValue = hasCount > 0 ? 1 : 0;

            splitSlider.value = splitSlider.minValue;

            txtNumber.text = Mathf.Ceil(splitSlider.value).ToString();

        }


 System/LianQi/LianQiItemInfoWin.cs

@@ -17,6 +17,29 @@
        {

            btnUse.SetListener(() =>

            {

                int itemID = model.nowAssistiveItemId;

                int num = model.nowAssistiveItemNum;

                if (!ItemConfig.Has(itemID))

                    return;

                ItemConfig itemConfig = ItemConfig.Get(itemID);



                //道具数量不足

                if (packModel.GetItemCountByID(PackType.Item, itemID) <= 0)

                {

                    SysNotifyMgr.Instance.ShowTip("LianQiAct02");

                    return;

                }



                //该道具该局已达使用次数上限

                if (!model.limitUsesToolCntDict.TryGetValue(itemID, out int cnt))

                    return;

                int useItemCnt = model.GetUseItemCnt(model.nowPlayerInfo.UseItemCntList, num);

                if (useItemCnt >= cnt)

                {

                    SysNotifyMgr.Instance.ShowTip("LianQiAct03");

                    return;

                }



                model.isStartChoose = true;

                model.isChoose1 = false;

                model.isChoose2 = false;