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

client_Wu Xijin

2018-12-04 31efa47c430874f95f4ff5503372f0cf6ecb53ae

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -456,6 +456,7 @@
                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        if (functionOrder != sort)

                        {

                            m_ActivitySpreadDict[sort] = false;

                            break;

                        }

                        if (!m_ActivitySpreadDict[sort])

@@ -475,6 +476,7 @@
                        m_ActivityCtrl.AddCell(ScrollerDataType.Header, sort);

                        if (!m_ActivitySpreadDict[sort])

                        {

                            m_ActivitySpreadDict[sort] = false;

                            break;

                        }

                        m_ActivityCtrl.AddCell(ScrollerDataType.Normal, sort * 100 + 1);