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

client_Zxw

2018-08-14 14484f527b3e8d09371c77e59c9dc9dc2964584c

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

 System/HappyXB/HappyXBWin.cs

@@ -38,6 +38,8 @@
        protected override void OnActived()

        {

            base.OnActived();

            if(!WindowJumpMgr.Instance.IsJumpState && functionOrder == 0)

            {

            if(xBModel.bestXBRed.state == RedPointState.Simple)

            {

                functionOrder = bestXBTitle.order;

@@ -54,6 +56,7 @@
            {

                functionOrder = xbWarehouseTitle.order;

            }

            }

            titleGroup.TriggerByOrder(functionOrder);

        }

        protected override void OnAfterOpen()