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

client_Hale

2018-12-03 3ad8237a1631be487f39ac3fdf6015acc9b0631f

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -69,7 +69,7 @@
            var impactDefaultType = impactRankModel.GetDefaultSelectType();

            if (impactRankModel.IsLock(impactDefaultType))

            {

                impactDefaultType = impactRankModel.billRankCfgDict.Keys.First();

                impactDefaultType = impactRankModel.impactRankSorts[0];

            }

            impactRankModel.presentSelectType = impactDefaultType;

            impactRankModel.gotoImpactRankType = 0;

@@ -462,7 +462,7 @@
                        {

                            break;

                        }

                        foreach (var _type in impactRankModel.billRankCfgDict.Keys)

                        foreach (var _type in impactRankModel.impactRankSorts)

                        {

                            if (impactRankModel.IsLock(_type))

                            {