diff --git a/Assets/Prefabs/UIprefab/Task Item.prefab b/Assets/Prefabs/UIprefab/Task Item.prefab index f5b88acf3..7998b76e0 100644 --- a/Assets/Prefabs/UIprefab/Task Item.prefab +++ b/Assets/Prefabs/UIprefab/Task Item.prefab @@ -28,7 +28,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7125762734194905057} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -38,8 +38,8 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 320, y: 0} - m_Pivot: {x: 0, y: 0.5} + m_SizeDelta: {x: 300, y: 0} + m_Pivot: {x: 0, y: 1} --- !u!222 &8451937555351605602 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 0a06b4131..241902cd5 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -2893,7 +2893,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 200, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &190932926 @@ -3970,7 +3970,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 200, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &237392156 @@ -5805,7 +5805,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &425473020 RectTransform: m_ObjectHideFlags: 0 @@ -10179,7 +10179,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &725556430 RectTransform: m_ObjectHideFlags: 0 @@ -20836,7 +20836,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 200, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1611684201 @@ -24219,7 +24219,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 200, y: 0} m_SizeDelta: {x: 0, y: 80} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1960600463 diff --git a/Assets/Scripts/UI/Panel/TaskPanel.cs b/Assets/Scripts/UI/Panel/TaskPanel.cs index 1b62483de..6ac751ecb 100644 --- a/Assets/Scripts/UI/Panel/TaskPanel.cs +++ b/Assets/Scripts/UI/Panel/TaskPanel.cs @@ -5,7 +5,6 @@ using AibisDream.Framework; using AibisDream.Kit; using AibisDream.Utility; using DG.Tweening; -using TMPro; using UnityEngine; using Yarn.Unity; @@ -44,11 +43,9 @@ namespace AibisDream public void CompleteTask(string lineId) { - if (_taskDict.TryGetValue(lineId, out var taskItem)) + if (_taskDict.Remove(lineId, out var taskItem)) { - var taskText = taskItem.GetComponent(); - taskText.fontStyle |= FontStyles.Strikethrough; - taskText.color = Color.gray; + Destroy(taskItem.gameObject); } } diff --git a/Assets/StreamingAssets/Config/setting.json b/Assets/StreamingAssets/Config/setting.json index 5522cdf4a..7d308e78b 100644 --- a/Assets/StreamingAssets/Config/setting.json +++ b/Assets/StreamingAssets/Config/setting.json @@ -1,5 +1,5 @@ { "Volume": "0.73", - "Language": "zh-Hans", + "Language": "en", "WindowMode": "Windowed" } \ No newline at end of file