From 8e5346da46cc4c034d2c20f76211b428718160a9 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Wed, 3 Jun 2026 19:57:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(fix-system):=20=E4=BF=AE=E5=A4=8D=E7=B3=BB?= =?UTF-8?q?=E7=BB=9F=E8=BF=81=E7=A7=BB=E5=88=B0=20DeepRepairDataRegistry?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scripts/FixSystem/PunchType/PunchTapeManager.cs | 5 +++-- Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs | 5 +++-- Assets/Scripts/FixSystemNew/BodyModule/Modules/ChipModule.cs | 3 ++- Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs | 3 ++- Assets/Scripts/FixSystemNew/FixSystemCenter.cs | 5 +++-- Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs | 5 +++-- 6 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Assets/Scripts/FixSystem/PunchType/PunchTapeManager.cs b/Assets/Scripts/FixSystem/PunchType/PunchTapeManager.cs index 6e09c85f0..5327f1d54 100644 --- a/Assets/Scripts/FixSystem/PunchType/PunchTapeManager.cs +++ b/Assets/Scripts/FixSystem/PunchType/PunchTapeManager.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using AibisDream.Kit; using UnityEngine; using AibisDream.Framework; +using AibisDream.SaveSystem; namespace AibisDream.FixSystem { @@ -28,7 +29,7 @@ namespace AibisDream.FixSystem public override void OnSingletonInit() { - StorageSystem.Instance.RegisterData(_collectionData); + DeepRepairDataRegistry.RegisterData(_collectionData); _collectionData.LoadEvent += OnCollectionDataLoaded; } @@ -131,7 +132,7 @@ namespace AibisDream.FixSystem } /// - /// 打孔带收藏列表的存档载体；由 注册到 。 + /// 打孔带收藏列表的存档载体；由 注册到 。 /// public class PunchTapeCollectionData : IData { diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs index 067cfd228..d1fa1a00c 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs @@ -7,6 +7,7 @@ using Cinemachine; using JetBrains.Annotations; using UnityEngine; using AibisDream.Kit; +using AibisDream.SaveSystem; namespace AibisDream.FixSystem { @@ -56,7 +57,7 @@ namespace AibisDream.FixSystem private void InitComponentRefs() { // 注册数据 - StorageSystem.Instance.RegisterData(_data); + DeepRepairDataRegistry.RegisterData(_data); // 处理内部索引 _bodyModuleGroup = transform.Find("Scalehandler")?.transform.Find("Body Module Group")?.gameObject; @@ -78,7 +79,7 @@ namespace AibisDream.FixSystem private void OnDestroy() { - StorageSystem.Instance.UnregisterData(); + DeepRepairDataRegistry.UnregisterData(); CameraKit.Instance.UnRegisterCamera(CameraEnum.BodyModuleCenter); } diff --git a/Assets/Scripts/FixSystemNew/BodyModule/Modules/ChipModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/Modules/ChipModule.cs index e031add1e..8707d70d9 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/Modules/ChipModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/Modules/ChipModule.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using UnityEngine; using AibisDream.Framework; using AibisDream; +using AibisDream.SaveSystem; using System; @@ -15,7 +16,7 @@ public class ChipModule : MonoBehaviour private void Awake() { // 将数据注册到数据容器内 - StorageSystem.Instance.RegisterData(_chipData); + DeepRepairDataRegistry.RegisterData(_chipData); // 添加加载逻辑 _chipData.LoadEvent += LoadData; _chipModule = transform.Find("Chip").gameObject; diff --git a/Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs index c80038434..a0889b118 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/Modules/UFModule.cs @@ -1,6 +1,7 @@ using UnityEngine; using AibisDream.Framework; using AibisDream; +using AibisDream.SaveSystem; using System; using System.Collections; @@ -17,7 +18,7 @@ public class UFModule : MonoBehaviour private void Awake() { // 将数据注册到数据容器内 - StorageSystem.Instance.RegisterData(_ufData); + DeepRepairDataRegistry.RegisterData(_ufData); // 添加加载逻辑 _ufData.LoadEvent += LoadData; _ufModule = transform.Find("Module Pic").gameObject; diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index 023a8dc07..ea94a7961 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -2,6 +2,7 @@ using System.Collections; using AibisDream.Framework; using AibisDream.Kit; +using AibisDream.SaveSystem; namespace AibisDream.FixSystem { @@ -20,13 +21,13 @@ namespace AibisDream.FixSystem StateMachine = new FixStateMachine(_data); StartCoroutine(StateMachine.Init(defaultState)); // 注册 - StorageSystem.Instance.RegisterData(_data); + DeepRepairDataRegistry.RegisterData(_data); } public override void OnSingletonDestroy() { // 注销 - StorageSystem.Instance.UnregisterData(); + DeepRepairDataRegistry.UnregisterData(); CameraKit.Instance.RemoveAllCam(); GameManager.Instance.StartCoroutine(StateMachine.QuitState()); SystemDic.Clear(); diff --git a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs index 3e01c9b1c..84a1bfc19 100644 --- a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs +++ b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs @@ -7,6 +7,7 @@ using Yarn.Unity; using System.Linq; using UnityEngine.UI; using AibisDream.FixSystem; +using AibisDream.SaveSystem; using Cinemachine; using AibisDream.Framework; using AibisDream.Kit; @@ -72,7 +73,7 @@ namespace AibisDream var virtualCamDeep = transform.Find("Eye DeepCamera").GetComponent(); CameraKit.Instance.RegisterCamera(CameraEnum.Eye, virtualCam); CameraKit.Instance.RegisterCamera(CameraEnum.EyeDeep, virtualCamDeep); - StorageSystem.Instance.RegisterData(_eyeData); + DeepRepairDataRegistry.RegisterData(_eyeData); // 添加加载逻辑 _eyeData.LoadEvent += LoadData; @@ -174,7 +175,7 @@ namespace AibisDream yield break; } - StorageSystem.Instance.SetValue("$currentEyeTarget", target.name); + YarnVariableStorage.Instance.SetValue("$currentEyeTarget", target.name); StartCoroutine(EyeEffectFadeOut()); cameraManager.MoveCameraTo(target.targetTransform ? target.targetTransform : target.transform, 1f);