From b8b99e24035d9309e4fd4c5c0e0db52d38e06f61 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期四, 22 十一月 2018 16:43:13 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts
---
System/MainInterfacePanel/TaskListTip.cs | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 6cc0349..920ce80 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/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;
+ }
+ }
+ }
+ }
}
}
--
Gitblit v1.8.0