少年修仙传客户端代码仓库
client_linchunjie
2018-11-22 b0c48c688a04d5468da6d8abe8b5deca8d037f34
Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
3个文件已修改
37 ■■■■ 已修改文件
Fight/GameActor/GA_Hero.cs 15 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/PlayerTaskDatas.cs 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
System/MainInterfacePanel/TaskListTip.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
Fight/GameActor/GA_Hero.cs
@@ -1,4 +1,5 @@
using Snxxz.UI;
using System.Collections;
using TableConfig;
using UnityEngine;
using UnityEngine.Events;
@@ -848,10 +849,8 @@
                 && !NewBieCenter.Instance.inGuiding
                 && PlayerTaskDatas.IsOPenAutoResolve())
            {
                DebugEx.LogError(taskmodel.currentMission+"GGGG");
                taskmodel.TaskMove(taskmodel.currentMission);
                SnxxzGame.Instance.StartCoroutine(Wait());
            }
        }
        if (MapArea.IsInMapArea(CurMapArea, MapArea.E_Type.Safe)
@@ -880,7 +879,15 @@
            }
        }
    }
    private IEnumerator Wait()
    {
        yield return WaitingForSecondConst.WaitMS1500;
        if (PlayerDatas.Instance.extersion.bossState == 1)
        {
            yield break;
        }
        taskmodel.TaskMove(taskmodel.currentMission);
    }
    private SFXController m_ArrowEffect;
    public void ShowArrow(bool showOrHide)
System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -1575,7 +1575,7 @@
    }
    public void TaskMove(int _taskID)
    {
        if (allMissionDict.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)
        if (MainTaskDic.ContainsKey(_taskID) && !NewBieCenter.Instance.inGuiding)
        {
            string _strTest = allMissionDict[_taskID].InforList;
            string strTask = TaskAllocation.Instance.GetTaskInfo(Config.Instance.Get<TASKINFOConfig>(_strTest).show_writing, _taskID);
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;
                    }
                }
            }
        }
    }
}