tinbird/aibis-dream
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'bugfix/tasl' into 'develop'

Browse Source 
Bugfix/tasl

See merge request aibis-dream/aibis-dream!381
This commit is contained in:
dingyuntian
2025-05-15 09:22:54 +00:00
parent ff22df0ab3 362b4608bd
commit 976517d7b9
5 changed files with 16 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prefabs/UIprefab/Task Item.prefab
+2 -2
View File
@@ -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,7 +38,7 @@ 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_SizeDelta: {x: 280, y: 0}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &8451937555351605602
CanvasRenderer:
Assets/Scenes/Persistence.unity
+9 -9
View File
@@ -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
@@ -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:
@@ -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
@@ -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
@@ -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
Assets/Scripts/UI/Panel/TaskPanel.cs
+3 -6
View File
@@ -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<TMP_Text>();
taskText.fontStyle |= FontStyles.Strikethrough;
taskText.color = Color.gray;
Destroy(taskItem.gameObject);
}
}
@@ -110,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;
});
Assets/StreamingAssets/Config/setting.json
+1 -1
View File
@@ -1,5 +1,5 @@
{
"Volume": "0.73",
"Language": "zh-Hans",
"Language": "en",
"WindowMode": "Windowed"
}
ProjectSettings/ProjectSettings.asset
+1 -1
View File
@@ -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