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

client_linchunjie

2018-09-14 c3f099acdbe93867e3733454590e60ffb335cd5b

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

 Core/GameEngine/Model/Player/Character/PlayerBaseData.cs

@@ -62,10 +62,8 @@
    public int BasicsDefense;//基础防御

    public int BasicsScoreAHit;//基础命中

    public int BasicsDodge;//基础闪避

    public long treasurePotentialSp

    {

        get

        {

    public long treasurePotentialSp {

        get {

            return ExAttr8 * (long)100000000 + ExAttr7;

        }

    }

@@ -76,7 +74,7 @@
    {

        AccID = _serverInfo.AccID;

        PlayerID = _serverInfo.PlayerID;

        PlayerName = _serverInfo.PlayerName.Trim();

        PlayerName = _serverInfo.PlayerName.Trim().Replace(" ", "");

        AccState = _serverInfo.AccState;

        GMLevel = _serverInfo.GMLevel;

        Sex = _serverInfo.Sex;

@@ -87,7 +85,7 @@
        ExpPoint = _serverInfo.ExpPoint;

        TotalExp = _serverInfo.TotalExp;

        Family = _serverInfo.Family;

        FamilyName = _serverInfo.FamilyName.Trim();

        FamilyName = _serverInfo.FamilyName.Trim().Replace(" ", "");

        Gold = _serverInfo.Gold;

        GoldPaper = _serverInfo.GoldPaper;

        Silver = _serverInfo.Silver;


 System/Store/StoreModel.cs

@@ -39,6 +39,7 @@
    public Dictionary<int, string> resetTimeDict { get; private set; }

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

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

    bool isLogin = true;

    public override void Init()

    {

        FuncConfigConfig buyItemHinit = Config.Instance.Get<FuncConfigConfig>("BuyItemHinit");

@@ -53,6 +54,7 @@


    public void OnBeforePlayerDataInitialize()

    {

        isLogin = true;

        FuncOpen.Instance.OnFuncStateChangeEvent -= FuncStateChange;

        PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= RefreshServerHour;

        PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= RefreshFamilyLv;

@@ -87,6 +89,8 @@
        SetShopRedpoint();

        CheckShopRedpoint();

        SetJobReplaceIDDict();

        UpdateMustBuyRedpoint();

        isLogin = false;

    }



    public string GetStoreRefreshTimeByType(int type)

@@ -132,6 +136,9 @@
        switch(type)

        {

            case PlayerDataRefresh.LV:

                CheckShopRedpoint();

                UpdateMustBuyRedpoint();

                break;

            case PlayerDataRefresh.VIPLv:

            case PlayerDataRefresh.Gold:

            case PlayerDataRefresh.GoldPaper:

@@ -232,6 +239,7 @@
    private void RefreshServerHour()

    {

        ControllerRedPoint();

        UpdateMustBuyRedpoint();

        if(!PlayerDatas.Instance.fairyData.HasFairy)

        {

            PlayerPrefs.DeleteKey(UNIONSTORESAVE_KEY);

@@ -272,7 +280,12 @@
            }



        }

    
        if(!isLogin)

        {

        CheckShopRedpoint();

            UpdateMustBuyRedpoint();

        }

        if (RefreshBuyShopLimitEvent != null)

            RefreshBuyShopLimitEvent();

    }

@@ -658,6 +671,7 @@
        }

        SetShopRedpoint();

        CheckShopRedpoint();

        UpdateMustBuyRedpoint();

    }



    public bool CheckWeekStoreIsShopBuy(out List<StoreConfig> buylist)

@@ -836,13 +850,16 @@
                    shopRedDict[storeConfig.ID].state = RedPointState.None;

                }

            }



            UpdateMustBuyRedpoint(storeConfig);

        }

    }



    public void UpdateMustBuyRedpoint(StoreConfig storeConfig)

    public void UpdateMustBuyRedpoint()

    {

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



        foreach (var key in shopRedDict.Keys)

        {

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

        if (CheckIsMustBuy(storeConfig))

        {

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

@@ -852,6 +869,7 @@
            shopRedDict[storeConfig.ID].state = RedPointState.None;

        }

    }

    }



    public void ClearMustBuyRedpoint(StoreConfig storeConfig)

    {