Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-11-14 ab4e4b640d7fbc97abf7e9b4c58592d70c4358b9

 System/Store/StoreModel.cs

@@ -38,7 +38,6 @@
    public Dictionary<int,Dictionary<int,int>> JobReplaceIdDict = new Dictionary<int, Dictionary<int, int>>();

    public Dictionary<int, string> resetTimeDict { get; private set; }

    public Dictionary<int, int> showCoinsUIDict { get; private set; }

    public int[] StoreRedIdlist { get; private set;}

    public int storeTrailerLv { get; private set; }



    bool isLogin = true;

@@ -66,7 +65,6 @@
        FuncConfigConfig mallCurrency = Config.Instance.Get<FuncConfigConfig>("MallCurrency");

        showCoinsUIDict = ConfigParse.GetDic<int, int>(mallCurrency.Numerical1);

        FuncConfigConfig mallPush = Config.Instance.Get<FuncConfigConfig>("MallPush");

        StoreRedIdlist = ConfigParse.GetMultipleStr<int>(mallPush.Numerical2);

        storeTrailerLv = int.Parse(mallPush.Numerical1);

        MainInterfaceWin.IsCopyOfThePanel += OnMoveTopPart;

    }

@@ -1172,18 +1170,19 @@
        }

    }





    public void UpdateFreeShopRedpoint()

    {

        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Store)) return;



 
        foreach (var key in showStoreTypeDict.Keys)

        {

            var storeDatas = showStoreTypeDict[key];

            for(int i = 0; i < storeDatas.Count; i++)

            {

                var storeConfig = storeDatas[i].storeConfig;

                if (storeConfig.MoneyNumber == 0)

                int type = 0;

                TryGetRedTypeByShopId(storeConfig.ID,out type);

                if(type == 1)

                {

                    int remainNum = 0;

                    if (!TryGetIsSellOut(storeConfig, out remainNum))

@@ -1199,7 +1198,7 @@
           

        }

    }

    public event Action<int> UpdateHelpPointExchangeEvent;

 
    public void UpdateCanBuyRedpoint()

    {

        if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.Store)) return;

@@ -1210,7 +1209,9 @@
            for (int i = 0; i < storeDatas.Count; i++)

            {

                var storeConfig = storeDatas[i].storeConfig;

                if (StoreRedIdlist.Contains(storeConfig.ID))

                int type = 0;

                TryGetRedTypeByShopId(storeConfig.ID, out type);

                if(type == 4)

                {

                    int remainNum = 0;

                    if (!TryGetIsSellOut(storeConfig, out remainNum))

@@ -1218,13 +1219,6 @@
                        if (UIHelper.GetMoneyCnt(storeConfig.MoneyType) >= (ulong)storeConfig.MoneyNumber)

                        {

                            shopRedDict[storeConfig.ID].state = RedPointState.Simple;

                            if (storeConfig.ShopType == (int)StoreFunc.IntegralStore)

                            {

                                if (UpdateHelpPointExchangeEvent != null)

                                {

                                    UpdateHelpPointExchangeEvent(storeConfig.ID);

                                }

                            }

                        }

                        else

                        {

@@ -1251,7 +1245,9 @@
            for (int i = 0; i < storeDatas.Count; i++)

            {

                var storeConfig = storeDatas[i].storeConfig;

                if (mustIdlist.Contains(storeConfig.ItemID))

                int type = 0;

                TryGetRedTypeByShopId(storeConfig.ID, out type);

                if(type == 2)

                {

                    if (CheckIsMustBuy(storeConfig))

                    {

@@ -1269,7 +1265,9 @@


    public void ClearMustBuyRedpoint(StoreConfig storeConfig)

    {

        if(mustIdlist.Contains(storeConfig.ItemID))

        int type = 0;

        TryGetRedTypeByShopId(storeConfig.ID,out type);

        if(type == 2)

        {

            shopRedDict[storeConfig.ID].state = RedPointState.None;

            IsMustBuyDay = false;

@@ -1306,7 +1304,6 @@
        }

    }



    public List<int> mustIdlist = new List<int>() { 4741};

    public bool CheckIsMustBuy(StoreConfig config)

    {

        int remainNum = 0;

@@ -1331,39 +1328,44 @@
        {

            var storeData = storelist[i];

            ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(storeData.storeConfig.ItemID);

            string key = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID,"ShopId",storeData.shopId);

            int remainNum = 0;

            switch(itemConfig.Type)

            int type = 0;

            TryGetRedTypeByShopId(storeData.shopId, out type);

            if(type == 3)

            {

                case 26:

                case 41:

                    if(!TryGetIsSellOut(storeData.storeConfig,out remainNum))

                    {

                        if (!PlayerPrefs.HasKey(key))

                string key = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "ShopId", storeData.shopId);

                int remainNum = 0;

                switch (itemConfig.Type)

                {

                    case 26:

                    case 41:

                        if (!TryGetIsSellOut(storeData.storeConfig, out remainNum))

                        {

                            shopRedDict[storeData.shopId].state = RedPointState.Simple;

                            LocalSave.SetBool(key,true);

                            SetPetAndMountPushData(storeData.shopId);

                        }

                        else

                        {

                            if(LocalSave.GetBool(key))

                            if (!PlayerPrefs.HasKey(key))

                            {

                                shopRedDict[storeData.shopId].state = RedPointState.Simple;

                                LocalSave.SetBool(key, true);

                                SetPetAndMountPushData(storeData.shopId);

                            }

                            else

                            {

                                shopRedDict[storeData.shopId].state = RedPointState.None;

                                if (LocalSave.GetBool(key))

                                {

                                    shopRedDict[storeData.shopId].state = RedPointState.Simple;

                                }

                                else

                                {

                                    shopRedDict[storeData.shopId].state = RedPointState.None;

                                }



                            }

                            
                        }

                    }

                    else

                    {

                        //PlayerPrefs.DeleteKey(key);

                        shopRedDict[storeData.shopId].state = RedPointState.None;

                    }

                    break;

                        else

                        {

                            //PlayerPrefs.DeleteKey(key);

                            shopRedDict[storeData.shopId].state = RedPointState.None;

                        }

                        break;

                }

            }

        }