4703 【主干】升星界面提升至100%成功率未显示 4699 【主干】镶嵌宝石问题 修复登录游戏首次打开福利界面会显示七天登录按钮的问题

hch

2020-04-03 16acef116f07d41c2fcea643e0e19773150260f0

4703 【主干】升星界面提升至100%成功率未显示
4699 【主干】镶嵌宝石问题
修复登录游戏首次打开福利界面会显示七天登录按钮的问题

 System/DailyQuest/DayRemind.cs

@@ -55,6 +55,7 @@
    public const string SHIFTEQUIPREMIND1 = "ShiftEquipRemind1";

    public const string SHIFTEQUIPREMIND2 = "ShiftEquipRemind2";

    public const string DAILYREALMREDPOINT = "DailyRealmRedpoint";

    public const string EQUIPGEMUSEGOLD = "EquipGem_UseGold";



    public Dictionary<string, int[]> dayRemindDic = new Dictionary<string, int[]>();



@@ -118,6 +119,7 @@
        SetDayRemind(SHIFTEQUIPREMIND1);

        SetDayRemind(SHIFTEQUIPREMIND2);

        SetDayRemind(DAILYREALMREDPOINT);

        SetDayRemind(EQUIPGEMUSEGOLD);

    }



    public void SetDayRemind(string _key)


 System/EquipGem/EquipGemSelectWin.cs

@@ -159,6 +159,17 @@
                    break;

                case ScrollerDataType.Tail:

                    CloseImmediately();

                    ItemConfig itemConfig = ItemConfig.GetGemDataByLevelAndType(1, cell.index);

                    var goodsConfig = StoreConfig.GetStoreCfgByItemID(itemConfig.ID);

                    if (goodsConfig != null)

                    {

                        var storeModel = ModelCenter.Instance.GetModel<StoreModel>();

                        storeModel.SetJumpToModel(itemConfig.ID);

                        if (goodsConfig.SecondType.Length > 0)

                            storeModel.selectSecondType = goodsConfig.SecondType[0];



                    }



                    WindowJumpMgr.Instance.WindowJumpTo(JumpUIType.StoreFunc3);

                    break;

                case ScrollerDataType.Extra1:


 System/EquipGem/EquipGemWin.cs

@@ -520,7 +520,30 @@
                WindowCenter.Instance.Open<RechargeTipWin>();

                return;

            }

            model.SendGemLevelUp(model.selectLevel, model.selectEquipPlace, model.SelectHoleIndex, 0);



            if (DayRemind.Instance.GetDayRemind(DayRemind.EQUIPGEMUSEGOLD))

            {

                model.SendGemLevelUp(model.selectLevel, model.selectEquipPlace, model.SelectHoleIndex, 0);

                return;

            }



            ConfirmCancel.ToggleConfirmCancel(Language.Get("Mail101"),

            Language.Get("EquipGemUseGold", needMoney),

            Language.Get("TodayNoNotify"), (bool ok, bool isToggle) =>

            {

                if (isToggle)

                {

                    DayRemind.Instance.SetDayRemind(DayRemind.EQUIPGEMUSEGOLD, true);

                }



                if (ok)

                {

                    model.SendGemLevelUp(model.selectLevel, model.selectEquipPlace, model.SelectHoleIndex, 0);

                }

            });





            
        }



        private void OnGemOff()


 System/EquipStar/EquipStarWin.cs

@@ -206,6 +206,7 @@

            if (force || model.selectedPlace.dirty)
            {
                model.autoBuy.dirty = true;
                var place = model.selectedPlace.Fetch();
                if (place == 0)
                {
@@ -245,6 +246,7 @@

            if (force || model.equipStarLevel.dirty || model.equipMaxStarLevel.dirty)
            {
                model.autoBuy.dirty = true;
                var equipPosition = new Int2(model.selectedLevel.value, model.selectedPlace.value);
                var starLevel = model.equipStarLevel.Fetch();
                var maxStar = model.equipMaxStarLevel.Fetch();

 System/Welfare/WelfareWin.cs

@@ -146,7 +146,7 @@
            }

            else

            {

                Btn_InSeven.gameObject.SetActive(true);

                Btn_InSeven.gameObject.SetActive(false);

            }

        }



@@ -160,12 +160,12 @@
        {

            signInTitleBtn.gameObject.SetActive(true);

            prayerTitleBtn.gameObject.SetActive(true);

            Btn_InSeven.gameObject.SetActive(true);

            Btn_InSeven.gameObject.SetActive(false);

            m_LevelGiftBtn.gameObject.SetActive(true);



            m_Month1.gameObject.SetActive(true);

            m_Month2.gameObject.SetActive(true);

            m_Vip.gameObject.SetActive(true);

            m_Vip.gameObject.SetActive(false);



            CloseChildWin();

            if (NewBieCenter.Instance.inGuiding && NewBieCenter.Instance.currentGuide == 40)

@@ -184,12 +184,12 @@
        {

            signInTitleBtn.gameObject.SetActive(signInTitleBtn.state != TitleBtnState.Locked);

            prayerTitleBtn.gameObject.SetActive(prayerTitleBtn.state != TitleBtnState.Locked);

            Btn_InSeven.gameObject.SetActive(Btn_InSeven.state != TitleBtnState.Locked);

            Btn_InSeven.gameObject.SetActive(false);//Btn_InSeven.state != TitleBtnState.Locked);

            m_LevelGiftBtn.gameObject.SetActive(m_LevelGiftBtn.state != TitleBtnState.Locked);



            m_Month1.gameObject.SetActive(m_Month1.state != TitleBtnState.Locked);

            m_Month2.gameObject.SetActive(m_Month2.state != TitleBtnState.Locked);

            m_Vip.gameObject.SetActive(m_Vip.state != TitleBtnState.Locked);

            m_Vip.gameObject.SetActive(false);//m_Vip.state != TitleBtnState.Locked);



        }