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

client_Zxw

2018-08-14 b36979b59d5825972f970d09b28e05ac45629132

 System/OpenServerActivity/OpenServerActivityWin.cs

@@ -58,6 +58,7 @@
        protected override void AddListeners()

        {

            m_ActivityCtrl.OnRefreshCell += OnOpenServerActivityRefresh;

            m_ActivityCtrl.OnGetDynamicSize += OnGetDynamicSize;

            m_BtnClose.onClick.AddListener(CloseClick);

        }



@@ -266,6 +267,22 @@
            }

        }



        private bool OnGetDynamicSize(ScrollerDataType type, int index, out float height)

        {

            height = 74;

            var sort = index;

            if (type == ScrollerDataType.Header)

            {

                if (!m_ActivitySpreadDict.ContainsKey(sort) || !m_ActivitySpreadDict[sort]

                    || (sort != 2 && sort != 0))

                {

                    height = 80;

                    return true;

                }

            }

            return false;

        }



        private void RefreshOpenActivityCell(OpenServerActivityCell _cell)

        {

            OperationBase operationBase;