修复部分问题

1. 章节解锁问题 2. 部分文字显示错误 3. 部分图层排序错误
2026-01-12 16:46:51 +08:00
parent 54f050f77b
commit 10e2871f56
11 changed files with 1504 additions and 1417 deletions
@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 4eb546b551bf291428907acf8b68aba6
+guid: 56ea66701fc40144bb9cbd97ce2709cd
 TextScriptImporter:
  externalObjects: {}
  userData: 
@@ -11,6 +11,7 @@ GameObject:
  - component: {fileID: 4156240678385147197}
  - component: {fileID: 3152720343440710739}
  - component: {fileID: 351969066121265812}
+  - component: {fileID: 525251063544976677}
  m_Layer: 0
  m_Name: Task Item Temp
  m_TagString: Untagged
@@ -126,8 +127,8 @@ MonoBehaviour:
  m_faceColor:
    serializedVersion: 2
    rgba: 4294967295
-  m_fontSize: 2.4
-  m_fontSizeBase: 2.4
+  m_fontSize: 2
+  m_fontSizeBase: 2
  m_fontWeight: 400
  m_enableAutoSizing: 0
  m_fontSizeMin: 18
@@ -171,3 +172,17 @@ MonoBehaviour:
  m_hasFontAssetChanged: 0
  m_renderer: {fileID: 3152720343440710739}
  m_maskType: 0
+--- !u!114 &525251063544976677
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5370176113195622641}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 2
@@ -518,7 +518,7 @@ MonoBehaviour:
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
-  m_text: "\u5BF9\u8BDD\u5185\u5BB9\u663E\u793A\u5728\u8FD9\u91CC<sub>\u652F\u6301\u5BCC\u6587\u672C</sub>"
+  m_text: 
  m_isRightToLeft: 0
  m_fontAsset: {fileID: 11400000, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
  m_sharedMaterial: {fileID: -5947736473428621296, guid: c7fc4cbba4b38a04c8985d4dbce12a73, type: 2}
@@ -21180,7 +21180,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1403558893
 RectTransform:
  m_ObjectHideFlags: 0
@@ -1,3 +1,4 @@
+using System.Collections;
 using System.Collections.Generic;
 using System.Globalization;
 using System.Linq;
@@ -6,6 +7,7 @@ using AibisDream.Utility;
 using DG.Tweening;
 using Febucci.UI;
 using Febucci.UI.Core;
+using Newtonsoft.Json;
 using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
@@ -21,6 +23,7 @@ namespace AibisDream.FixSystem
        [SerializeField] private TMP_Text textForEstimation;
        [SerializeField] private int maxLineNum = 10;

+        private ScreenData _screenData;
        private GameObject _textItemPrefab;
        private Queue<TypewriterByCharacter> _lineQueue;

@@ -46,6 +49,8 @@ namespace AibisDream.FixSystem

        private void Register()
        {
+            _screenData = new ScreenData { screenSystem = this };
+            StorageSystem.Instance.RegisterData(_screenData);
            FixSystemCenter.SystemDic.Register(this);
            DialogUIManager.Instance.RegisterScreenView(DialogViewType.Screen, this);
            DialogUIManager.Instance.RegisterScreenView(DialogViewType.Task, TaskScreen);
@@ -53,6 +58,7 @@ namespace AibisDream.FixSystem

        private void OnDestroy()
        {
+            StorageSystem.Instance.UnregisterData<ScreenData>();
            FixSystemCenter.SystemDic.Unregister<ScreenSystem>();
            DialogUIManager.Instance.UnRegisterScreenView(DialogViewType.Screen);
            DialogUIManager.Instance.UnRegisterScreenView(DialogViewType.Task);
@@ -76,9 +82,10 @@ namespace AibisDream.FixSystem
            ShowTitle(string.Empty);
        }

-        public void ShowTaskPanel()
+        public void ShowTaskPanel(float duration = 1f)
        {
-            TaskScreen.transform.DOLocalMoveX(-7.12f, 1f);
+            TaskScreen.transform.DOLocalMoveX(-7.12f, duration);
+            _screenData.isTaskPanelShown = true;
        }

        #endregion
@@ -95,7 +102,7 @@ namespace AibisDream.FixSystem
            ShowTitle(token.lineInfo.character.GetActorName());
            // 显示文本
            TypewriterCore textItemTypewriter = AddText(token);
-            
+
            token.TextStart();

            // 强制更新布局
@@ -128,7 +135,7 @@ namespace AibisDream.FixSystem
            }
            _lineQueue.Enqueue(textItemTypewriter);

-            
+
            textItemTypewriter.SetTypewriterSpeed(GetTextSpeedValue());
            textItemTypewriter.onTextShowed.AddListener(() => OnTextShown(token, textItemTypewriter));
            textItemTypewriter.ShowText(token.lineInfo.lineText);
@@ -148,4 +155,20 @@ namespace AibisDream.FixSystem
            return _lineQueue.Select(x => x.GetComponent<TMP_Text>().textInfo.lineCount).Sum();
        }
    }
