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

client_linchunjie

2018-11-22 b0c48c688a04d5468da6d8abe8b5deca8d037f34

 System/MainInterfacePanel/TaskListTip.cs

@@ -105,7 +105,8 @@
            TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;

            PlayerDatas.Instance.PlayerDataRefreshInfoEvent += Updatefighting;//数据的刷新(h0418)

            OnCollectingTreasureChangeEvent(TreasureCategory.Human);

            TaskScheduling();//任务排序  1

            TaskScheduling();//任务排序  
            Selected();//任务选择

            TheTaskToGenerate();//任务生成

            TaskJump();



@@ -230,6 +231,7 @@
            {

                if (MissionState != 0 && MissionID != 1 && _list.Contains(MissionID))

                {

                    Selected();//选中逻辑

                    TaskAddAndDelete(MissionID);

                    if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing)

                    {

@@ -501,6 +503,7 @@
                {

                    type = _list.IndexOf(jumpTask);

                }



            }

            if (_list.Count <= 2 || type <= 0)

            {

@@ -521,6 +524,21 @@
                m_ScrollRect.verticalNormalizedPosition = Mathf.Clamp01(_position / ((Content as RectTransform).sizeDelta.y - 196));

            }

        }



        private void Selected()//选中逻辑修改

        {

            if (taskmodel.GetTaskStatus(taskmodel.GetNowTaskID) == PlayerTaskDatas.TaskStatus.CardLevel)

            {

                for (int i = 0; i < _list.Count; i++)

                {

                    if (taskmodel.GetTaskStatus(_list[i]) == PlayerTaskDatas.TaskStatus.Normal)

                    {

                        taskmodel.GetNowTaskID = _list[i];

                        return;

                    }               
                }

            }

        }

    }

}