From 9815400bb0c69634f667a9ee997f5bfeac0937d0 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Thu, 15 May 2025 16:37:10 +0800 Subject: [PATCH 1/3] Task --- Assets/Prefabs/UIprefab/Task Item.prefab | 6 +++--- Assets/Scenes/Persistence.unity | 12 ++++++------ Assets/Scripts/UI/Panel/TaskPanel.cs | 7 ++----- Assets/StreamingAssets/Config/setting.json | 2 +- 4 files changed, 12 insertions(+), 15 deletions(-) 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 From d1c1b25f27c2eedb1a1341c433c6d3159fe49aca Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Thu, 15 May 2025 16:50:49 +0800 Subject: [PATCH 2/3] task --- Assets/Prefabs/UIprefab/Task Item.prefab | 4 ++-- Assets/Scenes/Persistence.unity | 10 +++++----- Assets/Scripts/UI/Panel/TaskPanel.cs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/Assets/Prefabs/UIprefab/Task Item.prefab b/Assets/Prefabs/UIprefab/Task Item.prefab index 7998b76e0..78a812e7d 100644 --- a/Assets/Prefabs/UIprefab/Task Item.prefab +++ b/Assets/Prefabs/UIprefab/Task Item.prefab @@ -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: 300, y: 0} - m_Pivot: {x: 0, y: 1} + m_SizeDelta: {x: 280, y: 0} + m_Pivot: {x: 0, y: 0.5} --- !u!222 &8451937555351605602 CanvasRenderer: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 241902cd5..0356d1e06 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -5805,7 +5805,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &425473020 RectTransform: m_ObjectHideFlags: 0 @@ -5826,7 +5826,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 350, y: 350} + m_SizeDelta: {x: 350, y: 250} m_Pivot: {x: 0, y: 0} --- !u!222 &425473021 CanvasRenderer: @@ -22306,8 +22306,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -45} - m_SizeDelta: {x: 0, y: -90} + m_AnchoredPosition: {x: 0, y: -32.22} + m_SizeDelta: {x: 0, y: -98.53} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1775784971 MonoBehaviour: @@ -22326,7 +22326,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 0 + m_ChildAlignment: 3 m_Spacing: 10 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 0 diff --git a/Assets/Scripts/UI/Panel/TaskPanel.cs b/Assets/Scripts/UI/Panel/TaskPanel.cs index 6ac751ecb..df4dced5a 100644 --- a/Assets/Scripts/UI/Panel/TaskPanel.cs +++ b/Assets/Scripts/UI/Panel/TaskPanel.cs @@ -107,7 +107,7 @@ namespace AibisDream gameObject.SetActive(true); AudioManager.Instance.PlaySfx("event:/Scriptal/taskmanager"); // 下移 - _rectTransform.DOAnchorPosY(-350, 1f).OnComplete(() => + _rectTransform.DOAnchorPosY(-250, 1f).OnComplete(() => { IsOpen = true; }); From 362b4608bda8fc2688fbd374775eefdbfe64eb27 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Thu, 15 May 2025 17:20:10 +0800 Subject: [PATCH 3/3] Update ProjectSettings.asset --- ProjectSettings/ProjectSettings.asset | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index bac74d3fc..ac9379415 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.2.2.13-20250514-223749 + bundleVersion: 0.2.2.14-20250515-165403 preloadedAssets: - {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2} metroInputSource: 0