diff --git a/Assets/AddressableAssetsData/link.xml b/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index 39281ead7..000000000 --- a/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,538 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Assets/AddressableAssetsData/link.xml.meta b/Assets/AddressableAssetsData/link.xml.meta deleted file mode 100644 index 5d95df379..000000000 --- a/Assets/AddressableAssetsData/link.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c0f3ab3379eacf7409f8bd36cba6626e -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Language/Dialog/FP_Peipei1/FP_Peipei1 Shared Data.asset b/Assets/Language/Dialog/FP_Peipei1/FP_Peipei1 Shared Data.asset index 66febc6b5..101879f43 100644 --- a/Assets/Language/Dialog/FP_Peipei1/FP_Peipei1 Shared Data.asset +++ b/Assets/Language/Dialog/FP_Peipei1/FP_Peipei1 Shared Data.asset @@ -1982,107 +1982,6 @@ MonoBehaviour: m_Metadata: m_Items: - rid: 3071113040285663621 - - m_Id: 47240183152631808 - m_Key: line:bc8acdba - m_Metadata: - m_Items: - - rid: 8879661439621530012 - - m_Id: 47240183223934976 - m_Key: line:f7230c34 - m_Metadata: - m_Items: - - rid: 8879661439621530013 - - m_Id: 47240183223934977 - m_Key: line:61130b43 - m_Metadata: - m_Items: - - rid: 8879661439621530014 - - m_Id: 47240183223934978 - m_Key: line:849acc23 - m_Metadata: - m_Items: - - rid: 8879661439621530015 - - m_Id: 47240183223934979 - m_Key: line:12aacb54 - m_Metadata: - m_Items: - - rid: 8879661439621530016 - - m_Id: 47240183223934980 - m_Key: line:a8fbc2cd - m_Metadata: - m_Items: - - rid: 8879661439621530017 - - m_Id: 47240183223934981 - m_Key: line:3ecbc5ba - m_Metadata: - m_Items: - - rid: 8879661439621530018 - - m_Id: 47240183223934982 - m_Key: line:9d5ea124 - m_Metadata: - m_Items: - - rid: 8879661439621530019 - - m_Id: 47240183223934983 - m_Key: line:0b6ea653 - m_Metadata: - m_Items: - - rid: 8879661439621530020 - - m_Id: 47240183228129280 - m_Key: line:b13fafca - m_Metadata: - m_Items: - - rid: 8879661439621530021 - - m_Id: 47240183228129281 - m_Key: line:270fa8bd - m_Metadata: - m_Items: - - rid: 8879661439621530022 - - m_Id: 47240183228129282 - m_Key: line:b612172d - m_Metadata: - m_Items: - - rid: 8879661439621530023 - - m_Id: 47240183228129283 - m_Key: line:2022105a - m_Metadata: - m_Items: - - rid: 8879661439621530024 - - m_Id: 47240183228129284 - m_Key: line:47c9e108 - m_Metadata: - m_Items: - - rid: 8879661439621530025 - - m_Id: 47240183228129285 - m_Key: line:d1f9e67f - m_Metadata: - m_Items: - - rid: 8879661439621530026 - - m_Id: 47240183228129286 - m_Key: line:6ba8efe6 - m_Metadata: - m_Items: - - rid: 8879661439621530027 - - m_Id: 47240183228129287 - m_Key: line:fd98e891 - m_Metadata: - m_Items: - - rid: 8879661439621530028 - - m_Id: 47240183228129288 - m_Key: line:5e0d8c0f - m_Metadata: - m_Items: - - rid: 8879661439621530029 - - m_Id: 47240183228129289 - m_Key: line:c83d8b78 - m_Metadata: - m_Items: - - rid: 8879661439621530030 - - m_Id: 47240183228129290 - m_Key: line:040d784 - m_Metadata: - m_Items: - - rid: 8879661439621530031 - - rid: 3071113040285663622 m_Metadata: m_Items: - rid: 7917695935159992332 @@ -4051,11 +3950,6 @@ MonoBehaviour: data: nodeName: "\u8FDB\u5165\u7ED3\u675F\u5BF9\u8BDD" tags: [] - - rid: 3071113040285663622 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u7ED3\u675F\u5BF9\u8BDD" - tags: [] - rid: 7917695930343620636 type: {class: DistributedUIDGenerator, ns: UnityEngine.Localization.Tables, asm: Unity.Localization} data: @@ -4064,103 +3958,3 @@ MonoBehaviour: type: {class: Comment, ns: UnityEngine.Localization.Metadata, asm: Unity.Localization} data: m_CommentText: Comment Text - - rid: 8879661439621530012 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: End_memoryPaly - tags: [] - - rid: 8879661439621530013 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530014 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530015 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530016 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530017 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530018 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530019 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530020 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530021 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530022 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530023 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530024 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530025 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530026 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530027 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530028 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530029 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530030 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u5206\u67902" - tags: [] - - rid: 8879661439621530031 - type: {class: LineMetadata, ns: Yarn.Unity.UnityLocalization, asm: YarnSpinner.Unity} - data: - nodeName: "\u8FDB\u5165\u7ED3\u675F\u5BF9\u8BDD" - tags: [] diff --git a/Assets/Language/Dialog/FP_Peipei1/FP_Peipei1_zh-Hans.asset b/Assets/Language/Dialog/FP_Peipei1/FP_Peipei1_zh-Hans.asset index 9b32beec9..345793781 100644 --- a/Assets/Language/Dialog/FP_Peipei1/FP_Peipei1_zh-Hans.asset +++ b/Assets/Language/Dialog/FP_Peipei1/FP_Peipei1_zh-Hans.asset @@ -1595,10 +1595,6 @@ MonoBehaviour: m_Localized: "peipei: \u8981\u662F\u2026\u80FD\u6210\u4E3A\u4E00\u4E2A\u7F8E\u4EBA\u9C7C\u5C31\u597D\u4E86\u3002" m_Metadata: m_Items: [] - - m_Id: 47240183228129290 - m_Localized: - m_Metadata: - m_Items: [] references: version: 2 RefIds: [] diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index dd862013f..031cbdc36 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -8807,7 +8807,6 @@ GameObject: - component: {fileID: 519420033} - component: {fileID: 519420034} - component: {fileID: 519420035} - - component: {fileID: 519420036} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -8977,20 +8976,6 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] --- !u!114 &519420035 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 86c6556701af9e04380698b89f691b6e, type: 3} - m_Name: - m_EditorClassIdentifier: - nonRigidbodyVelocity: 0 - attenuationObject: {fileID: 0} ---- !u!114 &519420036 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index 826462647..892daf1d4 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -114,12 +114,12 @@ namespace AibisDream.FixSystem public IEnumerator Enter() { + // 切换相机 + yield return CameraKit.Instance.SwitchCamera(CameraEnum.Clinic); // 注册对话气泡 var clinicSystem = FixSystemCenter.SystemDic.Get(); var data = clinicSystem.bubbleSlotGroup.CollectData(); BubbleGroup.Instance.LoadBubbles(data); - // 切换相机 - yield return CameraKit.Instance.SwitchCamera(CameraEnum.Clinic); } public IEnumerator Exit() @@ -320,6 +320,7 @@ namespace AibisDream.FixSystem public IEnumerator Enter() { var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); + bodyModuleSystem.SwitchModuleGroup(ModuleState.Head); var eyeSystem = FixSystemCenter.SystemDic.Get(); // 先切BodyModule if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 999b94048..bcc3d01f9 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -58,12 +58,6 @@ namespace AibisDream.Framework _curCameraEnum = CameraEnum.Default; - foreach (var overlayCam in _orthoMainCamera.GetUniversalAdditionalCameraData().cameraStack) - { - overlayCam.UpdateCameraViewport(); - } - _orthoMainCamera.UpdateCameraViewport(); - // if (_orthoMainCamera && _perspectiveMainCamera) // { // // 默认激活正交相机，禁用透视相机 @@ -74,6 +68,15 @@ namespace AibisDream.Framework #region 相机信息注册 + public void UpdateCameraViewport() + { + foreach (var overlayCam in _orthoMainCamera.GetUniversalAdditionalCameraData().cameraStack) + { + overlayCam.UpdateCameraViewport(); + } + _orthoMainCamera.UpdateCameraViewport(); + } + public void RegisterUICamera(Camera overlayCamera) { // 获取 Main Camera 的 UniversalAdditionalCameraData diff --git a/Assets/Scripts/Game Loop/ChapterController.cs b/Assets/Scripts/Game Loop/ChapterController.cs index d249ad6d6..7d432d4f4 100644 --- a/Assets/Scripts/Game Loop/ChapterController.cs +++ b/Assets/Scripts/Game Loop/ChapterController.cs @@ -35,7 +35,7 @@ namespace AibisDream chapter = chapterSo.chapter, desc = chapterSo.description, pic = chapterSo.coverPic, - hasSaveFile = cacheChapter == chapterSo.chapter + hasSaveFile = cacheChapter == chapterSo.name }) .ToList(); diff --git a/Assets/Scripts/Game Loop/GameManager.cs b/Assets/Scripts/Game Loop/GameManager.cs index ae1c37d09..717ef6629 100644 --- a/Assets/Scripts/Game Loop/GameManager.cs +++ b/Assets/Scripts/Game Loop/GameManager.cs @@ -191,12 +191,15 @@ namespace AibisDream { case "FullScreen": Screen.SetResolution(Screen.currentResolution.width, Screen.currentResolution.height, FullScreenMode.FullScreenWindow); + CameraKit.Instance.UpdateCameraViewport(); break; case "Windowed": Screen.SetResolution(1920, 1080, FullScreenMode.Windowed); + CameraKit.Instance.UpdateCameraViewport(); break; case "MaximizedWindow": Screen.SetResolution(Screen.currentResolution.width, Screen.currentResolution.height, FullScreenMode.MaximizedWindow); + CameraKit.Instance.UpdateCameraViewport(); break; default: Debug.Log($"{windowMode} err"); @@ -235,7 +238,7 @@ namespace AibisDream public string GetSceneSoName() { - return _currentTalkSceneSo.Value.title; + return _currentTalkSceneSo.Value.name; } } diff --git a/Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs b/Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs index 980089eb8..3ae6dad3c 100644 --- a/Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs +++ b/Assets/Scripts/SceneManagement/ActorKit/ActorManager.cs @@ -4,9 +4,7 @@ using System.Collections.Generic; using System.Linq; using AibisDream.Framework; using AibisDream.Kit; -using Newtonsoft.Json; using UnityEngine; -using UnityEngine.Events; using Yarn.Unity; namespace AibisDream @@ -34,6 +32,7 @@ namespace AibisDream public override void OnSingletonDestroy() { + _actorSystemData.OnLoad -= OnDataLoad; StorageSystem.Instance.UnregisterData(); } @@ -76,12 +75,13 @@ namespace AibisDream // 注册数据 _actorSystemData = new ActorSystemData(); - _actorSystemData.onLoad.AddListener(OnDataLoad); + _actorSystemData.OnLoad += OnDataLoad; StorageSystem.Instance.RegisterData(_actorSystemData); } private void OnDataLoad(ActorSystemData data) { + Debug.Log("Actor Load"); foreach (var actorData in data.actorDataList) { InitActor(actorData); @@ -235,12 +235,12 @@ namespace AibisDream [Serializable] public class ActorSystemData : IData { - public List actorDataList = new(); - [JsonIgnore] public UnityEvent onLoad = new(); + public List actorDataList = new(); + public event Action OnLoad; public IEnumerator Load() { - onLoad?.Invoke(this); + OnLoad?.Invoke(this); yield break; } diff --git a/Assets/StreamingAssets/Config/chapter.json b/Assets/StreamingAssets/Config/chapter.json index dd94c4b96..0637a088a 100644 --- a/Assets/StreamingAssets/Config/chapter.json +++ b/Assets/StreamingAssets/Config/chapter.json @@ -1 +1 @@ -["Prologue","Day1_begin","PeipeiDay1","Day1_mid"] \ No newline at end of file +[] \ No newline at end of file diff --git a/Assets/StreamingAssets/Config/setting.json b/Assets/StreamingAssets/Config/setting.json index 466a58f63..aa27e8fda 100644 --- a/Assets/StreamingAssets/Config/setting.json +++ b/Assets/StreamingAssets/Config/setting.json @@ -1,5 +1,5 @@ { "Volume": "0.89", - "Language": "en", - "WindowMode": "Exclusive FullScreen" + "Language": "zh-Hans", + "WindowMode": "Windowed" } \ No newline at end of file diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 1f7069e4f..9078a9093 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -133,7 +133,7 @@ PlayerSettings: vulkanEnableLateAcquireNextImage: 0 vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 - bundleVersion: 0.3.2.8-20250902-042459 + bundleVersion: 0.3.2.11-20250902-153812 preloadedAssets: - {fileID: 11400000, guid: 0fb2bc2476953fc43a74f0ab8879077c, type: 2} metroInputSource: 0