4586 经验药水覆盖提示去除，涉及仙界秘境界面，批量使用，和使用；超过天显示到分钟

hch

2019-10-17 6619d285827f56321046d75dd3b9abc3ef825536

4586 经验药水覆盖提示去除，涉及仙界秘境界面，批量使用，和使用；超过天显示到分钟

 System/Dungeon/DungeonLiquidCell.cs

@@ -189,18 +189,18 @@
            }

        }

        ItemConfig _useItemCfg = ItemConfig.Get(itemModel.itemId);

        if (buffid != 0 && buffid != _useItemCfg.AddSkill1)

        {

            ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func22"), (System.Action<bool>)((bool isOk) =>

            {

                if (isOk)

                {

                    WindowCenter.Instance.Close<DungeonUseLiquidWin>();

                    ItemOperateUtility.Instance.UseItem(itemModel.guid);

                }

            }));

        }

        else

        //if (buffid != 0 && buffid != _useItemCfg.AddSkill1)

        //{

        //    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func22"), (System.Action<bool>)((bool isOk) =>

        //    {

        //        if (isOk)

        //        {

        //            WindowCenter.Instance.Close<DungeonUseLiquidWin>();

        //            ItemOperateUtility.Instance.UseItem(itemModel.guid);

        //        }

        //    }));

        //}

        //else

        {

            WindowCenter.Instance.Close<DungeonUseLiquidWin>();

            ItemOperateUtility.Instance.UseItem(itemModel.guid);


 System/KnapSack/Logic/ItemOperateUtility.cs

@@ -705,18 +705,18 @@
            }
            else
            {
                if (Buffmodel.BuffCover(itemModel.itemId))
                {
                    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func22"), (bool isOk) =>
                    {
                        if (isOk)
                        {
                            UseItem(itemModel.guid);
                        }
                    }
                    );
                }
                else
                //if (Buffmodel.BuffCover(itemModel.itemId))
                //{
                //    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func22"), (bool isOk) =>
                //    {
                //        if (isOk)
                //        {
                //            UseItem(itemModel.guid);
                //        }
                //    }
                //    );
                //}
                //else
                {
                    switch (itemModel.itemId)
                    {

 System/KnapSack/New/BatchWin.cs

@@ -139,19 +139,19 @@
            if (itemModel == null)

                return;



            if (Buffmodel.BuffCover(itemModel.itemId))

            {

                ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func22"), (bool isOk) =>

                {

                    if (isOk)

                    {

                        ItemOperateUtility.Instance.UseItem(itemModel.guid, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

                    }

                }

                );

            //if (Buffmodel.BuffCover(itemModel.itemId))

            //{

            //    ConfirmCancel.ShowPopConfirm(Language.Get("Mail101"), Language.Get("FairyLand_Func22"), (bool isOk) =>

            //    {

            //        if (isOk)

            //        {

            //            ItemOperateUtility.Instance.UseItem(itemModel.guid, (ushort)Mathf.Ceil(m_SplitSlider.value), BatchUseModel.Instance.extraPrams);

            //        }

            //    }

            //    );



            }

            else if (itemModel.config.Type == (int)ItemType.Box)

            //}

            if (itemModel.config.Type == (int)ItemType.Box)

            {

                ModelCenter.Instance.GetModel<BoxGetItemModel>().CheckOpenBoxCondi(itemModel.guid, itemModel.itemId, (ushort)Mathf.Ceil(m_SplitSlider.value));

            }


 System/MainInterfacePanel/BuffBGMScripts.cs

@@ -30,7 +30,7 @@
                if (_timeRemaining >= 86400)

                {

                    TimeSpan t = new TimeSpan(_timeRemaining * TimeSpan.TicksPerSecond);

                    b_BuffTime.text = Mathf.CeilToInt((float)t.TotalDays) + Language.Get("L1074");

                    b_BuffTime.text = (float)t.Days + Language.Get("L1074") + t.Hours + Language.Get("Hour") + t.Minutes + Language.Get("Minute");

                }

               else if (_timeRemaining< 86400 && _timeRemaining >= 3600)

                {