1802 兽粮使用跳转

Client_PangDeRong

2018-09-03 9d3a1fd295a60e9676ef49f091908b8a75fb4476

1802 兽粮使用跳转

 System/KnapSack/Logic/ItemTipsModel.cs

@@ -271,8 +271,6 @@
            FuncConfigConfig expFormula = Config.Instance.Get<FuncConfigConfig>("ExpValueDes");

            expValueFormula = expFormula.Numerical1;



            FuncConfigConfig funcConfig = Config.Instance.Get<FuncConfigConfig>("VipGiftTreasureEffect");



            #region 灵宠坐骑解锁

            unlockPetDict = new Dictionary<int, PetInfoConfig>();

            petSkillDict.Clear();


 System/Store/Logic/BuyEquipTip.cs

@@ -124,10 +124,12 @@


        [SerializeField]

        Button buyCountBtn;

        #endregion



        [SerializeField]

        Button buyBtn;

        RectTransform btnGroup;

        [SerializeField]

        GameObject operateBtn;

        #endregion



        [SerializeField] Text buyBtnText;



@@ -171,7 +173,6 @@
            shopItemLimit = m_storeModel.GetBuyShopLimit((uint)buyItem.storeConfig.ID);

            InitUI();

            closeBtn.AddListener(OnClickCloseBtn);

            buyBtn.AddListener(OnClickBuyBtn);

            reduceBtn.onClick.AddListener(OnClickReduceBuyNum);

            plusBtn.onClick.AddListener(OnClickPlusBuyNum);

            buyCountBtn.onClick.AddListener(OnClickCountBtn);

@@ -251,12 +252,12 @@
            }

            #endregion



            CreateFuncBtn();

        }



        private void OnDisable()

        {

            closeBtn.RemoveAllListeners();

            buyBtn.RemoveAllListeners();

            reduceBtn.RemoveAllListeners();

            plusBtn.RemoveAllListeners();

            buyCountBtn.RemoveAllListeners();

@@ -661,27 +662,59 @@


                if (curVipIndex != -1)

                {

                    buyBtn.gameObject.SetActive(true);

                    btnGroup.gameObject.SetActive(true);

                    buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

                }

                else

                {

                    buyBtn.gameObject.SetActive(false);

                    btnGroup.gameObject.SetActive(false);

                    buyCnt = buyItem.GetCurBuyCnt(0, canBuyCnt, isVipBuy, out isReachUpper);

                }

            }

            else

            {

                vipInfoText.gameObject.SetActive(false);

                buyBtn.gameObject.SetActive(true);

                btnGroup.gameObject.SetActive(true);

                buyCnt = buyItem.GetCurBuyCnt(1, canBuyCnt, isVipBuy, out isReachUpper);

            }



            buyCountText.text = buyCnt.ToString();

            RefreshBuyPrice(buyCnt);

            moneyIcon.SetIconWithMoneyType(buyItem.storeConfig.MoneyType);



            m_storeModel.SetBuyCnt(buyCnt);

        }



        private void CreateFuncBtn()

        {

            btnGroup.anchoredPosition3D = Vector3.zero;

            if (itemAttrData.tipsFuncBtnDic.Count > 0)

            {

                foreach (ItemWinBtnType key in itemAttrData.tipsFuncBtnDic.Keys)

                {

                    Button btn = OnGUIButton(btnGroup.gameObject, operateBtn, key.ToString(), Language.Get(StringUtility.Contact("ItemHandle_", key.ToString())));

                    btn.RemoveAllListeners();

                    btn.onClick.AddListener(() => {

                        OnClickCloseBtn();

                        itemAttrData.tipsFuncBtnDic[key](key, "");

                    });

                }

            }

        }



        private Button OnGUIButton(GameObject parent, GameObject sourceBtn, string btnName, string textName)

        {

            GameObject go = Instantiate(sourceBtn);

            go.name = btnName;

            go.transform.SetParent(parent.transform);

            go.transform.Find("BtnText").GetComponent<Text>().text = textName;

            go.transform.localPosition = Vector3.zero;

            go.transform.localScale = Vector3.one;

            Button btn = go.GetComponent<Button>();

            go.SetActive(true);

            KnapSackEventMgr.Instance.SetEquipWinTempObj(go);

            return btn;

        }





        private void SetBottomText(EquipSource source)

        {

@@ -766,7 +799,8 @@
            {

                buyCountText.text = buyCnt.ToString();

                numKeyboard.gameObject.SetActive(false);

            }

                m_storeModel.SetBuyCnt(buyCnt);

            }  
        }



        private void OnClickPlusBuyNum()

@@ -776,6 +810,7 @@
            buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            buyCountText.text = buyCnt.ToString();

            RefreshBuyPrice(buyCnt);

            m_storeModel.SetBuyCnt(buyCnt);

            if (isReachUpper)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("StoreWin109"));

