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

client_Zxw

2018-09-20 1f5e35cd47a9baaaa6fa559c06640f47c9e79554

 System/MainInterfacePanel/TipPanel.cs

@@ -91,7 +91,8 @@
            {

                firstTimeRechargeModel.OpenFirstChargeTrialWin();

            }

            else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()) //灵宠坐骑推送

            else if(!WindowCenter.Instance.CheckOpen<PetAndMountPushWin>()

                && !WindowCenter.Instance.CheckOpen<OffLineOnHookWin>()) //灵宠坐骑推送

            {

                storeModel.SetPushPetAndMountWinState();

            }