少年修仙传客户端代码仓库
client_Wu Xijin
2019-06-27 62d51785f72bff52caabf44183d472c39bc39c18
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
47 ■■■■ 已修改文件
System/DailyQuest/ResourcesBackWin.cs 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/EquipGem/EquipGemModel.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/StoryTask.cs 37 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/DailyQuest/ResourcesBackWin.cs
@@ -136,7 +136,7 @@
            {
                return;
            }
            int Line = Mathf.CeilToInt((float)_list.Count / 2);
            int Line = (_list.Count + 1) / 2;
            for (int i = 0; i < Line; i++)
            {
                gridCtrl.AddCell(ScrollerDataType.Header, i);
@@ -152,7 +152,7 @@
                ResourcesBackBoxBack resourcesBackBoxBack = cell.transform.GetChild(childCode).GetComponent<ResourcesBackBoxBack>();
                resourcesBackBoxBack.gameObject.SetActive(false);
                int cellCount = (cell.transform.childCount) * gridlineIndex + (childCode + 1);
                if (cellCount - 1 < resourcesBackModel.ResourcesBackDic.Count && cellCount - 1 < _list.Count)
                if ( cellCount - 1 < _list.Count)
                {
                    resourcesBackBoxBack.gameObject.SetActive(true);
                    ResourcesBackClass resourcesBackClass = _list[cellCount - 1];
@@ -332,6 +332,7 @@
            {
                IsBool = true;
                Sequencing();
                OnCreateGridLineCell(m_ScrollerController);
                IsFindOneKey();
                m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见
            }
@@ -341,7 +342,8 @@
            if (_bool)
            {
                IsBool = false;
                Sequencing();
                Sequencing();
                OnCreateGridLineCell(m_ScrollerController);
                IsFindOneKey();
                m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见
            }
System/EquipGem/EquipGemModel.cs
@@ -956,7 +956,7 @@
            sameLevelCount -= emptyHoleCount;
            GemType gemType;
            TryGetGemType(type, out gemType);
            if (sameLevelCount < gemType.composeCount)
            if (sameLevelCount < gemType.composeCount - 1)
            {
                return false;
            }
System/MainInterfacePanel/StoryTask.cs
@@ -29,6 +29,7 @@
        private Dictionary<int, string> chapterDic = new Dictionary<int, string>();//用来存储主线任务章节
        private List<int> listTask = new List<int>();//储存当前章节的任务个数
        private int mainTaskID = 0;//获取当前正在进行任务的ID
        private int closerTaskId = 0;
        private int mainTaaskChapter = 1;//获取当前任务的章节
        private int MainTaaskChapterNow = 1;//获取当前选中的选中章节数
@@ -51,7 +52,7 @@
            GetMainIDAndMainTaskChapter();
            MainTaaskChapterNow = mainTaaskChapter;
            ListTask(MainTaaskChapterNow);
            MainTaskIDNow = mainTaskID;
            MainTaskIDNow = closerTaskId;
            OnCreateGridLineCell(_TaskRamusList);//创建赋值
            StartCoroutine("Delay");
        }
@@ -85,7 +86,11 @@
                    {
                        for (int i = 0; i < listTask.Count; i++)
                        {
                            gridCtrl.AddCell(ScrollerDataType.Normal, listTask[i]);
                            var config = TaskListConfig.Get(listTask[i]);
                            if (config != null && TASKINFOConfig.Has(config.TaskName))
                            {
                                gridCtrl.AddCell(ScrollerDataType.Normal, listTask[i]);
                            }
                        }
                    }
                }
@@ -331,10 +336,32 @@
                if (_MainTaskDic[key].MissionState != 0 && _MainTaskDic[key].MissionState != 3)
                {
                    mainTaskID = key;
                    mainTaaskChapter = TaskListConfig.Get(key).ChapterID;
                    closerTaskId = GetCloserTask(key);
                    mainTaaskChapter = TaskListConfig.Get(closerTaskId).ChapterID;
                }
            }
        }
        int GetCloserTask(int taskId)
        {
            if (TaskListConfig.Has(taskId))
            {
                return taskId;
            }
            var configs = TaskListConfig.GetValues();
            var id = configs[0].TaskID;
            foreach (var config in configs)
            {
                if (config.TaskID <= taskId && TASKINFOConfig.Has(config.TaskName))
                {
                    id = config.TaskID;
                }
                else
                {
                    break;
                }
            }
            return id;
        }
@@ -362,7 +389,7 @@
            for (int i = 0; i < listTask.Count; i++)
            {
                Index += 1;
                if (listTask[i] == mainTaskID)
                if (listTask[i] == closerTaskId)
                {
                    return Index;