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

client_linchunjie

2018-09-03 3498da7e8046ac2543372bdf6d302a86002648c0

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

 System/FairyAu/MethodToWin.cs

@@ -330,7 +330,7 @@
                    CA607_tagCMFamilyTechLVUP tag_CA607 = new CA607_tagCMFamilyTechLVUP();

                    tag_CA607.TechID = (uint)indexID;

                    GameNetSystem.Instance.SendInfo(tag_CA607);



                    DebugEx.LogError("输出心法科技需要提升的技能IndexID"+ indexID);

                }

                else

                {


 System/MainInterfacePanel/TaskListTip.cs

@@ -37,7 +37,6 @@
        PlayerPackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PlayerPackModel>()); } }

        PlayerMainDate m_MainModel;

        PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }

        List<int> RenzhuTaskIDList = new List<int>();//法宝任务数组ID

        List<int> ListSort = new List<int>();//用于排列顺序(未卡级)

        List<int> ListSort1 = new List<int>();//用于排序（卡级）

        private void Start()

@@ -95,15 +94,6 @@
                    ListSort1.Add(TaskSortType2[i]);

                }

            }

            if (RenzhuTaskIDList.Count <= 0)

            {

                int[] RenzhuTaskID1 = ConfigParse.GetMultipleStr<int>(RenzhuTaskID.Numerical1);

                for (int i = 0; i < RenzhuTaskID1.Length; i++)

                {

                    RenzhuTaskIDList.Add(RenzhuTaskID1[i]);

                }

            }



            PlayerTaskDatas.Event_TaskToAdd += TaskToAdd;//任务的添加

            PlayerTaskDatas.Event_TaskRefreshes += TaskRefreshes;//任务的刷新

            PlayerTaskDatas.Event_TaskToDelete += OnTaskToDelete;//任务的删除

@@ -211,7 +201,7 @@
            TaskScheduling();

            bool IsDefault = true;

            var State = taskmodel.GetTaskStatus(_id);

            if (State == PlayerTaskDatas.TaskStatus.CardLevel || (State == PlayerTaskDatas.TaskStatus.TreasureCardLevel && !RenzhuTaskIDList.Contains(_id)))

            if (State == PlayerTaskDatas.TaskStatus.CardLevel)

            {

                IsDefault = false;

            }

@@ -399,7 +389,7 @@
            foreach (var key in taskmodel.MainTaskDic.Keys)

            {

                var State = taskmodel.GetTaskStatus(key);

                if (State == PlayerTaskDatas.TaskStatus.CardLevel || (State == PlayerTaskDatas.TaskStatus.TreasureCardLevel && !RenzhuTaskIDList.Contains(key)))

                if (State == PlayerTaskDatas.TaskStatus.CardLevel)

                {

                    IsDefault = false;

                }