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

client_Hale

2018-09-08 0cbe7a8f474b0ad163139515d0fb4a76bd7858df

 System/MainInterfacePanel/TaskListTip.cs

@@ -221,6 +221,8 @@
            for (int i = 0; i < leng; i++)

            {

                GameObject childObj = Content.GetChild(i).gameObject;

                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

                childObjTaskType.ClearTaskName();

                if (childObj.activeSelf)

                {

                    childObj.SetActive(!childObj.activeSelf);

@@ -279,7 +281,6 @@
            {

                GameObject childObj = Content.GetChild(i).gameObject;

                TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();

            //    childObj.GetComponent<FlyingShoesTask>().ImgSelected.SetActive(false);

                if (i < _list.Count)

                {

                    if (!childObj.activeSelf)

@@ -293,6 +294,7 @@
                }

                else

                {

                    childObjTaskType.ClearTaskName();

                    if (childObj.activeSelf)

                    {

                        childObj.SetActive(false);