+    
+    public class ScreenData : IData
+    {
+        [JsonIgnore]        
+        public ScreenSystem screenSystem;
+        public bool isTaskPanelShown = false;
+
+        public IEnumerator Load()
+        {
+            if (isTaskPanelShown)
+            {
+                screenSystem.ShowTaskPanel(0);
+            }
+            yield break;
+        }
+    }
 }
@@ -39,9 +39,9 @@ namespace AibisDream
        }
        
        [YarnCommand("show_task_panel")]
-        public static void ShowTaskPanel()
+        public static void ShowTaskPanel(float duration = 1f)
        {
-            ScreenSystem.ShowTaskPanel();
+            ScreenSystem.ShowTaskPanel(duration);
        }
    }
 }
@@ -71,7 +71,7 @@ namespace AibisDream
            if (!ChapterData.unlockedChapterList.Contains(chapterSo.name))
            {
                ChapterData.unlockedChapterList.Add(chapterSo.name);
-                ChapterData.SaveUnloadChapters();
+                ChapterData.SaveUnlockChapters();
            }
        }
    }
@@ -110,11 +110,9 @@ namespace AibisDream
                : new List<string> { firstChapter.name };
        }

-        public void SaveUnloadChapters()
+        public void SaveUnlockChapters()
        {
-#if !UNITY_ANDROID || UNITY_EDITOR
            JsonUtil.SaveArray(unlockedChapterList.ToArray(), ConstRef.ChapterProgressPath);
-#endif
        }

        public bool TryGetSaveFilePath(out string saveFilePath)
@@ -42,7 +42,9 @@ namespace AibisDream
            //     CameraKit.Instance.uiCamera, out var worldPos);

            // 判断当前要用什么样的指针
-            // _cursor.rectTransform.position = Input.mousePosition;
+#if UNITY_EDITOR || !(UNITY_ANDROID || UNITY_IOS)
+            _cursor.rectTransform.position = Input.mousePosition;
+#endif

            var cursorState = CheckCursorState();
            _cursor.sprite = GetCursorSprite(cursorState);
@@ -13,6 +13,11 @@ namespace AibisDream
        public int Idx => 0;
        public event Action OnLineShown;

+        private void Awake()
+        {
+            gameObject.SetActive(false);
+        }
+
        private void OnEnable()
        {
            dialogText.onTextShowed.AddListener(InvokeLineShown);
@@ -37,8 +37,8 @@ HeartModule,C03UR型特配<br>涡轮增压动力模块,C03UR special turbocharge
 LungModule,MK1型<br>气体处理模块,MK1 type gas processing module,Screen,Aside,#E6A23C,,,
 LiverModule,MK1型<br>冷却液循环模块,MK1 type coolant circulation module,Screen,Aside,#E6A23C,,,
 DigestModule,MK1型<br>物料处理模块,MK1 type material processing module,Screen,Aside,#E6A23C,,,
-CenterText,,,CenterText,Aside,,,,
-CenterOption,,,CenterOption,Aside,,,,
+CenterText,,,CenterText,Center,,,,
+CenterOption,,,CenterOption,Center,,,,
 Task,,,Task,Aside,,,,
 TempText,,,Default,Aside,,,,
 gotash?,,,Default,MainActor,,,VO/voice_GTS_broken,
@@ -133,7 +133,7 @@ PlayerSettings:
  vulkanEnableLateAcquireNextImage: 0
  vulkanEnableCommandBufferRecycling: 1
  loadStoreDebugModeEnabled: 0
-  bundleVersion: 0.3.3.55-20251229-173624
+  bundleVersion: 0.3.3.58-20260112-155246
  preloadedAssets:
  - {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2}
  metroInputSource: 0
@@ -163,7 +163,7 @@ PlayerSettings:
    iPhone: 0
    tvOS: 0
  overrideDefaultApplicationIdentifier: 1
-  AndroidBundleVersionCode: 20
+  AndroidBundleVersionCode: 23
  AndroidMinSdkVersion: 22
  AndroidTargetSdkVersion: 0
  AndroidPreferredInstallLocation: 1