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

client_Wu Xijin

2018-09-19 42044e959bbd3f169519fce262bfeb2c84932cb8

 System/MainInterfacePanel/TaskListTip.cs

@@ -102,8 +102,6 @@
            model.collectingTreasureChangeEvent += OnCollectingTreasureChangeEvent;

            FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent += CloseTreasureNewGotWinEvent;

            playerPack.RefreshItemCountAct += RefreshItemCountAct;

            playerPack.ItemCntReduceAct += ItemCntReduceAct;

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

            OnCollectingTreasureChangeEvent(TreasureCategory.Human);

            TaskScheduling();//任务排序  1

@@ -134,54 +132,13 @@
            FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;

            TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent;

            PlayerTaskDatas.MainCardLevelChange -= MainCardLevelChange;//卡级任务修改

            playerPack.RefreshItemCountAct -= RefreshItemCountAct;

            playerPack.ItemCntReduceAct -= ItemCntReduceAct;

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

        }



        private void Updatefighting(PlayerDataRefresh obj)//等级刷新

        {

            if (obj == PlayerDataRefresh.LV)

            {

                foreach (var key in taskmodel.SideQuestsDic.Keys)

                {

                    if (mainModel.TaskId_Skill1.Contains(key))

                    {

                        TaskIdUpdate(key);

                    }

                }

            }

           
        }



        private void ItemCntReduceAct(PackType arg1, int arg2, int arg3)

        {

            if (arg1 == PackType.rptItem && arg3== mainModel.ItemID)

            {

                foreach (var key in taskmodel.SideQuestsDic.Keys)

                {

                    if (mainModel.TaskId_Skill1.Contains(key))

                    {

                        TaskIdUpdate(key);

                    }

                }

            }

            
        }



        private void RefreshItemCountAct(PackType arg1, int arg2, int arg3)

        {

            if (arg1 == PackType.rptItem && arg3 == mainModel.ItemID)

            {

                foreach (var key in taskmodel.SideQuestsDic.Keys)

                {

                    if (mainModel.TaskId_Skill1.Contains(key))

                    {

                        TaskIdUpdate(key);

                    }

                }

            }

        }



        private void TaskIdUpdate(int taskId)

        {

            int leng = Content.childCount;