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

client_Zxw

2018-09-18 54ac5706baaf557f692b341c00fda783ef958948

 System/Store/StoreModel.cs

@@ -1126,7 +1126,6 @@
        SetPushPetAndMountWinState(!isMove);

    }





    private void windowAfterOpen(Window win)

    {

        if (win is FirstTimeRechargeWin)

@@ -1185,7 +1184,8 @@
                || !WindowCenter.Instance.CheckOpen<MainInterfaceWin>()

                || NewBieCenter.Instance.inGuiding

                || WindowCenter.Instance.CheckOpen<FirstTimeRechargeWin>()

                || currentPushId == 0)

                || currentPushId == 0

                || !ModelCenter.Instance.GetModel<PlayerMainDate>().MainTopPanelShow)

            {

                isShow = false;

            }