Merge branch 'master' into 1871天赋功能

client_linchunjie

2018-09-25 78bfe524ea4776c47f6314e56e97f39970b00fce

 System/Store/StoreModel.cs

@@ -69,6 +69,7 @@
        NewBieCenter.Instance.guideBeginEvent -= GuidBegin;

        shopItemlimitDict.Clear();

        petAndMountPushlist.Clear();

        ClearPushData();

        tagTowerModel = null;

        storeFuncType = StoreFunc.WeekStore;

        tcbRefreshDict.Clear();

@@ -1118,12 +1119,19 @@


    private void GuidBegin()

    {

        SetPushPetAndMountWinState(true,true);

        PetAndMountPushWin pushWin = WindowCenter.Instance.Get<PetAndMountPushWin>();

        if(pushWin != null)

        {

            SetPushPetAndMountWinState(true, true);

        }

    }



    private void OnMoveTopPart(bool isMove)

    {

        SetPushPetAndMountWinState(!isMove);

        if(!isLogin)

        {

            SetPushPetAndMountWinState(!isMove);

        }

    }



    private void windowAfterOpen(Window win)

@@ -1136,6 +1144,8 @@


    private void windowAfterClose(Window win)

    {

        if (isLogin) return;



        if(win is MainInterfaceWin)

        {

            SetPushPetAndMountWinState(true);