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

client_Wu Xijin

2018-09-04 40a39cee0bcb5451a78508fd65159a0ffa5e714e

 System/Store/StoreModel.cs

@@ -52,6 +52,11 @@


    public void OnBeforePlayerDataInitialize()

    {

        FuncOpen.Instance.OnFuncStateChangeEvent -= FuncStateChange;

        PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= RefreshServerHour;

        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= RefreshFamilyLv;

        RefreshTCBPlayerDataEvent -= RefreshPlayerLv;

        TimeMgr.Instance.OnHourEvent -= RefreshServerHour;

        shopItemlimitDict.Clear();

        tagTowerModel = null;

        storeFuncType = StoreFunc.WeekStore;

@@ -62,21 +67,19 @@
    public void OnAfterPlayerDataInitialize()

    {

        UNIONSTORESAVE_KEY = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, LocalSaveStoreType.UnionStore);

        DebugEx.Log("UNIONSTORESAVE_KEY:" + UNIONSTORESAVE_KEY);

        StoreEffectRecord_Key = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "StoreEffectRecord");

    }



    public void OnPlayerLoginOk()

    {

        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= RefreshFamilyLv;

      
        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += RefreshFamilyLv;

        PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= RefreshServerHour;

        PlayerDatas.Instance.fairyData.OnRefreshFairyMine += RefreshServerHour;

        FuncOpen.Instance.OnFuncStateChangeEvent -= FuncStateChange;

        FuncOpen.Instance.OnFuncStateChangeEvent += FuncStateChange;

        RefreshTCBPlayerDataEvent -= RefreshPlayerLv;

        RefreshTCBPlayerDataEvent += RefreshPlayerLv;

        TimeMgr.Instance.OnHourEvent -= RefreshServerHour;

        TimeMgr.Instance.OnHourEvent += RefreshServerHour;



        shoplist = null;

        CheckWeekStoreIsShopBuy(out shoplist);

        ControllerRedPoint();

@@ -228,9 +231,13 @@
    private void RefreshServerHour()

    {

        ControllerRedPoint();

        if(!PlayerDatas.Instance.fairyData.HasFairy)

        {

            PlayerPrefs.DeleteKey(UNIONSTORESAVE_KEY);

        }

    }



    public Action RefreshBuyShopLimitEvent;

    public event Action RefreshBuyShopLimitEvent;



    public StoreFunc storeFuncType = StoreFunc.WeekStore;

    private Dictionary<uint, BuyShopItemLimit> shopItemlimitDict = new Dictionary<uint, BuyShopItemLimit>();