@@ -790,31 +825,7 @@
            buyCnt = buyItem.GetCurBuyCnt(buyCnt, GetRemainBuyCnt(), isVipBuy, out isReachUpper);

            buyCountText.text = buyCnt.ToString();

            RefreshBuyPrice(buyCnt);

        }



        private void OnClickBuyBtn()

        {

           
            if (shopItemLimit != null)

            {

                int remainNum = 0;

                if (isVipBuy)

                {

                    remainNum = buyItem.storeConfig.PurchaseNumber[curVipIndex] - shopItemLimit.BuyCnt;

                }

                else

                {

                    remainNum = buyItem.storeConfig.PurchaseNumber[0] - shopItemLimit.BuyCnt;

                }

                if (remainNum < 1)

                {

                    MessageWin.Inst.ShowFixedTip(Language.Get("StoreWin109"));

                    return;

                }



            }

            m_storeModel.SendBuyShopItem(buyItem.storeConfig, buyCnt);

            OnClickCloseBtn();

            m_storeModel.SetBuyCnt(buyCnt);

        }



        private void OnClickCloseBtn()


 System/Store/StoreModel.cs

@@ -367,7 +367,42 @@
        //SetOpenBuyType(chinModel);

        ItemAttrData attrData = new ItemAttrData(ReplaceItemIdByJob(shopInfo.ID,shopInfo.ItemID),true, (ulong)shopInfo.ItemCnt,-1,shopInfo.IsBind,true,PackType.rptDeleted

            ,"",null,ItemTipChildType.Buy);

        itemTipsModel.SetItemTipsModel(attrData);

        itemTipsModel.SetItemTipsModel(attrData,false);

        attrData.SetTipsFuncBtn(ItemWinBtnType.buy,(ItemWinBtnType type ,string id) => { OnClickBuyBtn(ItemWinBtnType.buy, shopInfo.ID); });

        itemTipsModel.ShowUICtrl();

    }



    public int BuyCnt { get; private set; }

    public void SetBuyCnt(int buyCnt)

    {

        BuyCnt = buyCnt;

    }

    private void OnClickBuyBtn(ItemWinBtnType type, int shopId)

    {

        BuyShopItemLimit shopItemLimit = GetBuyShopLimit((uint)shopId);

        StoreConfig storeConfig = Config.Instance.Get<StoreConfig>(shopId);

        int curVipIndex = -1;

        int nextVipIndex = -1;

        bool isVipBuy = BuyItemPopModel.Instance.CheckIsVipBuy(storeConfig, out curVipIndex, out nextVipIndex);

        if (shopItemLimit != null)

        {

            int remainNum = 0;

            if (isVipBuy)

            {

                remainNum = storeConfig.PurchaseNumber[curVipIndex] - shopItemLimit.BuyCnt;

            }

            else

            {

                remainNum = storeConfig.PurchaseNumber[0] - shopItemLimit.BuyCnt;

            }

            if (remainNum < 1)

            {

                MessageWin.Inst.ShowFixedTip(Language.Get("StoreWin109"));

                return;

            }



        }

        SendBuyShopItem(storeConfig,BuyCnt);

    }



    #endregion


 System/WindowJump/WindowJumpMgr.cs

@@ -106,6 +106,7 @@
            case JumpUIType.UnionTask2:

            case JumpUIType.UnionActive1:

            case JumpUIType.UnionActive2:

            case JumpUIType.UnionBoss:

                if (!PlayerDatas.Instance.fairyData.HasFairy)

                {

                    SysNotifyMgr.Instance.ShowTip("DailyQuestwinUnionLimit");

@@ -547,6 +548,9 @@
            case JumpUIType.UnionActive2:

                SetJumpLogic<UnionTaskWin>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.UnionBoss:

                SetJumpLogic<FairyBoss>(_tagWinSearchModel.TABID);

                break;

            case JumpUIType.RealmPractice1:

            case JumpUIType.RealmPractice2:

                SetJumpLogic<RealmWin>(_tagWinSearchModel.TABID);

@@ -924,7 +928,9 @@
    }

    private void SecondRefresh()

    {

        if (DeadModel.playerIsDie && WindowCenter.Instance.CheckOpen<MainInterfaceWin>())

        if (DeadModel.playerIsDie 
            && WindowCenter.Instance.CheckOpen<MainInterfaceWin>()

            && dungeonModel.dungeonFightStage != DungeonFightStage.ExitPrepare)

        {

            if(!WindowCenter.Instance.CheckOpen<RebornWin>()

               && !WindowCenter.Instance.CheckOpen<ReliveWin>()

@@ -1012,6 +1018,7 @@
    MountStone = 65,

    MountSkill = 66,

    MountAppearance = 67,

    UnionBoss = 68,  //仙盟Boss界面

    IceCrystal = 69,  //冰晶矿脉

    FairyLand = 70,  //仙界秘境

    GridExtend = 71,