wulongxiao/_xiaofang
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: wulongxiao:5743caeea92c9a84e637d82070980a4ac8d8c8b5
Branches Tags
wulongxiao:main
..
compare: wulongxiao:ddbd0d254442c24e911c546f0c609fa824c366d2
Branches Tags
wulongxiao:main

No commits in common. "5743caeea92c9a84e637d82070980a4ac8d8c8b5" and "ddbd0d254442c24e911c546f0c609fa824c366d2" have entirely different histories.
5743caeea9 ... ddbd0d2544

3 changed files with 13 additions and 12 deletions
Show Stats Expand all files Collapse all files

12
xiaofang/Assets/Prefabs/HYLPrefabs/Task.prefab
View File

@ -228,11 +228,9 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 38588f1b7a4315d4fb6983d86e935d19, type: 3}
m_Name:
m_EditorClassIdentifier:
taskId: 0
taskName:
state: 0
taskTxt: {fileID: 3645880154395566472}
Targets: []
jr: {fileID: 0}
id: 0
tasktxt: {fileID: 3645880154395566472}
--- !u!114 &2781362794876327239
MonoBehaviour:
m_ObjectHideFlags: 0
@ -256,8 +254,8 @@ MonoBehaviour:
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 1, g: 0, b: 0.85180044, a: 1}
m_SelectedColor: {r: 1, g: 0, b: 0.8509804, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1

11
xiaofang/Assets/Prefabs/HYLPrefabs/TaskItem.cs
View File

@ -36,7 +36,11 @@ public class TaskItem : MonoBehaviour
taskName = info.Note;
state = TaskState.NotStarted;
Debug.Log(info.Targets1);
//// ´ÓJSON¼ÓÔØÄ¿±ê
//foreach (var target in info.Targets)
//{
// Targets.Add(new TaskTarget((TargetType)target.TargetType, target.TargetID, target.Description, target.RequiredProgress));
//}
UpdateTxt();
}
@ -49,9 +53,8 @@ public class TaskItem : MonoBehaviour
{
progressInfo += $"{target.Description}: {target.CurrentProgress}/{target.RequiredProgress}\n";
}
Debug.Log(taskName);
Debug.Log(progressInfo);
taskTxt.text = $"{taskName}";
taskTxt.text = $"{taskName}\n{progressInfo}";
}
// 更新任务进度

2
xiaofang/Assets/Res/HYLUI/TaskPanel.cs
View File

@ -31,7 +31,7 @@ public class TaskPanel : Base
instance = this;
hideBtn.onClick.AddListener(OnClickHideButton);
InitList();
InitTask(taskIDs);
//InitTask(taskIDs);
}
public void InitList()