From 44b5b3201f08c119429f5ec6da982677e47569a2 Mon Sep 17 00:00:00 2001
From: client_Wu Xijin <364452445@qq.com>
Date: 星期三, 27 三月 2019 17:58:13 +0800
Subject: [PATCH] Merge branch 'MainWinAdjust'
---
System/MainInterfacePanel/TaskListTip.cs | 164 ++++++++++++++++++++++--------------------------------
1 files changed, 66 insertions(+), 98 deletions(-)
diff --git a/System/MainInterfacePanel/TaskListTip.cs b/System/MainInterfacePanel/TaskListTip.cs
index 998d3fa..2054c05 100644
--- a/System/MainInterfacePanel/TaskListTip.cs
+++ b/System/MainInterfacePanel/TaskListTip.cs
@@ -22,60 +22,21 @@
public float ParentPosition = 74;
public float TaskScrollViewTaskScrollView = 230f;
public float m_SizeHeight = 72f;//鍗曟潯浠诲姟鐨勫搴�
- [SerializeField] Transform Parent;//鐖剁骇
+
[SerializeField] TreasureCollectBriefInfoBehaviour m_HumanTreasure;//浜烘棌娉曞疂
- [SerializeField] Transform TaskScrollView;//浠诲姟鏉′綅缃�
[SerializeField] Transform Content;//浠诲姟鏉＄埗鑺傜偣
[SerializeField] ScrollRect m_ScrollRect;
+
public int TaskId = 0;//浠诲姟ID
List<int> _list = new List<int>();//鐢ㄦ潵鎺у埗杩涜鎺掑簭
- TreasureModel m_Model;
- TreasureModel model { get { return m_Model ?? (m_Model = ModelCenter.Instance.GetModel<TreasureModel>()); } }
- TaskModel m_TaskModel;
- TaskModel taskmodel { get { return m_TaskModel ?? (m_TaskModel = ModelCenter.Instance.GetModel<TaskModel>()); } }
- PackModel _playerPack;
- PackModel playerPack { get { return _playerPack ?? (_playerPack = ModelCenter.Instance.GetModel<PackModel>()); } }
- PlayerMainDate m_MainModel;
- PlayerMainDate mainModel { get { return m_MainModel ?? (m_MainModel = ModelCenter.Instance.GetModel<PlayerMainDate>()); } }
+ TreasureModel model { get { return ModelCenter.Instance.GetModel<TreasureModel>(); } }
+ TaskModel taskmodel { get { return ModelCenter.Instance.GetModel<TaskModel>(); } }
+
List<int> ListSort = new List<int>();//鐢ㄤ簬鎺掑垪椤哄簭(鏈崱绾�)
List<int> ListSort1 = new List<int>();//鐢ㄤ簬鎺掑簭锛堝崱绾э級
- private void Start()
- {
-
-
- }
-
- void DisplayTreasure(int _treasureIdHuman)
- {
- if (FuncOpen.Instance.IsFuncOpen(106) && model.newGotTreasureId != TreasureModel.TREASURE_GUIDE_ID)
- {
- m_HumanTreasure.gameObject.SetActive(true);
- m_HumanTreasure.Display();
- }
- else
- {
- m_HumanTreasure.gameObject.SetActive(false);
- m_HumanTreasure.Dispose();
- }
- }
-
- void UpdateControllerPosition()//鏇存柊鎺т欢浣嶇疆
- {
- if (m_HumanTreasure.gameObject.activeSelf)
- {
- (Parent as RectTransform).sizeDelta = (Parent as RectTransform).sizeDelta.SetY(ParentPosition);
- (TaskScrollView as RectTransform).sizeDelta = (TaskScrollView as RectTransform).sizeDelta.SetY(TaskScrollViewTaskScrollView - ParentPosition);
- }
- else
- {
- (Parent as RectTransform).sizeDelta = (Parent as RectTransform).sizeDelta.SetY(0);
- (TaskScrollView as RectTransform).sizeDelta = (TaskScrollView as RectTransform).sizeDelta.SetY(TaskScrollViewTaskScrollView);
- }
- }
public void Init()//鍒濆鍖�
{
-
var TaskSortType = FuncConfigConfig.Get("TaskSortType");
var RenzhuTaskID = FuncConfigConfig.Get("RenzhuTaskID");
if (ListSort.Count <= 0)
@@ -94,11 +55,11 @@
ListSort1.Add(TaskSortType2[i]);
}
}
+
TaskModel.Event_TaskToAdd += TaskToAdd;//浠诲姟鐨勬坊鍔�
TaskModel.Event_TaskRefreshes += TaskRefreshes;//浠诲姟鐨勫埛鏂�
TaskModel.Event_TaskToDelete += OnTaskToDelete;//浠诲姟鐨勫垹闄�
TaskModel.Event_TaskInformation += TaskInformation;//浠诲姟瀛楀吀淇℃伅
- TaskModel.MainCardLevelChange += MainCardLevelChange;//鍗＄骇浠诲姟淇敼
TaskModel.CardLevelChange += CardLevelChangeEvent;//鍗＄骇浠诲姟鐘舵�佹敼鍙�
model.collectingTreasureChangeEvent += OnCollectingTreasureChangeEvent;
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
@@ -115,7 +76,25 @@
private void CloseTreasureNewGotWinEvent()
{
DisplayTreasure(model.collectingHuman);
- UpdateControllerPosition();
+ }
+
+ private void OnCollectingTreasureChangeEvent(TreasureCategory _category)
+ {
+ DisplayTreasure(model.collectingHuman);
+ }
+
+ void DisplayTreasure(int _treasureIdHuman)
+ {
+ if (model.newGotTreasureId != TreasureModel.TREASURE_GUIDE_ID)
+ {
+ m_HumanTreasure.gameObject.SetActive(true);
+ m_HumanTreasure.Display();
+ }
+ else
+ {
+ m_HumanTreasure.gameObject.SetActive(false);
+ m_HumanTreasure.Dispose();
+ }
}
private void OnFuncStateChangeEvent(int obj)
@@ -132,11 +111,10 @@
TaskModel.Event_TaskToDelete -= OnTaskToDelete;//浠诲姟鐨勫垹闄�
TaskModel.Event_TaskInformation -= TaskInformation;//浠诲姟瀛楀吀淇℃伅
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
- TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent;
- TaskModel.MainCardLevelChange -= MainCardLevelChange;//鍗＄骇浠诲姟淇敼
TaskModel.CardLevelChange -= CardLevelChangeEvent;//鍗＄骇浠诲姟鐘舵�佹敼鍙�
+ TreasureNewGotWin.CloseTreasureNewGotWinEvent -= CloseTreasureNewGotWinEvent;
PlayerDatas.Instance.playerDataRefreshEvent -= Updatefighting;//鏁版嵁鐨勫埛鏂�(h0418)
- StopAllCoroutines();
+ StopAllCoroutines();
}
private void Updatefighting(PlayerDataType obj)//绛夌骇鍒锋柊
@@ -151,8 +129,8 @@
int leng = Content.childCount;
for (int i = 0; i < leng; i++)
{
- GameObject childObj = Content.GetChild(i).gameObject;
- TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
+ var childObj = Content.GetChild(i).gameObject;
+ var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
if (childObj.activeSelf && childObjTaskType.TaskID == key)
{
childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(key);
@@ -162,6 +140,7 @@
}
}
}
+
private void CardLevelChangeEvent(int taskID)//鍗＄骇鐘舵�佹敼鍙�
{
if (taskmodel.allMissionDict.ContainsKey(taskID) && taskmodel.allMissionDict[taskID].Type == 3)
@@ -170,12 +149,6 @@
ChangeSort();
TaskJump(taskID);
}
- }
- private void MainCardLevelChange(int _id)//涓荤嚎浠诲姟鍗＄骇鐘舵�佹敼鍙�
- {
- //TaskScheduling();
- //ChangeSort();
- //TaskJump(_id);
}
private void SetLength()
@@ -195,8 +168,8 @@
int leng = Content.childCount;
for (int i = 0; i < leng; i++)
{
- GameObject childObj = Content.GetChild(i).gameObject;
- TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
+ var childObj = Content.GetChild(i).gameObject;
+ var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
childObjTaskType.ClearTaskName();
if (childObj.activeSelf)
{
@@ -219,16 +192,15 @@
childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]);
}
}
+
void TaskToAdd(int MissionID, int MissionState, int DiscriptionIndex)//娣诲姞浠诲姟
{
if (MissionID == 2000 || MissionID == 3000 || MissionState == 3 || MissionState == 0)
{
return;
}
- if (Parent.gameObject.activeInHierarchy)
- {
- StartCoroutine(WaitAddTask(MissionID, MissionState));
- }
+
+ StartCoroutine(WaitAddTask(MissionID, MissionState));
}
IEnumerator WaitAddTask(int MissionID, int MissionState)
@@ -244,19 +216,20 @@
TaskAddAndDelete(MissionID);
if (NewBieCenter.Instance.inGuiding || ModelCenter.Instance.GetModel<TreasureModel>().newGotShowing)
{
- yield break ;
+ yield break;
}
TaskJump(MissionID);
yield break;
}
}
}
+
private void TaskAddAndDelete(int TaskID)
{
for (int i = 0; i < Content.childCount; i++)
{
- GameObject childObj = Content.GetChild(i).gameObject;
- TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
+ var childObj = Content.GetChild(i).gameObject;
+ var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
if (i < _list.Count)
{
if (!childObj.activeSelf)
@@ -306,8 +279,8 @@
{
if (i <= Content.childCount - 1)
{
- GameObject childObj = Content.GetChild(i).gameObject;
- TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
+ var childObj = Content.GetChild(i).gameObject;
+ var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
if (childObj.activeSelf && childObjTaskType.TaskID == MissionID)
{
if (childObjTaskType.m_TypeBool)
@@ -345,8 +318,8 @@
{
for (int i = 0; i < Content.childCount; i++)
{
- GameObject obj = Content.GetChild(i).gameObject;
- TaskType taskType = obj.GetComponent<TaskType>();
+ var obj = Content.GetChild(i).gameObject;
+ var taskType = obj.GetComponent<TaskType>();
if (obj.activeSelf && taskType.TaskID == taskID)
{
taskType.TaskID = 0;
@@ -357,16 +330,15 @@
}
}
}
+
private void ChangeSort()//鍏充簬浠诲姟鍙樻洿鎺掑簭
{
-
for (int i = 0; i < _list.Count; i++)
{
-
for (int j = 0; j < Content.childCount; j++)
{
- GameObject obj = Content.GetChild(j).gameObject;
- TaskType taskType = obj.GetComponent<TaskType>();
+ var obj = Content.GetChild(j).gameObject;
+ var taskType = obj.GetComponent<TaskType>();
if (taskType.TaskID != 0 && taskType.TaskID == _list[i])
{
int Inedx = _list.IndexOf(taskType.TaskID);
@@ -382,8 +354,8 @@
int leng = Content.childCount;
for (int i = 0; i < leng; i++)
{
- GameObject childObj = Content.GetChild(i).gameObject;
- TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
+ var childObj = Content.GetChild(i).gameObject;
+ var childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>();
if (childObj.activeSelf && childObjTaskType.TaskID == _Taskid)
{
childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_Taskid);
@@ -422,18 +394,19 @@
_list.Sort(Compare1);//鍗＄骇鎺掑簭
}
}
+
int Compare(int x, int y)//榛樿鎺掑簭(鏃犲崱绾�)
{
- MissionDetailDates xPack = taskmodel.allMissionDict[x];
- MissionDetailDates yPack = taskmodel.allMissionDict[y];
- bool IsMainTaskx = xPack.Type == 0;
- bool IsMainTasky = yPack.Type == 0;
+ var xPack = taskmodel.allMissionDict[x];
+ var yPack = taskmodel.allMissionDict[y];
+ var IsMainTaskx = xPack.Type == 0;
+ var IsMainTasky = yPack.Type == 0;
if (IsMainTaskx.CompareTo(IsMainTasky) != 0)//浼樺厛涓荤嚎
{
return -IsMainTaskx.CompareTo(IsMainTasky);
}
- bool IsStateTaskx = xPack.MissionState == 2;
- bool IsStateTasky = yPack.MissionState == 2;
+ var IsStateTaskx = xPack.MissionState == 2;
+ var IsStateTasky = yPack.MissionState == 2;
if (IsStateTaskx.CompareTo(IsStateTasky) != 0)//浼樺厛鍙鍙�
{
return -IsStateTaskx.CompareTo(IsStateTasky);
@@ -454,16 +427,16 @@
int Compare1(int x, int y)//鎺掑簭鏈夊崱绾�
{
- MissionDetailDates xPack = taskmodel.allMissionDict[x];
- MissionDetailDates yPack = taskmodel.allMissionDict[y];
- bool IsMainTaskx = xPack.Type == 0;
- bool IsMainTasky = yPack.Type == 0;
+ var xPack = taskmodel.allMissionDict[x];
+ var yPack = taskmodel.allMissionDict[y];
+ var IsMainTaskx = xPack.Type == 0;
+ var IsMainTasky = yPack.Type == 0;
if (IsMainTaskx.CompareTo(IsMainTasky) != 0)//浼樺厛涓荤嚎
{
return -IsMainTaskx.CompareTo(IsMainTasky);
}
- bool IsStateTaskx = xPack.MissionState == 2;
- bool IsStateTasky = yPack.MissionState == 2;
+ var IsStateTaskx = xPack.MissionState == 2;
+ var IsStateTasky = yPack.MissionState == 2;
if (IsStateTaskx.CompareTo(IsStateTasky) != 0)//浼樺厛鍙鍙�
{
return -IsStateTaskx.CompareTo(IsStateTasky);
@@ -480,12 +453,6 @@
}
return 1;
- }
-
- private void OnCollectingTreasureChangeEvent(TreasureCategory _category)
- {
- DisplayTreasure(model.collectingHuman);
- UpdateControllerPosition();
}
private bool IsDungeon()//鍒ゆ柇鏄惁鍦ㄥ壇鏈腑
@@ -550,7 +517,7 @@
{
bool _IsBool = false;
var taskList = TaskListConfig.Get(taskmodel.GetNowTaskID);
- if (taskList!=null)
+ if (taskList != null)
{
_IsBool = true;
}
@@ -561,7 +528,7 @@
if (_IsBool)//涓荤嚎鍗＄骇
{
var task_List = TaskListConfig.Get(_list[i]);
- if (task_List==null)
+ if (task_List == null)
{
taskmodel.GetNowTaskID = _list[i];
return;
@@ -571,11 +538,12 @@
{
taskmodel.GetNowTaskID = _list[i];
return;
- }
- }
+ }
+ }
}
}
}
+
}
}
--
Gitblit v1.8.0