From 04ff856ad1487efe0ede49c0b3ec0deca4271ebe Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Wed, 15 Jan 2025 16:17:31 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E9=87=8D=E6=9E=84=E8=A7=86=E8=A7=89?= =?UTF-8?q?=E7=9A=84=E7=A7=BB=E5=8A=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../FixSystem/Effect/MouseFollowEffect.cs | 174 +++--------------- 1 file changed, 28 insertions(+), 146 deletions(-) diff --git a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs index 8a8815dab..eb98c0eaa 100644 --- a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs +++ b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs @@ -3,40 +3,22 @@ using UnityEngine.UI; using DG.Tweening; using TMPro; using AibisDream; +using Cinemachine; public class MouseFollowAndZoom : MonoBehaviour { - public float parallaxEffectMultiplier = 0.1f; - public Vector2 maxOffset = new Vector2(2f, 2f); + public CinemachineVirtualCamera virtualCamera; public GameObject targetIndicator; // UI 目标框 public TMP_Text targetNameText; // 显示目标名称的文本 - public Button exitZoomButton; // 退出缩放的按钮 public float zoomInScale = 1.5f; // 缩放倍数 public float zoomDuration = 1.0f; // 缩放持续时间（减慢） public Vector2 sceneBoundsMin; // 场景边界的左下角 public Vector2 sceneBoundsMax; // 场景边界的右上角 - - public Camera viewCamera; - - //private Camera MainCamera; - private Vector3 initialPosition; - private Vector3 zoomedInPosition; // 保存缩放时的相机位置 - private bool isZoomedIn = false; private EyeSystem eyemanager; private EyeTarget currentTarget; // 当前目标 - - private float viewOffset = 40.3f; - private bool isActive = false; - private bool isLocked = false; -// 只读访问 - public bool GetMyPrivateVariable() - { - return isActive; - } - // 读写访问 public void SetIsActive(bool value) { @@ -51,7 +33,6 @@ public class MouseFollowAndZoom : MonoBehaviour void Start() { - initialPosition = transform.position; targetIndicator.SetActive(false); // 初始时隐藏目标框 eyemanager = FindObjectOfType(); if (eyemanager == null) @@ -78,41 +59,14 @@ public class MouseFollowAndZoom : MonoBehaviour void HandleMouseMovement() { - // 获取鼠标位置 - Vector3 mousePosition = Input.mousePosition; - Vector3 worldMousePosition = viewCamera.ScreenToWorldPoint(mousePosition); - worldMousePosition.z = 0; // 确保 z 为 0 - - // 计算目标偏移量并反向 - Vector3 targetOffset = (viewCamera.transform.position - worldMousePosition) * parallaxEffectMultiplier; - targetOffset.x = Mathf.Clamp(targetOffset.x, -maxOffset.x, maxOffset.x); - targetOffset.y = Mathf.Clamp(targetOffset.y, -maxOffset.y, maxOffset.y); - - // 平滑处理偏移量 - float smoothFactor = 0.01f; // 平滑系数，值越小平滑效果越强，响应越慢 - currentOffset = Vector3.Lerp(currentOffset, targetOffset, smoothFactor); - - // 计算目标位置 - Vector3 targetPosition = initialPosition + currentOffset; - - // 限制目标位置在场景边界范围内 - targetPosition.x = Mathf.Clamp(targetPosition.x, sceneBoundsMin.x, sceneBoundsMax.x); - targetPosition.y = Mathf.Clamp(targetPosition.y, sceneBoundsMin.y, sceneBoundsMax.y); - - // 使用插值（Lerp）平滑更新位置 - float followSpeed = 0.1f; // 跟随速度，值越小延迟越大 - Vector3 smoothedPosition = Vector3.Lerp(transform.position, targetPosition, followSpeed); - - // 应用平滑后的位置 - transform.position = smoothedPosition; + } void UpdateCurrentTarget() { // 获取鼠标位置 Vector3 mousePosition = Input.mousePosition; - mousePosition.x += viewOffset; // 添加偏移量 - Vector3 worldPosition = viewCamera.ScreenToWorldPoint(mousePosition); + Vector3 worldPosition = Camera.main.ScreenToWorldPoint(mousePosition); RaycastHit2D hit = Physics2D.Raycast(worldPosition, Vector2.zero); // 检查是否有目标 @@ -142,35 +96,35 @@ public class MouseFollowAndZoom : MonoBehaviour void HandleTargetIndicator() { - if (currentTarget == null) - { - targetIndicator.SetActive(false); // 隐藏指示器 - return; - } + // if (currentTarget == null) + // { + // targetIndicator.SetActive(false); // 隐藏指示器 + // return; + // } - // 获取目标的 BoxCollider2D - BoxCollider2D boxCollider = currentTarget.GetComponent(); - if (boxCollider != null) - { - Vector3 boxCenter = boxCollider.bounds.center; - Vector3 boxSize = boxCollider.bounds.size; + // // 获取目标的 BoxCollider2D + // BoxCollider2D boxCollider = currentTarget.GetComponent(); + // if (boxCollider != null) + // { + // Vector3 boxCenter = boxCollider.bounds.center; + // Vector3 boxSize = boxCollider.bounds.size; - // 转换为屏幕坐标 - Vector3 screenCenter = viewCamera.WorldToScreenPoint(boxCenter); - Vector2 screenSize = viewCamera.WorldToScreenPoint(boxCenter + boxSize) - - viewCamera.WorldToScreenPoint(boxCenter); + // // 转换为屏幕坐标 + // Vector3 screenCenter = viewCamera.WorldToScreenPoint(boxCenter); + // Vector2 screenSize = viewCamera.WorldToScreenPoint(boxCenter + boxSize) - + // viewCamera.WorldToScreenPoint(boxCenter); - // 设置目标框位置和大小 - RectTransform indicatorRectTransform = targetIndicator.GetComponent(); - indicatorRectTransform.position = screenCenter; - indicatorRectTransform.sizeDelta = screenSize; + // // 设置目标框位置和大小 + // RectTransform indicatorRectTransform = targetIndicator.GetComponent(); + // indicatorRectTransform.position = screenCenter; + // indicatorRectTransform.sizeDelta = screenSize; - // 设置目标名称 - targetNameText.text = currentTarget.name; + // // 设置目标名称 + // targetNameText.text = currentTarget.name; - // 显示指示器 - targetIndicator.SetActive(true); - } + // // 显示指示器 + // targetIndicator.SetActive(true); + // } } public void SetIndicatorTarget(EyeTarget target) @@ -178,78 +132,6 @@ public class MouseFollowAndZoom : MonoBehaviour currentTarget = target; } - - // void HandleTargetIndicator() - // { - // // 获取鼠标位置 - // Vector3 mousePosition = Input.mousePosition; - // mousePosition.x+=viewOffset; - // Vector3 worldPosition = viewCamera.ScreenToWorldPoint(mousePosition); - // //worldPosition.x+=viewOffset; - // RaycastHit2D hit = Physics2D.Raycast(worldPosition, Vector2.zero); - - // if(hit.collider!=null) - // { - // Debug.Log(hit.collider.gameObject.name); - // } - - - // if (hit.collider != null && hit.collider.CompareTag("EyeTarget")) // 检查是否是目标 Sprite - // { - // Debug.Log("find target"); - // targetIndicator.SetActive(true); - // BoxCollider2D boxCollider = hit.collider.GetComponent(); - - // if (boxCollider != null) - // { - // // 获取 BoxCollider2D 的大小和位置 - // Vector3 boxCenter = boxCollider.bounds.center; - // //boxCenter.x-=viewOffset; - // Vector3 boxSize = boxCollider.bounds.size; - - // //Vector3 boxCenterModify=new Vector3(boxCenter.x-viewOffset,boxCenter.y,boxCenter.z); - // Vector3 boxCenterModify=boxCenter; - - // // 转换为屏幕坐标 - // Vector3 screenCenter = viewCamera.WorldToScreenPoint(boxCenterModify); - // Vector2 screenSize = viewCamera.WorldToScreenPoint(boxCenterModify + boxSize) - viewCamera.WorldToScreenPoint(boxCenterModify); - - // // 设置目标框位置和大小 - // RectTransform indicatorRectTransform = targetIndicator.GetComponent(); - // indicatorRectTransform.position = screenCenter; - - // // 动画效果：先放大再缩小 - // //indicatorRectTransform.localScale = Vector3.one * 1.5f; - // //indicatorRectTransform.DOScale(Vector3.one, 0.2f).SetEase(Ease.OutBounce); - // indicatorRectTransform.sizeDelta = screenSize; - - // // 设置目标名称 - // targetNameText.text = hit.collider.name; - // } - - // //点击目标框触发缩放 - // if (Input.GetMouseButtonDown(0)) - // { - // Debug.Log("点击目标触发了"); - // EyeTarget target; - - // if (hit.collider != null && hit.collider.GetComponent() != null) - // { - // isInTargetProcessing = true; - // target = hit.collider.GetComponent(); - // eyemanager.SetTarget(target); - // } - // else - // { - // Debug.LogWarning("The collider does not have an EyeTarget component."); - // } - // } - // } - // else - // { - // targetIndicator.SetActive(false); - // } - // } void OnDrawGizmos() { // 设置 Gizmos 颜色 From be558878ce177726168cca43c7020ebc836f67c4 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Thu, 16 Jan 2025 11:45:37 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=9B=B8=E6=9C=BA=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E5=92=8C=E7=BB=B4=E4=BF=AE=E7=8A=B6=E6=80=81=E8=A7=A3=E7=BB=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Prototype/佩佩/Scripts/MemoryProcess.cs | 2 +- .../BodyModule/BodyModuleSystem.cs | 4 +- .../FixSystemNew/Clinic/ClinicSystem.cs | 4 +- .../CoolingMachine/CoolingSystem.cs | 4 +- .../Scripts/FixSystemNew/FixStateMachine.cs | 93 +++++++++---------- .../Scripts/Framework/OtherKit/CameraKit.cs | 38 +++++--- .../Scripts/MiniGame/Engine/EngineSystem.cs | 4 +- Assets/Scripts/MiniGame/Gear/GearSystem.cs | 4 +- .../Scripts/MiniGame/Peipei/Eye/EyeSystem.cs | 2 +- Assets/Scripts/MiniGame/Peipei/UF/UFSystem.cs | 2 +- 10 files changed, 83 insertions(+), 74 deletions(-) diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index 16bee8210..0dce64c3e 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -109,7 +109,7 @@ public class MemoryProcess : MonoBehaviour { FixSystemCenter.SystemDic.Register(this); var virtualCam = transform.Find("Memory Camera").GetComponent(); - CameraKit.Instance.RegisterCamera(FixState.Memory, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.Memory, virtualCam); } diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs index 80a6ca83e..2f76b5d1c 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs @@ -67,12 +67,12 @@ namespace AibisDream.FixSystem // 注册Camera var virtualCam = transform.GetComponentInChildren(); - CameraKit.Instance.RegisterCamera(FixState.BodyModule, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.BodyModule, virtualCam); } private void OnDestroy() { - CameraKit.Instance.UnRegisterCamera(FixState.BodyModule); + CameraKit.Instance.UnRegisterCamera(CameraEnum.BodyModule); } /// diff --git a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs index b3527cc60..85fb64cd9 100644 --- a/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs +++ b/Assets/Scripts/FixSystemNew/Clinic/ClinicSystem.cs @@ -36,7 +36,7 @@ namespace AibisDream // 注册Camera var virtualCam = transform.Find("Clinic Camera").GetComponent(); - CameraKit.Instance.RegisterCamera(FixState.Clinic, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.Clinic, virtualCam); } private void LoadData(ClinicData data) @@ -98,7 +98,7 @@ namespace AibisDream _clinicData.LoadEvent -= LoadData; GameLoopManager.FixDataContainer.Unregister(); FixSystemCenter.SystemDic.Unregister(); - CameraKit.Instance.UnRegisterCamera(FixState.Clinic); + CameraKit.Instance.UnRegisterCamera(CameraEnum.Clinic); } private void OnCharacterChange(CharacterData characterData) diff --git a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs index 3a5b22d30..93e917798 100644 --- a/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs +++ b/Assets/Scripts/FixSystemNew/CoolingMachine/CoolingSystem.cs @@ -31,7 +31,7 @@ namespace AibisDream.Framework // 注册相机 var virtualCam = transform.Find("Cooling Camera").GetComponent(); - CameraKit.Instance.RegisterCamera(FixState.CoolingMachine, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.CoolingMachine, virtualCam); } private void InitRefs() @@ -45,7 +45,7 @@ namespace AibisDream.Framework private void OnDestroy() { - CameraKit.Instance.UnRegisterCamera(FixState.CoolingMachine); + CameraKit.Instance.UnRegisterCamera(CameraEnum.CoolingMachine); } #region 对外开放 diff --git a/Assets/Scripts/FixSystemNew/FixStateMachine.cs b/Assets/Scripts/FixSystemNew/FixStateMachine.cs index e73b8b9c0..b6bce361b 100644 --- a/Assets/Scripts/FixSystemNew/FixStateMachine.cs +++ b/Assets/Scripts/FixSystemNew/FixStateMachine.cs @@ -1,5 +1,4 @@ -using System; -using System.Collections; +using System.Collections; using AibisDream.Framework; using UnityEngine; @@ -8,16 +7,16 @@ namespace AibisDream.FixSystem public class FixStateMachine { public FixState CurState => _curState.GetState; - + private IState _curState; private string _curArgs; public IEnumerator SwitchState(FixState nextState, string args = "") { _curArgs = args; - + yield return _curState?.Exit(); - + GameLoopManager.Instance?.UpdateFixState(nextState, _curArgs); _curState = CreateState(nextState, _curArgs); yield return _curState.Enter(); @@ -45,12 +44,12 @@ namespace AibisDream.FixSystem FixState.Gear => new GearState(), _ => new ClinicState() }; - + res.SetArgs(args); return res; } } - + public enum FixState { Default, @@ -84,7 +83,7 @@ namespace AibisDream.FixSystem public IEnumerator Enter() { // 切换相机 - yield return CameraKit.Instance.SwitchCamera(FixState.Clinic); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.Clinic); } public IEnumerator Exit() @@ -97,7 +96,7 @@ namespace AibisDream.FixSystem public struct BodyModuleState : IState { public FixState GetState => FixState.BodyModule; - + public void SetArgs(string args) { // 无 @@ -109,7 +108,7 @@ namespace AibisDream.FixSystem // 拔出插头 bodyModuleSystem.ResetPlug(); // 切换相机 - yield return CameraKit.Instance.SwitchCamera(FixState.BodyModule); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); } public IEnumerator Exit() @@ -124,9 +123,9 @@ namespace AibisDream.FixSystem public struct GearState : IState { public FixState GetState => FixState.Gear; - + private string _configKey; - + public void SetArgs(string args) { _configKey = args; @@ -135,14 +134,15 @@ namespace AibisDream.FixSystem public IEnumerator Enter() { // 先切BodyModule - if (!CameraKit.Instance.EqualToCameraState(FixState.BodyModule)) + if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) { yield return MainUIController.Instance?.FadeInSync(0.5f); - yield return CameraKit.Instance.SwitchCamera(FixState.BodyModule); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); yield return MainUIController.Instance?.FadeOutSync(0.5f); } + // 切换相机 - yield return CameraKit.Instance.SwitchCamera(FixState.Gear); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.Gear); // 加载关卡数据 if (!string.IsNullOrEmpty(_configKey)) { @@ -161,7 +161,7 @@ namespace AibisDream.FixSystem public struct EngineState : IState { public FixState GetState => FixState.Engine; - + public void SetArgs(string args) { // 无 @@ -170,14 +170,15 @@ namespace AibisDream.FixSystem public IEnumerator Enter() { // 先切BodyModule - if (!CameraKit.Instance.EqualToCameraState(FixState.BodyModule)) + if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) { //yield return MainUIController.Instance?.FadeInSync(0.5f); - yield return CameraKit.Instance.SwitchCamera(FixState.BodyModule); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); //yield return MainUIController.Instance?.FadeOutSync(0.5f); } + // 切换相机 - yield return CameraKit.Instance.SwitchCamera(FixState.Engine); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.Engine); } public IEnumerator Exit() @@ -191,7 +192,7 @@ namespace AibisDream.FixSystem public struct CoolingMachineState : IState { private bool _playLink; - + public FixState GetState => FixState.CoolingMachine; public void SetArgs(string args) @@ -203,8 +204,8 @@ namespace AibisDream.FixSystem { var coolingSystem = FixSystemCenter.SystemDic.Get(); // 切相机 - yield return CameraKit.Instance.SwitchCamera(FixState.CoolingMachine); - + yield return CameraKit.Instance.SwitchCamera(CameraEnum.CoolingMachine); + // 打开泵机 coolingSystem.gameObject.SetActive(true); yield return coolingSystem.OpenCoolingSystem(); @@ -228,34 +229,31 @@ namespace AibisDream.FixSystem public struct UfState : IState { public FixState GetState => FixState.UF; - + public void SetArgs(string args) { - } public IEnumerator Enter() - { + { float duration = 0.5f; var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); var UFSystem = FixSystemCenter.SystemDic.Get(); // 先切BodyModule - if (!CameraKit.Instance.EqualToCameraState(FixState.BodyModule)) + if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) { yield return MainUIController.Instance?.FadeInSync(0.5f); - yield return CameraKit.Instance.SwitchCamera(FixState.BodyModule); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); yield return MainUIController.Instance?.FadeOutSync(0.5f); } - + // 插头回到初始插孔 bodyModuleSystem.ResetPlug(); // 切换相机 - yield return CameraKit.Instance.SwitchCamera(FixState.UF); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.UF); yield return MainUIController.Instance.FadeInSync(duration); UFSystem.OpenUFView(); yield return MainUIController.Instance.FadeOutSync(duration); - - } public IEnumerator Exit() @@ -269,36 +267,35 @@ namespace AibisDream.FixSystem public struct EyeState : IState { public FixState GetState => FixState.Eye; - + public void SetArgs(string args) { - } - + public IEnumerator Enter() - { + { float duration = 0.5f; var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); var eyeSystem = FixSystemCenter.SystemDic.Get(); // 先切BodyModule - if (!CameraKit.Instance.EqualToCameraState(FixState.BodyModule)) + if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) { yield return MainUIController.Instance?.FadeInSync(0.5f); - yield return CameraKit.Instance.SwitchCamera(FixState.BodyModule); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); yield return MainUIController.Instance?.FadeOutSync(0.5f); } + //打开盖子 - bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Module Pic").GetComponent().sprite=Resources.Load("Art/Fix/Peipei/视觉盖子打开"); + bodyModuleSystem.FindBodyModuleByName("Eye").transform.Find("Module Pic").GetComponent() + .sprite = Resources.Load("Art/Fix/Peipei/视觉盖子打开"); // 插头回到初始插孔 bodyModuleSystem.ResetPlug(); // 切换相机 - yield return CameraKit.Instance.SwitchCamera(FixState.Eye); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.Eye); yield return MainUIController.Instance.FadeInSync(duration); eyeSystem.OnEnter(); yield return MainUIController.Instance.FadeOutSync(duration); - - } public IEnumerator Exit() @@ -312,10 +309,9 @@ namespace AibisDream.FixSystem public struct MemoryState : IState { public FixState GetState => FixState.Memory; - + public void SetArgs(string args) { - } public IEnumerator Enter() @@ -323,18 +319,19 @@ namespace AibisDream.FixSystem float duration = 0.5f; var bodyModuleSystem = FixSystemCenter.SystemDic.Get(); var memorySystem = FixSystemCenter.SystemDic.Get(); - // 先切BodyModule - if (!CameraKit.Instance.EqualToCameraState(FixState.BodyModule)) + // 先切BodyModule + if (!CameraKit.Instance.EqualToCameraState(CameraEnum.BodyModule)) { yield return MainUIController.Instance?.FadeInSync(0.5f); - yield return CameraKit.Instance.SwitchCamera(FixState.BodyModule); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.BodyModule); yield return MainUIController.Instance?.FadeOutSync(0.5f); } + yield return memorySystem.DropMemoryProjector(); - // 插头回到初始插孔 + // 插头回到初始插孔 bodyModuleSystem.ResetPlug(); // 相机聚焦到目标位 - yield return CameraKit.Instance.SwitchCamera(FixState.Memory); + yield return CameraKit.Instance.SwitchCamera(CameraEnum.Memory); yield return MainUIController.Instance.FadeInSync(duration); memorySystem.OnEnter(); yield return MainUIController.Instance.FadeOutSync(duration); diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index c0123ec14..1fee39dc4 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -1,7 +1,6 @@ using System; using System.Collections; using System.Collections.Generic; -using AibisDream.FixSystem; using AibisDream.Kit; using Cinemachine; using DG.Tweening; @@ -21,10 +20,10 @@ namespace AibisDream.Framework #region 相机组件 private CinemachineBrain _cameraBrain; - private readonly Dictionary _virtualCameraDict = new(); - private readonly Dictionary _camInitStateDict = new(); + private readonly Dictionary _virtualCameraDict = new(); + private readonly Dictionary _camInitStateDict = new(); - private FixState _curFixState; + private CameraEnum _curCameraEnum; private CamState _curInitState; public Camera uiCamera; @@ -43,7 +42,7 @@ namespace AibisDream.Framework public override void OnSingletonInit() { _cameraBrain = Camera.main?.GetComponent(); - _curFixState = FixState.Default; + _curCameraEnum = CameraEnum.Default; // 获取UICamera if (Camera.main && Camera.main.TryGetComponent(out var cameraData)) @@ -77,7 +76,7 @@ namespace AibisDream.Framework } } - public void RegisterCamera(FixState camType, ICinemachineCamera virtualCamera) + public void RegisterCamera(CameraEnum camType, ICinemachineCamera virtualCamera) { _virtualCameraDict[camType] = virtualCamera; @@ -90,7 +89,7 @@ namespace AibisDream.Framework _camInitStateDict[camType] = initState; } - public void UnRegisterCamera(FixState camType, ICinemachineCamera virtualCamera) + public void UnRegisterCamera(CameraEnum camType, ICinemachineCamera virtualCamera) { if (!_virtualCameraDict.TryGetValue(camType, out var curCam)) return; @@ -101,7 +100,7 @@ namespace AibisDream.Framework } } - public void UnRegisterCamera(FixState camType) + public void UnRegisterCamera(CameraEnum camType) { _virtualCameraDict.Remove(camType); _camInitStateDict.Remove(camType); @@ -120,18 +119,18 @@ namespace AibisDream.Framework /// /// /// 是就不用切相机 - public bool EqualToCameraState(FixState targetCameraState) + public bool EqualToCameraState(CameraEnum targetCameraState) { - return _curFixState == targetCameraState; + return _curCameraEnum == targetCameraState; } /// /// 切换相机 /// /// - public IEnumerator SwitchCamera(FixState camType) + public IEnumerator SwitchCamera(CameraEnum camType) { - if (_curFixState == camType) + if (_curCameraEnum == camType) { yield break; } @@ -249,7 +248,7 @@ namespace AibisDream.Framework public static IEnumerator SwitchCamera(string targetStateStr) { // 字符串转枚举 - if (!Enum.TryParse(targetStateStr, out var targetState)) + if (!Enum.TryParse(targetStateStr, out var targetState)) { Debug.Log($"{targetStateStr}不在FixState枚举中"); yield break; @@ -258,4 +257,17 @@ namespace AibisDream.Framework yield return CameraKit.Instance.SwitchCamera(targetState); } } + + public enum CameraEnum + { + Default, + Clinic, + CoolingMachine, + BodyModule, + Memory, + Eye, + UF, + Engine, + Gear + } } \ No newline at end of file diff --git a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs index cf1b60aaf..6ae28ea7e 100644 --- a/Assets/Scripts/MiniGame/Engine/EngineSystem.cs +++ b/Assets/Scripts/MiniGame/Engine/EngineSystem.cs @@ -39,7 +39,7 @@ namespace AibisDream // 注册相机 var virtualCam = transform.Find("Engine Camera").GetComponentInChildren(); - CameraKit.Instance.RegisterCamera(FixState.Engine, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.Engine, virtualCam); } private void Start() @@ -59,7 +59,7 @@ namespace AibisDream private void OnDestroy() { - CameraKit.Instance.UnRegisterCamera(FixState.Engine); + CameraKit.Instance.UnRegisterCamera(CameraEnum.Engine); } private void Update() diff --git a/Assets/Scripts/MiniGame/Gear/GearSystem.cs b/Assets/Scripts/MiniGame/Gear/GearSystem.cs index 10890bc12..0cee1ca9a 100644 --- a/Assets/Scripts/MiniGame/Gear/GearSystem.cs +++ b/Assets/Scripts/MiniGame/Gear/GearSystem.cs @@ -56,7 +56,7 @@ namespace AibisDream // 注册相机 var virtualCam = transform.Find("Gear Camera").GetComponent(); - CameraKit.Instance.RegisterCamera(FixState.Gear, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.Gear, virtualCam); } private void Start() @@ -71,7 +71,7 @@ namespace AibisDream private void OnDestroy() { - CameraKit.Instance.UnRegisterCamera(FixState.Gear); + CameraKit.Instance.UnRegisterCamera(CameraEnum.Gear); } #endregion diff --git a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs index 8b1fc6a5e..eb4c972e7 100644 --- a/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs +++ b/Assets/Scripts/MiniGame/Peipei/Eye/EyeSystem.cs @@ -35,7 +35,7 @@ public class EyeSystem : MonoBehaviour { FixSystemCenter.SystemDic.Register(this); var virtualCam = transform.Find("Eye Camera").GetComponent(); - CameraKit.Instance.RegisterCamera(FixState.Eye, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.Eye, virtualCam); GameLoopManager.FixDataContainer.Register(_eyeData); // 添加加载逻辑 _eyeData.LoadEvent += LoadData; diff --git a/Assets/Scripts/MiniGame/Peipei/UF/UFSystem.cs b/Assets/Scripts/MiniGame/Peipei/UF/UFSystem.cs index 2171475a3..6366d63d4 100644 --- a/Assets/Scripts/MiniGame/Peipei/UF/UFSystem.cs +++ b/Assets/Scripts/MiniGame/Peipei/UF/UFSystem.cs @@ -17,7 +17,7 @@ public class UFSystem : MonoBehaviour { FixSystemCenter.SystemDic.Register(this); var virtualCam = transform.Find("UF Camera").GetComponent(); - CameraKit.Instance.RegisterCamera(FixState.UF, virtualCam); + CameraKit.Instance.RegisterCamera(CameraEnum.UF, virtualCam); } public void OpenUFView() From e3766066607ebf3032d8fb1088baff6d62cce50b Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Thu, 16 Jan 2025 18:03:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BD=A9=E4=BD=A9Day1=E5=92=8Cday2?= =?UTF-8?q?=E7=9A=84yarn=E9=87=8D=E6=9E=84=E5=AE=8C=E6=88=90=EF=BC=8C?= =?UTF-8?q?=E4=BD=86=E6=98=AF=E6=B7=B1=E5=85=A5=E9=83=A8=E5=88=86=E9=9C=80?= =?UTF-8?q?=E8=A6=81=E7=BC=96=E8=BE=91=E5=99=A8=E9=87=8D=E6=9E=84=E4=B8=BA?= =?UTF-8?q?sprite?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Materials/EyeMaterials/plantColor.mat | 2 +- Assets/Resources/SceneSO/PeipeiDay2.asset | 2 +- .../Yarn/PeipeiTalk1/视觉色彩检查.yarn | 34 --- Assets/Resources/Yarn/PeipeiTalk2.meta | 8 + .../Resources/Yarn/PeipeiTalk2/EventNode.yarn | 133 ++++++++++ .../EventNode.yarn.meta} | 2 +- .../Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject | 12 + .../PeipeiTalk2/PeipeiTalk2.yarnproject.meta | 13 + Assets/Resources/Yarn/PeipeiTalk2/Start.yarn | 131 ++++++++++ .../Yarn/PeipeiTalk2/Start.yarn.meta | 10 + Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn | 34 +++ .../Yarn/PeipeiTalk2/UF拆壳.yarn.meta | 10 + Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn | 19 ++ .../Yarn/PeipeiTalk2/UF拆除.yarn.meta | 10 + Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn | 23 ++ .../Yarn/PeipeiTalk2/UF检查.yarn.meta | 10 + .../Yarn/PeipeiTalk2/佩佩开场对话.yarn | 34 +++ .../Yarn/PeipeiTalk2/佩佩开场对话.yarn.meta | 10 + .../Resources/Yarn/PeipeiTalk2/停止想象.yarn | 38 +++ .../Yarn/PeipeiTalk2/停止想象.yarn.meta | 10 + Assets/Resources/Yarn/PeipeiTalk2/分析.yarn | 18 ++ .../Resources/Yarn/PeipeiTalk2/分析.yarn.meta | 10 + Assets/Resources/Yarn/PeipeiTalk2/手术.yarn | 153 +++++++++++ .../Resources/Yarn/PeipeiTalk2/手术.yarn.meta | 10 + .../Resources/Yarn/PeipeiTalk2/术前谈话.yarn | 19 ++ .../Yarn/PeipeiTalk2/术前谈话.yarn.meta | 10 + .../Resources/Yarn/PeipeiTalk2/术前谈话2.yarn | 224 ++++++++++++++++ .../Yarn/PeipeiTalk2/术前谈话2.yarn.meta | 10 + .../Yarn/PeipeiTalk2/第一次发热.yarn | 57 +++++ .../Yarn/PeipeiTalk2/第一次发热.yarn.meta | 10 + .../Resources/Yarn/PeipeiTalk2/结束对话.yarn | 18 ++ .../Yarn/PeipeiTalk2/结束对话.yarn.meta | 10 + .../Resources/Yarn/PeipeiTalk2/身体检查.yarn | 239 ++++++++++++++++++ .../Yarn/PeipeiTalk2/身体检查.yarn.meta | 10 + Assets/Scenes/PeipeiFixScene.unity | 13 +- Assets/Scenes/Persistence.unity | 8 +- .../FixSystemNew/BodyModule/BodyModule.cs | 4 +- .../TestSaveFiles/PeipeiDay2_UF拆壳.json | 69 +++++ .../TestSaveFiles/PeipeiDay2_UF拆壳.json.meta | 7 + .../TestSaveFiles/PeipeiDay2_UF拆除.json | 69 +++++ .../TestSaveFiles/PeipeiDay2_UF拆除.json.meta | 7 + .../TestSaveFiles/PeipeiDay2_UF检查.json | 69 +++++ .../TestSaveFiles/PeipeiDay2_UF检查.json.meta | 7 + .../TestSaveFiles/PeipeiDay2_停止想象.json | 69 +++++ .../PeipeiDay2_停止想象.json.meta | 7 + .../TestSaveFiles/PeipeiDay2_分析.json | 69 +++++ .../TestSaveFiles/PeipeiDay2_分析.json.meta | 7 + .../TestSaveFiles/PeipeiDay2_开场对话.json | 61 +++++ .../PeipeiDay2_开场对话.json.meta | 7 + .../PeipeiDay2_手术_安装晶圆.json | 69 +++++ .../PeipeiDay2_手术_安装晶圆.json.meta | 7 + .../TestSaveFiles/PeipeiDay2_术前谈话.json | 69 +++++ .../PeipeiDay2_术前谈话.json.meta | 7 + .../TestSaveFiles/PeipeiDay2_术前谈话2.json | 69 +++++ .../PeipeiDay2_术前谈话2.json.meta | 7 + .../TestSaveFiles/PeipeiDay2_第一次发热.json | 61 +++++ .../PeipeiDay2_第一次发热.json.meta | 7 + .../TestSaveFiles/PeipeiDay2_身体检查.json | 69 +++++ .../PeipeiDay2_身体检查.json.meta | 7 + 59 files changed, 2137 insertions(+), 51 deletions(-) delete mode 100644 Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn rename Assets/Resources/Yarn/{PeipeiTalk1/视觉色彩检查.yarn.meta => PeipeiTalk2/EventNode.yarn.meta} (86%) create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/Start.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/Start.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/分析.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/分析.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/手术.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/手术.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn.meta create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn create mode 100644 Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆壳.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆壳.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆除.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆除.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF检查.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF检查.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_停止想象.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_停止想象.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_分析.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_分析.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_开场对话.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_开场对话.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_手术_安装晶圆.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_手术_安装晶圆.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话2.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话2.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_第一次发热.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_第一次发热.json.meta create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_身体检查.json create mode 100644 Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_身体检查.json.meta diff --git a/Assets/Resources/Materials/EyeMaterials/plantColor.mat b/Assets/Resources/Materials/EyeMaterials/plantColor.mat index 45ba84a8b..fa3122103 100644 --- a/Assets/Resources/Materials/EyeMaterials/plantColor.mat +++ b/Assets/Resources/Materials/EyeMaterials/plantColor.mat @@ -317,7 +317,7 @@ Material: - _PixelOutlineWidth: 1 - _PixelPerfectSpace: 0 - _PixelPerfectUV: 0 - - _PixelateFade: 1 + - _PixelateFade: 0 - _PixelatePixelDensity: 16 - _PixelatePixelsPerUnit: 100 - _PixelsPerUnit: 100 diff --git a/Assets/Resources/SceneSO/PeipeiDay2.asset b/Assets/Resources/SceneSO/PeipeiDay2.asset index 2cfb1d283..cfed2d437 100644 --- a/Assets/Resources/SceneSO/PeipeiDay2.asset +++ b/Assets/Resources/SceneSO/PeipeiDay2.asset @@ -13,6 +13,6 @@ MonoBehaviour: m_Name: PeipeiDay2 m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - yarnProject: {fileID: 7545569452688597077, guid: 19dc59fe9ecc8f44f872c71f37f1a819, type: 3} + yarnProject: {fileID: 7545569452688597077, guid: f818bb1d46f667144a82c85c1d52671a, type: 3} firstSceneName: PeipeiFixScene isEndOfDay: 1 diff --git a/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn b/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn deleted file mode 100644 index 1e43ca1fe..000000000 --- a/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn +++ /dev/null @@ -1,34 +0,0 @@ - -title: 视觉收集色彩信息目标检查 -tags: -colorID: 3 -group:视觉检查 -position: 251,1116 ---- -<> - <> - me: 佩佩在看东西的时候，能够唤起记忆来填补失去的颜色…… - me: UF的绘图错误也是因为唤起了不该唤起的记忆 - me: 说不定…… - me: 先去记忆模块看看刚才佩佩都想到了什么吧 - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - -<> - <> -<> -=== -title: 结束视觉色彩检查 -position: 275,-222 ---- -<> -<> -=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2.meta b/Assets/Resources/Yarn/PeipeiTalk2.meta new file mode 100644 index 000000000..e3e786fb9 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7cdca0a34cec63744a525dff99cdce85 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn b/Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn new file mode 100644 index 000000000..1c50181e9 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn @@ -0,0 +1,133 @@ +title: 系统发热 +tags: 待编辑 +colorID: 8 +position: 240,-2640 +--- +<> +=== +title: 降温成功 +tags: +colorID: 6 +position: 1332,-1465 +--- +//TODO-等发热检测和降温拆开之后，这里改为仅用作降温完毕的对话 +<> + <> +<> + //<> + <> +<> +=== +title: 降温失败 +tags: +colorID: 6 +position: 1697,-1468 +--- +<> +=== +title: EmoPlugIn +tags: 待编辑 +colorID: 8 +position: -2,-3039 +--- +<> +<> +<> +<> +=== +title: SpeakPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2640 +--- +<> +<> +<> +<> + +=== + +title: LogicPlugIn +tags: 待编辑 +colorID: 8 +position: 480,-3040 +--- +<> +<> +<> +<> +=== +title: ColorPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-2840 +--- +<> +<> +<> +<> +=== +title: MemoryPlugIn +tags: 待编辑 +colorID: 8 +position: 240,-3040 +--- +<> +<> +<> +<> +=== + +title: UFPlugIn +tags: 待编辑 +colorID: 8 +position: 0,-2840 +--- +<> +<> +<> +<> +=== + + +title: EyePlugIn +tags: 待编辑 +colorID: 8 +position: 480,-2840 +--- +<> +<> +<> +<> +<> +<> +=== +title: IntoEyeView +tags: +group:视觉检查 +colorID: 6 +position: 244,271 +--- +<> +<> +=== + +title: UFDeepIn +tags: +--- +<> + <> +<> + <> +<> + <> +<> +=== +title: EyeDeepIn +tags: +position: -9,21 +--- +<> +<> +=== + diff --git a/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn.meta similarity index 86% rename from Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn.meta rename to Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn.meta index 027fca8d2..db06c66e9 100644 --- a/Assets/Resources/Yarn/PeipeiTalk1/视觉色彩检查.yarn.meta +++ b/Assets/Resources/Yarn/PeipeiTalk2/EventNode.yarn.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 979edc8be2e910941b175195fa54c565 +guid: f8677fe3e569c6b4e966995884946ac1 ScriptedImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject b/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject new file mode 100644 index 000000000..016b7ab29 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject @@ -0,0 +1,12 @@ +{ + "projectFileVersion": 2, + "sourceFiles": [ + "*.yarn" + ], + "excludeFiles": [ + "**/*~/*" + ], + "localisation": {}, + "baseLanguage": "zh-CHS", + "compilerOptions": {} +} \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject.meta b/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject.meta new file mode 100644 index 000000000..f80ede258 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/PeipeiTalk2.yarnproject.meta @@ -0,0 +1,13 @@ +fileFormatVersion: 2 +guid: f818bb1d46f667144a82c85c1d52671a +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 053561912b1654d80a424bb0696a74ae, type: 3} + useAddressableAssets: 0 + UseUnityLocalisationSystem: 0 + unityLocalisationStringTableCollection: {instanceID: 0} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/Start.yarn b/Assets/Resources/Yarn/PeipeiTalk2/Start.yarn new file mode 100644 index 000000000..4483f356e --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/Start.yarn @@ -0,0 +1,131 @@ +title: Start +tags: +colorID: 8 +position: 253,-2041 +--- + +<> +=== + +title: 数据初始化 +tags: +colorID: 4 +position: 248,-1739 +--- +<> + +//记录是否已经完成了UF的检查 +<> + +//记录是否已经完成了视觉的检查 +<> + +//用来进入发烧的计时器，=0时就会发烧（TODO讨论下发烧的逻辑，感觉现在比较生硬） +<> + +//是否已经知道当前佩佩在发热(TODO插线报错的时候看到报错信息就会设成true,完成降温会设回0，不过怎么传true?) +<> + +//记录玩家的选择: 是否选择了记忆初始化 +<> + +//统计进入视觉后触发目标的次数，主要是用来触发第一次点击任意目标触发首次对话，以及判断是否收集够打孔带，这是完成主目标的必要目标 +<> +//方便的触发针对eyetarget的对话，如果不喜欢这种写法可以商量，然后分开写 +<> + +//统计进入视觉后触发目标的次数，主要是用来触发第一次点击任意目标触发首次对话，以及判断是否收集够打孔带，这是完成主目标的必要目标 +<> + +//佩佩记忆手动初始化进度 +<> +<> +<> +//你们最开始生成了哪副画共有 1，2，3三种情况 +<> + + +///【谈论对象初始化】 +<> +<> +<> +<> +<> +<> +<> + + +///【剧情信息】 +//是否知道发烧 +<> +//发烧的进度 +<> +//抑制想象的进度 +<> +//是否已经看到奇怪视觉颜色 +<> +//过热时已经尝试继续检查了几次；TODO-报错信息每弹出一次这里就+1 +<> + +<> + + +//插线 +<> +<> +<> +<> + +///一些状态初始化 + +<> +<> +=== + +title: Center +description: 脚本跳转中心，GameStage在此处处理，理论上不在其他地方读取GameStage +position: 205,446 +colorID: 1 +--- +// 每次进入维修界面就自动保存 +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/Start.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/Start.yarn.meta new file mode 100644 index 000000000..f665f8528 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/Start.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: e3d559d8f5cf1274fbc04e9ae5214532 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn b/Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn new file mode 100644 index 000000000..a5e027440 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn @@ -0,0 +1,34 @@ +title: 进入UF拆壳 +tags: +position: 43,-97 +--- +me:发热的就是UF，如果想解决这个问题，必须深入UF看一看 +me: 想搞清楚这一切，只有拆开拆开UF，破除安保系统了 +->拆开UF + 管不了那么多了…来吧。 + <> + <> + <> + <> + <> + <> + <> + me: 啊，这是…… + <> + me: 色觉晶圆？怎么会在这里…… + me: 好吧，一会儿再来研究这件事…… + me: 我得去破坏安保模块的线路 + ->破坏安保线路 + <> + <> + <> + me: 好了，现在应该可以访问UF了 + <> + <> +=== +title: 结束UF拆壳 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn.meta new file mode 100644 index 000000000..b4cf6ab3c --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/UF拆壳.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 8d2294dfef53e48479c8d085a09ecb09 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn b/Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn new file mode 100644 index 000000000..2f233d379 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn @@ -0,0 +1,19 @@ + +title: 进入UF拆除 +tags: +position: 43,-97 +--- +->拆除UF + <> + <> + <> + <> + <> + <> +=== +title: 结束UF拆除 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn.meta new file mode 100644 index 000000000..dc40e0adc --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/UF拆除.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 2c572be7d63cc5244b91b2f0fd1db6c3 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn b/Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn new file mode 100644 index 000000000..293c84a30 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn @@ -0,0 +1,23 @@ +title: 进入UF检查 +tags: +position: 43,-97 +--- +现在可以插线来深入UF了 +=== +title: 结束UF检查 +position: 275,-222 +--- +<> +<> +=== + +title: 第一次进入UF检查 +position: 275,-222 +--- +// <> +【功能制作中】 +【这里看到UF控制下的视觉】 +【你可以操控UF，发现佩佩在给UF理解的世界注入色彩想象】 +【这个过程变得越来越不受控制，最后你失去了控制，视点在疯狂移动】 +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn.meta new file mode 100644 index 000000000..dc54836ff --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/UF检查.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 19f9aafebaf99ca4cb538def8e1bb3f2 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn b/Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn new file mode 100644 index 000000000..b4a163976 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn @@ -0,0 +1,34 @@ +title: 进入佩佩开场对话 +tags: +colorID: 8 +position: 272,-1156 +--- +<> +<> +<> +<> +<> +【占位】: 佩佩入场,今天似乎变得更加异常 +<> +<> +<> +【占位】: 试着绘制 +<> +<> +<> +<> +<> +<> +【占位】: 画面错误，或者根本画不出？ +<> +<> +<> +=== + +title: 结束引入对话 +position: 275,-222 +--- +<> +<> +=== + diff --git a/Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn.meta new file mode 100644 index 000000000..ecf4ff352 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/佩佩开场对话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 178076326de06a44cb016bb578a19955 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn b/Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn new file mode 100644 index 000000000..95b75589e --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn @@ -0,0 +1,38 @@ +title: 进入停止想象 +tags: +position: 428,-88 +--- +<> +【占位】:我们去UF模块来引导佩佩吧 +=== +title: 结束停止想象 +position: 259,432 +--- +<> +<> +=== + +title: 进入UF检查引导停止想象 +position: 71,-93 +--- +// <> +【这里佩佩试图停止想象，但是失败了，并且引起了发热】 + me: 我不该允许她这么做的…… + me: 感觉她全身都好烫，赶紧降温！！！ + me: 妈的，事到如今……什么规定都管不了了。 + me: 佩佩……抱歉…… + me: 我只是……真的不想再看到有人死在我手上了…… + <> + <> + <> + <> +=== +title: 降温失败的对话 +position: 255,114 +--- +me: 不…温度怎么也降不下来！ +me: UF模块，公司核心科技…… +me: 既然你要让我的病人死，那可别怪我了。 +<> +<> +=== diff --git a/Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn.meta new file mode 100644 index 000000000..2e775ebeb --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/停止想象.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 1c99e0994a2966c44a73d0fcee26b986 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/分析.yarn b/Assets/Resources/Yarn/PeipeiTalk2/分析.yarn new file mode 100644 index 000000000..17590ced8 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/分析.yarn @@ -0,0 +1,18 @@ +title: 进入分析 +tags: +position: 43,-97 +--- +///可以先用思考专用黑幕，把showobj之外的部分都盖住，每次分析用showobj展示ppt，做一个思考阶段，把线索回顾一下 +【占位】:刚才我们看到似乎记忆在破坏UF做的图像学习 +【占位】:查询，这是原型改造遗留的bug【想象】（这里感觉讲不清楚不行，但是讲清楚了可能会有点剧透） +【占位】:治疗方式1：看机体能不能抑制原型的想象bug +【占位】:这个bug利用的漏洞似乎是记忆中的色彩，能借助色彩操纵记忆的流动 +【占位】:治疗方式2：只要清除记忆色彩，似乎也就没问题了 +<> +=== +title: 结束分析 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/分析.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/分析.yarn.meta new file mode 100644 index 000000000..d8f269878 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/分析.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 07dac91957e15ba4e82f8745fb2c3201 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/手术.yarn b/Assets/Resources/Yarn/PeipeiTalk2/手术.yarn new file mode 100644 index 000000000..94e614a2f --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/手术.yarn @@ -0,0 +1,153 @@ +title: 进入手术 +tags: +colorID: 3 +position: 246,-866 +--- +<> +<> + <> + <> + me: 去记忆模块执行色彩初始化吧 + <> + <> + <> + ->安装色觉晶圆 + <> + <> + <> + <> + <> + <> + me: 装好了…… + peipei: 可是我还没有看见颜色…… + me: 那是因为还没做重置。 + <> + me: 只要进视觉做一次重置…就好了。 + <> + <> + // <> + // <> + // <> + <> +=== +title: 记忆初始化深度 +tags: +colorID: 1 +position: 33,-552 +--- +<> +<> +<> + me: 已经完成了…… + <> + me: 没有什么再继续留恋的了。 + me: 我们走吧。 + <> + <> + me: 剩下最后一步，把UF装回到左眼上。 + <> + ->安装UF模块 + <> + <> + <> + <> + ->安装UF盖子 + <> + <> + <> + <> +<> +<> + ->播放写生记忆 + <> + //<> + me: 和朋友的写生，你的决心就像旷野里的绿色那样不会褪去。 + me: 人生是旷野，不是轨道……么？ + ->手动进行色彩初始化 + <> + me: 抱歉……如果不让绿色褪去，我就无法挽救你。 + <> + <> +<> +<> + ->播放夕阳记忆 + //<> + <> + me: 啊…粉红的火烧云，夏夜晚风虫鸣和他。 + ->手动进行色彩初始化 + <> + me: 对不起，冬天要来了。 + <> + <> +<> +<> + ->播放蓝天记忆 + <> + //<> + me: 你是因为生了什么病而被困在那个病房里呢？ + me: 我可能永远也不会知道了…… + ->手动进行色彩初始化 + <> + me: 现在这个病房将不再困扰你了……你自由了。 + <> + <> +<> +<> +=== +title: 进行色彩回复后插入视觉 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 395,-3195 +--- +<> +<> +<> +<> +->检查 +<> +<> +<> +=== +title: RecoverColor +tags: +colorID: 8 +position: 481,-570 +--- +->校准颜色 +<> +<> +<> +<> +//<> +peipei: 啊…啊啊啊！好多…… +me: 佩佩？ #auto_next +peipei: 啊，啊！啊！！ +me: 坚持住，佩佩！ +peipei: 啊…我看到了！！ +<> +<> +<> +<> +peipei: 色彩…… +<> +<> +<> +peipei: 这就是……有色彩的世界吗？ +<> +<> +<> +peipei: 我已经……太久没有…… +//me: 好了，佩佩，让我们收拾一下…… +<> +me: 好了，佩佩。不要…不要太沉迷其中。 +//这里会自动执行主界面维修 +<> +<> +=== +title: 结束手术 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/手术.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/手术.yarn.meta new file mode 100644 index 000000000..16f397dbd --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/手术.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 3d7a421b25eb76c42878416eb8281ed8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn b/Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn new file mode 100644 index 000000000..267540b44 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn @@ -0,0 +1,19 @@ +title: 进入术前谈话 +tags: +colorID: 3 +position: 251,-1150 +--- +<> +【占位】:告诉佩佩诊疗方式 +【占位】:佩佩不接受记忆色彩清除，要尝试自己抑制原型的想象 +（这里感觉还是很难把握人和机器人的度） +<> +=== + + +title: 结束术前谈话 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn.meta new file mode 100644 index 000000000..f423d51a2 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/术前谈话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 95310e5f67f144b4db46db79b560a59f +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn b/Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn new file mode 100644 index 000000000..974918530 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn @@ -0,0 +1,224 @@ +title: 进入术前谈话2 +tags: +colorID: 3 +position: -545,-709 +--- +<> +=== +title: 结束术前谈话2 +position: -251,470 +--- +<> +<> +=== + +title: 谈话 +tags: +colorID: 1 +position: -544,-442 +--- +<> +<> +<> +<> +<> +<> +me:看来这个未知进程……或者说，想象，不是那么容易就被停止的 +me:那么剩下的方案就只有……色彩抹除了 +me:好了……佩佩需要休息，我……我也需要休息下 +<> +<> +peipei: 医生? +me: 佩佩？ +//TODO-佩佩出现 +<> +<> +me: 你醒了…… +<> +peipei: 我感觉到了…… +peipei: UF…它不在了。 +<> +peipei: 好轻…我好像…… +peipei: 我好像在飘一样。 +<> +me: 那是因为你刚才经历了严重的发热风暴， +me: 你的身体还很虚弱。 +peipei: 哈哈…原来如此。 +peipei: 我失败了，是吗？ +peipei: 为了让我活下来…你就把UF拆掉了。 +me: 是的，暂时。 +peipei: 暂时…… +peipei: 是啊。 +peipei: 有那么一刻，我以为我真的要离开这里了…… +peipei: 离开这个令人折磨的处境。 +peipei: 我还以为这只是个台阶… +<> +peipei: 呼…… +peipei: …… +<> +me: 你怎么了？又感觉不舒服吗？ +<> +peipei: 没有，医生。我好得很。 +peipei: 我只是在…享受没有疼痛的呼吸。 +peipei: 原来没有疼痛的感觉是这么好…… +me: 没有疼痛？ +peipei: 我才意识到。 +peipei: 原来我的左眼一直在痛… +peipei: 直到现在才停止。 +peipei: 这已经有多久了？ +peipei: 我竟然一直没有意识到吗？ +peipei: 我是不是搞错了什么…… +<> +peipei: 我上一次画画是什么时候？ +peipei: 这是…我想要的吗？ +<> +peipei: 医生…… +peipei: 我有一个请求。 +me: 什么？ +peipei: 你说过，UF里面有我的色彩晶圆，对吧 +peipei: 既然已经拆除了UF… +<> +peipei: 就请再帮我把我的晶圆装到它原本应该在的地方吧。 +me: 你是说，你还是想把晶圆装上吗？但UF怎么办？这是不能解决绘图的问题的。 +peipei: 别担心…这只是暂时的，我最后会回来做色彩抹除的。 +peipei: 我只是想重新看看这个世界……就…只是看看。 +peipei: 现在几点了？我能赶上夕阳吗？ +me: 你想离开这里？ +<> +<> +me: 你知道的…如果擅自一直不装uf还旷工，公司肯定不会放过你的。 +me: 你知道后果会是什么… +<> +peipei: 我不会走远的…… +peipei: 幸福市太小了…你知道我们走不掉。 +<> +peipei: 我会回来做那个记忆初始化的。 +me: 佩佩已经差点死在我手里了……我能让她开心，为什么不呢？ +me: 但是，或许这种得到又失去的感觉，会让她更痛苦？ +me: 何况，如果不清除掉记忆中的色彩，症状会不会…… +->建议直接进行色彩抹除 + me: 在重新看见颜色之后，又立刻再次失去它吗？ + me: 这真的会是一种好的体验吗？ + <> + peipei: 我不知道…医生。 + peipei: 我只是忽然这么想。 + <> +->同意安装色觉晶圆 + me: 我可以这么做。 + me: 但这意味着你会在看到颜色之后很快就失去它… + me: 你又会带着它去哪呢？ + <> +=== + +title: 色彩抹除后续 +position: -265,-201 +--- +peipei: 医生…… +<> +peipei: 如果你离开这里…你会去哪里？ +me: 我… +//这里根据之前玩家的选择做不同分支 +<> + peipei: 你说过你会想回到海边… +<> + peipei: 你说过你会想上月球去看看… +<> + peipei: 你说过你会想去我生活过的地方看看… +<> +peipei: 但我是说真的，现在，你从这间诊所离开了 +peipei: 你会去哪里？ +me: 我不知道。 +me: 我好像…无处可去。 +<> +peipei: 我们都没有也没有任何机会真的逃走。 +peipei: 不是吗？ +peipei: 我们都是没有家的人。 +peipei: 我的家在很远很远的南方…… +peipei: 但是那个地方已经早就不存在了。 +peipei: 我所拥有的…也就只有那些记忆罢了。 +peipei: 我能去的只有幸福市…只有这个罐头厂。 +peipei: 所以，我不可能离开的。医生。 +peipei: 求求你了，帮我把晶圆装上去吧。 +me: 那我们一起好好活下去吧…… +me: 在这座肮脏的城市里。 +<> +peipei: 太好了！ +peipei: 太好了…谢谢你，医生！ +peipei: 我们去维修室吧。 +<> +<> + +//这里可能存在一些初始化问题，我之后修复，或者先存另一个场景 +<> +=== + + +title: 色彩抹除选项组_level1 +position: -739,-206 +--- +->建议直接进行色彩抹除 + me: 你不会想这么做的。 + me: 况且…你刚刚发生了排异反应，这已经足够让我头疼了…… + me: 我不知道这会不会诱发什么更复杂的问题。 + me: 你是我的病人，我不能把我的病人置于任何危险之中。 + + <> + <> + peipei: 医生…求你了。 + peipei: 求你了…… + peipei: 我不要那样… + peipei: 我不要忘掉那些色彩…… + <> +->同意安装色觉晶圆 + me: 这意味着你会在看到颜色之后很快就失去它…你能接受吗？ + me: …… + me: 你会回来的，对吧？ + <> +=== + +title: 色彩抹除选择组_level2 +position: -736,56 +--- +->建议直接进行色彩抹除 + <> + //<> +->同意安装色觉晶圆 + me: …… + me: 好吧。 + me: 但你会回来的，对吧？ + <> + <> + <> +=== +title: 记忆色彩清除后续 +position: -733,301 +--- +me: 佩佩… +me: 你知道你终将失去那些色彩的，对吧 +me: 短暂的获得终将失去的美好 +me: ………… +me: 我想你会更痛苦 +<> +<> +peipei:………… +me: 而且，如果不进行记忆色彩抹除，我不知道你身体里的那个进程会不会什么时候又开始活跃 +me: 那很危险，我不想将你置于危险之中 +peipei:………… +peipei:………… +peipei: 我会记得我曾经有过那些彩色的记忆吗？ +me: 你只会记得你曾经有一些记忆… +me: 但不再记得它们是什么了。 +me: 就像梦一样。 +peipei: 就像梦一样… +peipei: 医生…… +peipei: 请把它们清除得干净一些。 +<> +peipei: 不要让我痛苦…… +me: …… +me: 我会的。 +peipei: 我们去维修室吧。 +<> +<> +<> +<> +=== diff --git a/Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn.meta new file mode 100644 index 000000000..81fe91f6e --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/术前谈话2.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f2c5fa5319ef70a418c8ccb3c1c14d82 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn b/Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn new file mode 100644 index 000000000..0ae23d71f --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn @@ -0,0 +1,57 @@ +title: 进入第一次发热 +tags: +colorID: 3 +position: 322,-1030 +--- +<> +=== + + +title: 结束第一次发热 +position: 304,-368 +--- +<> +<> +=== + +title: 系统发热对话 +tags: +colorID: 8 +position: -32,-873 +--- +<> +<> +<> +<> +<> +<> + <> + <> + <> + me: …过热？ + peipei: 医生…头…又开始痛了…… + me: 头痛…原来是因为佩佩正在发热！没想到竟然这么严重…… + me: 这个温度已经接近了警戒线，继续升高就会有生命危险… + <> + <> + me: 先别管什么线索了…必须先找到热源，然后进行降温。 + <> + <> + <> +<> +=== +title: 第一次降温 +tags: +colorID: 8 +position: -29,-688 +--- +<> +<> +<> +<> +<> +peipei: 呼…忽然……好多了。 +me: 还不能放松…这只是暂时的。 +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn.meta new file mode 100644 index 000000000..2293a7d13 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/第一次发热.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: db785065796aa4b4ab203d12dc964c55 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn b/Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn new file mode 100644 index 000000000..e3ed052f2 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn @@ -0,0 +1,18 @@ +title: 进入结束对话 +tags: +colorID: 3 +position: 251,-1150 +--- +<> +【占位】:再次测试绘图，发现ok了 +【占位】:佩佩离开 +<> +=== + + +title: 结束结束对话 +position: 275,-222 +--- +<> +<> +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn.meta new file mode 100644 index 000000000..18aed5082 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/结束对话.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: f09628fe84ffffd4fb22b1f6398efa5e +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn b/Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn new file mode 100644 index 000000000..9bed34fe9 --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn @@ -0,0 +1,239 @@ +title: 进入身体检查 +tags: +colorID: 8 +position: -443,-3575 +--- +<> +<> +【占位】:做全身检查，评估发热对佩佩身体的影响 +<> +=== + +title: 身体检查状态 +position: -455,-2606 +--- +//退出状态条件 +<> + <> +<> +=== + +title: 结束身体检查 +position: -460,-2237 +--- +<> +<> +=== +title: 高亮模块 +tags: +position: 43,-97 +--- +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> + <> +<> +<> +=== +// 这就是没有函数式的坏处 + + +title: PlugFinished +position: 151,-2688 +--- +<> + <> + <> +<> +=== + + + + + +title: 检查情绪 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: -87,-3394 +--- +<> +<> +<> +<> +->检查 +<> +<> + <> + <> + <> +<> +=== +title: 检查语言 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 154,-3032 +--- +<> +<> +<> +<> +->检查 +<> +<> + <> + <> + <> +<> +=== +title: 检查逻辑 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 388,-3398 +--- +<> +<> +<> +<> +->检查 +<> +<> + <> + <> + <> +<> +=== +title: 检查色觉 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 155,-3195 +--- +<> +<> +<> +<> +<> +<> +<> +<> + <> + <> + <> +<> + + +//佩佩很焦虑，不知道该怎么办了 +=== +title: 检查记忆 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 155,-3395 +--- +<> +<> +<> +<> +<> +->检查 +<> +<> + <> + <> + <> +<> + +//总体表现：对工作的焦虑、虚弱的身体状态 +=== +title: 检查UF +tags: 待编辑 +colorID: 8 +group:插线检查 +position: -85,-3195 +--- +<> +<> +<> +<> +->检查 +<> +<> +<> +<> + <> + <> + <> +<> +=== +title: 检查视觉 +tags: 待编辑 +colorID: 8 +group:插线检查 +position: 395,-3195 +--- +<> +<> +<> +<> +->检查 +<> +<> + <> + <> + <> +<> +=== +title: 第二次发热 +position: 151,-2461 +--- +到处都检查过了，这个发热对佩佩造成了很多损伤 +<> +【占位】又发热了，需要降温 +<> +<> +=== +title: 第二次降温 +tags: +colorID: 8 +position: -837,-2797 +--- +<> +<> +【占位】下一次，可能不会这么容易了 +<> +<> +<> +=== +title: UF深入失败 +tags: +colorID: 8 +position: -837,-2797 +--- +【安保程序】:拒绝深入，你没有权限 +=== + + + + + + + diff --git a/Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn.meta b/Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn.meta new file mode 100644 index 000000000..404394edc --- /dev/null +++ b/Assets/Resources/Yarn/PeipeiTalk2/身体检查.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: 7dc4bb0116736d24ea1cc73563d841eb +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index bcd2dd329..0dfd18342 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -3880,16 +3880,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6ce315967daa3374e9d7fa30e60eafd2, type: 3} m_Name: m_EditorClassIdentifier: - parallaxEffectMultiplier: 0.5 - maxOffset: {x: 2.8, y: 2} + virtualCamera: {fileID: 0} targetIndicator: {fileID: 1597388062} targetNameText: {fileID: 1307071591} - exitZoomButton: {fileID: 142983755} zoomInScale: 1.5 zoomDuration: 2 sceneBoundsMin: {x: 37.6, y: -6.64} sceneBoundsMax: {x: 42.2, y: -5.21} - viewCamera: {fileID: 105412842} --- !u!1001 &188784455 PrefabInstance: m_ObjectHideFlags: 0 @@ -6584,7 +6581,7 @@ Canvas: m_VertexColorAlwaysGammaSpace: 0 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 959782197 + m_SortingLayerID: 467777933 m_SortingOrder: 8 m_TargetDisplay: 0 --- !u!224 &320706165 @@ -12151,7 +12148,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2.48, y: 2.654} + m_AnchoredPosition: {x: -32.84, y: 2.654} m_SizeDelta: {x: 2.5, y: 2.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &777225789 @@ -23584,7 +23581,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 3, y: -6.35} + m_AnchoredPosition: {x: -27.36, y: -6.35} m_SizeDelta: {x: 2.5, y: 2.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1632908303 @@ -23883,7 +23880,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2.48, y: -3.58} + m_AnchoredPosition: {x: -32.57, y: -3.58} m_SizeDelta: {x: 2.5, y: 2.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1652512856 diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 5c23d389e..c0ad6a70d 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -6198,7 +6198,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} + m_LocalPosition: {x: -4.66, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -8104,10 +8104,10 @@ MonoBehaviour: - {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} - {fileID: 11400000, guid: fe71f935f1f9a52458c994362567a211, type: 2} - runMode: 0 + runMode: 2 firstTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} - testTalkSo: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} - saveFileName: StoneDay1_5 + testTalkSo: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2} + saveFileName: "PeipeiDay2_\u7B2C\u4E00\u6B21\u53D1\u70ED" --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs index b9cf324ad..29f089e12 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs @@ -62,8 +62,8 @@ namespace AibisDream.FixSystem // 插入就在示波器显示图片 if (!_bodyModuleSystem.inHotErr) { - StartCoroutine(FixSystemCenter.SystemDic.Get() - ?.ShowScanImage(data.ScreenPic, data.checkPoints)); + // StartCoroutine(FixSystemCenter.SystemDic.Get() + // ?.ShowScanImage(data.ScreenPic, data.checkPoints)); } if (DialogController.Instance) diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆壳.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆壳.json new file mode 100644 index 000000000..8e3609761 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆壳.json @@ -0,0 +1,69 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": false + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": false, + "isUFRemoved": false + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 1.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 6.0, + "$Yarn.Internal.Visiting.检查视觉": 1.0, + "$Yarn.Internal.Visiting.检查情绪": 1.0, + "$Yarn.Internal.Visiting.检查逻辑": 1.0, + "$Yarn.Internal.Visiting.检查语言": 1.0, + "$Yarn.Internal.Visiting.检查色觉": 0.0, + "$Yarn.Internal.Visiting.检查UF": 1.0, + "$Yarn.Internal.Visiting.记忆": 0.0, + "$Yarn.Internal.Visiting.检查记忆": 1.0 + }, + "stringDict": { + "$gameStage": "UF拆壳", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": true, + "$finishFirstCoolDown": true + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 3, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆壳.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆壳.json.meta new file mode 100644 index 000000000..e1f2837ac --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆壳.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e9f4cc5f18964af4082907611c40cd8e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆除.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆除.json new file mode 100644 index 000000000..3cdf92d68 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆除.json @@ -0,0 +1,69 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": false + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": true, + "isUFRemoved": false + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 1.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 6.0, + "$Yarn.Internal.Visiting.检查视觉": 1.0, + "$Yarn.Internal.Visiting.检查情绪": 1.0, + "$Yarn.Internal.Visiting.检查逻辑": 1.0, + "$Yarn.Internal.Visiting.检查语言": 1.0, + "$Yarn.Internal.Visiting.检查色觉": 0.0, + "$Yarn.Internal.Visiting.检查UF": 3.0, + "$Yarn.Internal.Visiting.记忆": 0.0, + "$Yarn.Internal.Visiting.检查记忆": 1.0 + }, + "stringDict": { + "$gameStage": "UF拆除", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": true, + "$finishFirstCoolDown": true + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 3, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆除.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆除.json.meta new file mode 100644 index 000000000..b19b14d4a --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF拆除.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a890813841ec9c8408bf1dda86e6a77f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF检查.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF检查.json new file mode 100644 index 000000000..27361cd19 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF检查.json @@ -0,0 +1,69 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": false + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": true, + "isUFRemoved": false + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 1.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 6.0, + "$Yarn.Internal.Visiting.检查视觉": 1.0, + "$Yarn.Internal.Visiting.检查情绪": 1.0, + "$Yarn.Internal.Visiting.检查逻辑": 1.0, + "$Yarn.Internal.Visiting.检查语言": 1.0, + "$Yarn.Internal.Visiting.检查色觉": 0.0, + "$Yarn.Internal.Visiting.检查UF": 1.0, + "$Yarn.Internal.Visiting.记忆": 0.0, + "$Yarn.Internal.Visiting.检查记忆": 1.0 + }, + "stringDict": { + "$gameStage": "UF检查", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": true, + "$finishFirstCoolDown": true + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 3, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF检查.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF检查.json.meta new file mode 100644 index 000000000..f22661472 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_UF检查.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7c53415fe60dad9489605de6cbc81f48 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_停止想象.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_停止想象.json new file mode 100644 index 000000000..9789e1f31 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_停止想象.json @@ -0,0 +1,69 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": false + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": true, + "isUFRemoved": false + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 1.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 6.0, + "$Yarn.Internal.Visiting.检查视觉": 1.0, + "$Yarn.Internal.Visiting.检查情绪": 1.0, + "$Yarn.Internal.Visiting.检查逻辑": 1.0, + "$Yarn.Internal.Visiting.检查语言": 1.0, + "$Yarn.Internal.Visiting.检查色觉": 0.0, + "$Yarn.Internal.Visiting.检查UF": 2.0, + "$Yarn.Internal.Visiting.记忆": 0.0, + "$Yarn.Internal.Visiting.检查记忆": 1.0 + }, + "stringDict": { + "$gameStage": "停止想象", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": true, + "$finishFirstCoolDown": true + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 1, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_停止想象.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_停止想象.json.meta new file mode 100644 index 000000000..05942a02b --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_停止想象.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 40a681e81faddd2438c38613bf20005a +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_分析.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_分析.json new file mode 100644 index 000000000..d215b9309 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_分析.json @@ -0,0 +1,69 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": false + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": true, + "isUFRemoved": false + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 1.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 6.0, + "$Yarn.Internal.Visiting.检查视觉": 1.0, + "$Yarn.Internal.Visiting.检查情绪": 1.0, + "$Yarn.Internal.Visiting.检查逻辑": 1.0, + "$Yarn.Internal.Visiting.检查语言": 1.0, + "$Yarn.Internal.Visiting.检查色觉": 0.0, + "$Yarn.Internal.Visiting.检查UF": 2.0, + "$Yarn.Internal.Visiting.记忆": 0.0, + "$Yarn.Internal.Visiting.检查记忆": 1.0 + }, + "stringDict": { + "$gameStage": "分析", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": true, + "$finishFirstCoolDown": true + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 3, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_分析.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_分析.json.meta new file mode 100644 index 000000000..3b7e65faf --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_分析.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 88cecd30088415c4286cb9d9d8cb405d +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_开场对话.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_开场对话.json new file mode 100644 index 000000000..117db2034 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_开场对话.json @@ -0,0 +1,61 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": null, + "faceName": null, + "poseName": null, + "hasDevice": false, + "isShow": false + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": false, + "isUFRemoved": false + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 0.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 0.0 + }, + "stringDict": { + "$gameStage": "开场对话", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": false, + "$finishFirstCoolDown": false + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 0, + "fixStateArgs": null +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_开场对话.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_开场对话.json.meta new file mode 100644 index 000000000..dea398d86 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_开场对话.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9a9450a33a39dad4a91d2855aa34d30c +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_手术_安装晶圆.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_手术_安装晶圆.json new file mode 100644 index 000000000..a5f2878ad --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_手术_安装晶圆.json @@ -0,0 +1,69 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "微笑", + "poseName": "无动作", + "hasDevice": false, + "isShow": true + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": true, + "isUFRemoved": true + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 1.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 6.0, + "$Yarn.Internal.Visiting.检查视觉": 1.0, + "$Yarn.Internal.Visiting.检查情绪": 1.0, + "$Yarn.Internal.Visiting.检查逻辑": 1.0, + "$Yarn.Internal.Visiting.检查语言": 1.0, + "$Yarn.Internal.Visiting.检查色觉": 0.0, + "$Yarn.Internal.Visiting.检查UF": 3.0, + "$Yarn.Internal.Visiting.记忆": 0.0, + "$Yarn.Internal.Visiting.检查记忆": 1.0 + }, + "stringDict": { + "$gameStage": "手术", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": true, + "$finishFirstCoolDown": true + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 3, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_手术_安装晶圆.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_手术_安装晶圆.json.meta new file mode 100644 index 000000000..3e7b17780 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_手术_安装晶圆.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 8cf61b89a4c80594298d71efddc8838f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话.json new file mode 100644 index 000000000..761976d12 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话.json @@ -0,0 +1,69 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": false + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": true, + "isUFRemoved": false + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 1.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 6.0, + "$Yarn.Internal.Visiting.检查视觉": 1.0, + "$Yarn.Internal.Visiting.检查情绪": 1.0, + "$Yarn.Internal.Visiting.检查逻辑": 1.0, + "$Yarn.Internal.Visiting.检查语言": 1.0, + "$Yarn.Internal.Visiting.检查色觉": 0.0, + "$Yarn.Internal.Visiting.检查UF": 2.0, + "$Yarn.Internal.Visiting.记忆": 0.0, + "$Yarn.Internal.Visiting.检查记忆": 1.0 + }, + "stringDict": { + "$gameStage": "术前谈话", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": true, + "$finishFirstCoolDown": true + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 3, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话.json.meta new file mode 100644 index 000000000..83fc06f44 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 277db1d57e58de249916142f7d02f4bf +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话2.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话2.json new file mode 100644 index 000000000..b2f7f8a93 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话2.json @@ -0,0 +1,69 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": false + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": true, + "isUFRemoved": true + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 1.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 6.0, + "$Yarn.Internal.Visiting.检查视觉": 1.0, + "$Yarn.Internal.Visiting.检查情绪": 1.0, + "$Yarn.Internal.Visiting.检查逻辑": 1.0, + "$Yarn.Internal.Visiting.检查语言": 1.0, + "$Yarn.Internal.Visiting.检查色觉": 0.0, + "$Yarn.Internal.Visiting.检查UF": 3.0, + "$Yarn.Internal.Visiting.记忆": 0.0, + "$Yarn.Internal.Visiting.检查记忆": 1.0 + }, + "stringDict": { + "$gameStage": "术前谈话2", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": true, + "$finishFirstCoolDown": true + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 3, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话2.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话2.json.meta new file mode 100644 index 000000000..9d5b202fe --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_术前谈话2.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 177870c3e1894e545be7ff2d85899654 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_第一次发热.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_第一次发热.json new file mode 100644 index 000000000..1dbb19822 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_第一次发热.json @@ -0,0 +1,61 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": true + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": false, + "isUFRemoved": false + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 0.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 0.0 + }, + "stringDict": { + "$gameStage": "第一次发热", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": false, + "$finishFirstCoolDown": false + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 1, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_第一次发热.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_第一次发热.json.meta new file mode 100644 index 000000000..cfa7b1ec4 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_第一次发热.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eddc89acc89911c49944253cd55ff9cd +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_身体检查.json b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_身体检查.json new file mode 100644 index 000000000..6dd52e255 --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_身体检查.json @@ -0,0 +1,69 @@ +{ + "fixDataContainer": { + "AibisDream.ClinicData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "characterName": "佩佩", + "faceName": "不开心", + "poseName": "无动作", + "hasDevice": false, + "isShow": false + }, + "EyeData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "currentState": 1 + }, + "ChipData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isChipRemoved": false + }, + "UFData, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null": { + "isUFCoverRemoved": false, + "isUFRemoved": false + } + }, + "floatDict": { + "$feverTimer": 0.0, + "$eyeTargetTriggerCount": 0.0, + "$Count": 0.0, + "$imagine_PeipeiTalk2": 1.0, + "$chipDiscussCount": 0.0, + "$ufDiscussCount": 0.0, + "$eyeDiscussCount": 0.0, + "$memDiscussCount": 0.0, + "$emoDiscussCount": 0.0, + "$logicDiscussCount": 0.0, + "$speakerDiscussCount": 0.0, + "$feverCount": 1.0, + "$stressTimer": 4.0, + "$feverMessageSeen": 0.0, + "$PlugCount": 0.0, + "$Yarn.Internal.Visiting.检查视觉": 0.0, + "$Yarn.Internal.Visiting.检查情绪": 0.0, + "$Yarn.Internal.Visiting.检查逻辑": 0.0, + "$Yarn.Internal.Visiting.检查语言": 0.0, + "$Yarn.Internal.Visiting.检查色觉": 0.0, + "$Yarn.Internal.Visiting.检查UF": 0.0, + "$Yarn.Internal.Visiting.记忆": 0.0, + "$Yarn.Internal.Visiting.检查记忆": 0.0 + }, + "stringDict": { + "$gameStage": "身体检查", + "$currentEyeTarget": "未定义", + "$currentSocket": "" + }, + "boolDict": { + "$isFinishedUFCheck": false, + "$isFinishedEyeCheck": false, + "$feverTimer0Known": false, + "$isPeipeiBE": false, + "$Memory1Fade_Peipei": false, + "$Memory2Fade_Peipei": false, + "$Memory3Fade_Peipei": false, + "$feverKnown": false, + "$eyecolorKnown": false, + "$UFInnerSeen": false, + "$PlugAll": false, + "$finishFirstCoolDown": false + }, + "curSceneKey": "PeipeiFixScene", + "curTalkSceneSo": "PeipeiDay2", + "fixState": 3, + "fixStateArgs": "" +} \ No newline at end of file diff --git a/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_身体检查.json.meta b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_身体检查.json.meta new file mode 100644 index 000000000..0b59f9a8a --- /dev/null +++ b/Assets/StreamingAssets/TestSaveFiles/PeipeiDay2_身体检查.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a817beebf918365468a93499f468a2bb +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: From c2f792186a48f802eb17e6fc5bc38f6edffb04f1 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Thu, 16 Jan 2025 18:24:14 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=85=88=E6=81=A2=E5=A4=8D=E4=B9=8B?= =?UTF-8?q?=E5=89=8D=E7=9A=84=E8=A7=86=E8=A7=89=E7=A7=BB=E5=8A=A8=E6=96=B9?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Yarn/PeipeiTalk1/身体检查.yarn | 2 +- Assets/Scenes/PeipeiFixScene.unity | 3 + .../FixSystem/Effect/MouseFollowEffect.cs | 87 +++++++++++++------ 3 files changed, 66 insertions(+), 26 deletions(-) diff --git a/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn b/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn index fcd686291..c0f0ab861 100644 --- a/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn +++ b/Assets/Resources/Yarn/PeipeiTalk1/身体检查.yarn @@ -467,7 +467,7 @@ colorID: 3 group:视觉检查 position: -2052,-2351 --- -<> +<> me:没什么头绪，先看看别的地方 <> <> diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 0dfd18342..d4e9ed0f6 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -3887,6 +3887,9 @@ MonoBehaviour: zoomDuration: 2 sceneBoundsMin: {x: 37.6, y: -6.64} sceneBoundsMax: {x: 42.2, y: -5.21} + viewCamera: {fileID: 105412842} + parallaxEffectMultiplier: 0.1 + maxOffset: {x: 2, y: 2} --- !u!1001 &188784455 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs index eb98c0eaa..c886843bc 100644 --- a/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs +++ b/Assets/Scripts/FixSystem/Effect/MouseFollowEffect.cs @@ -19,6 +19,14 @@ public class MouseFollowAndZoom : MonoBehaviour private bool isActive = false; private bool isLocked = false; + public Camera viewCamera; + public float parallaxEffectMultiplier = 0.1f; + public Vector2 maxOffset = new Vector2(2f, 2f); + + private Vector3 initialPosition; + + private float viewOffset = 40.3f; + // 读写访问 public void SetIsActive(bool value) { @@ -33,6 +41,7 @@ public class MouseFollowAndZoom : MonoBehaviour void Start() { + initialPosition = transform.position; targetIndicator.SetActive(false); // 初始时隐藏目标框 eyemanager = FindObjectOfType(); if (eyemanager == null) @@ -59,6 +68,33 @@ public class MouseFollowAndZoom : MonoBehaviour void HandleMouseMovement() { + // 获取鼠标位置 + Vector3 mousePosition = Input.mousePosition; + Vector3 worldMousePosition = viewCamera.ScreenToWorldPoint(mousePosition); + worldMousePosition.z = 0; // 确保 z 为 0 + + // 计算目标偏移量并反向 + Vector3 targetOffset = (viewCamera.transform.position - worldMousePosition) * parallaxEffectMultiplier; + targetOffset.x = Mathf.Clamp(targetOffset.x, -maxOffset.x, maxOffset.x); + targetOffset.y = Mathf.Clamp(targetOffset.y, -maxOffset.y, maxOffset.y); + + // 平滑处理偏移量 + float smoothFactor = 0.01f; // 平滑系数，值越小平滑效果越强，响应越慢 + currentOffset = Vector3.Lerp(currentOffset, targetOffset, smoothFactor); + + // 计算目标位置 + Vector3 targetPosition = initialPosition + currentOffset; + + // 限制目标位置在场景边界范围内 + targetPosition.x = Mathf.Clamp(targetPosition.x, sceneBoundsMin.x, sceneBoundsMax.x); + targetPosition.y = Mathf.Clamp(targetPosition.y, sceneBoundsMin.y, sceneBoundsMax.y); + + // 使用插值（Lerp）平滑更新位置 + float followSpeed = 0.1f; // 跟随速度，值越小延迟越大 + Vector3 smoothedPosition = Vector3.Lerp(transform.position, targetPosition, followSpeed); + + // 应用平滑后的位置 + transform.position = smoothedPosition; } @@ -66,7 +102,8 @@ public class MouseFollowAndZoom : MonoBehaviour { // 获取鼠标位置 Vector3 mousePosition = Input.mousePosition; - Vector3 worldPosition = Camera.main.ScreenToWorldPoint(mousePosition); + mousePosition.x += viewOffset; // 添加偏移量 + Vector3 worldPosition = viewCamera.ScreenToWorldPoint(mousePosition); RaycastHit2D hit = Physics2D.Raycast(worldPosition, Vector2.zero); // 检查是否有目标 @@ -96,35 +133,35 @@ public class MouseFollowAndZoom : MonoBehaviour void HandleTargetIndicator() { - // if (currentTarget == null) - // { - // targetIndicator.SetActive(false); // 隐藏指示器 - // return; - // } + if (currentTarget == null) + { + targetIndicator.SetActive(false); // 隐藏指示器 + return; + } - // // 获取目标的 BoxCollider2D - // BoxCollider2D boxCollider = currentTarget.GetComponent(); - // if (boxCollider != null) - // { - // Vector3 boxCenter = boxCollider.bounds.center; - // Vector3 boxSize = boxCollider.bounds.size; + // 获取目标的 BoxCollider2D + BoxCollider2D boxCollider = currentTarget.GetComponent(); + if (boxCollider != null) + { + Vector3 boxCenter = boxCollider.bounds.center; + Vector3 boxSize = boxCollider.bounds.size; - // // 转换为屏幕坐标 - // Vector3 screenCenter = viewCamera.WorldToScreenPoint(boxCenter); - // Vector2 screenSize = viewCamera.WorldToScreenPoint(boxCenter + boxSize) - - // viewCamera.WorldToScreenPoint(boxCenter); + // 转换为屏幕坐标 + Vector3 screenCenter = viewCamera.WorldToScreenPoint(boxCenter); + Vector2 screenSize = viewCamera.WorldToScreenPoint(boxCenter + boxSize) - + viewCamera.WorldToScreenPoint(boxCenter); - // // 设置目标框位置和大小 - // RectTransform indicatorRectTransform = targetIndicator.GetComponent(); - // indicatorRectTransform.position = screenCenter; - // indicatorRectTransform.sizeDelta = screenSize; + // 设置目标框位置和大小 + RectTransform indicatorRectTransform = targetIndicator.GetComponent(); + indicatorRectTransform.position = screenCenter; + indicatorRectTransform.sizeDelta = screenSize; - // // 设置目标名称 - // targetNameText.text = currentTarget.name; + // 设置目标名称 + targetNameText.text = currentTarget.name; - // // 显示指示器 - // targetIndicator.SetActive(true); - // } + // 显示指示器 + targetIndicator.SetActive(true); + } } public void SetIndicatorTarget(EyeTarget target) From 3592187b116702e29c0cc1891fd64ab6397eafc2 Mon Sep 17 00:00:00 2001 From: Ding Yuntian <1491671119@qq.com> Date: Thu, 16 Jan 2025 19:27:27 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=94=B9=E5=9B=9EOverlay?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/Persistence.unity | 26 +++++++++++------------ Assets/Scripts/UI/Cursor/CursorManager.cs | 19 +++++++++-------- 2 files changed, 23 insertions(+), 22 deletions(-) diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index c0ad6a70d..1f24e65ca 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -6198,7 +6198,7 @@ Transform: m_GameObject: {fileID: 519420028} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -4.66, y: 0, z: -10} + m_LocalPosition: {x: 0, y: 0, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -10199,7 +10199,7 @@ Canvas: m_GameObject: {fileID: 947129551} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 1076102359} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -10211,7 +10211,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 1986402817 - m_SortingOrder: 9 + m_SortingOrder: 20 m_TargetDisplay: 0 --- !u!1 &948583005 GameObject: @@ -10491,7 +10491,7 @@ Canvas: m_GameObject: {fileID: 984233627} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 1076102359} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -10503,7 +10503,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 315200563 - m_SortingOrder: 8 + m_SortingOrder: 17 m_TargetDisplay: 0 --- !u!224 &984233631 RectTransform: @@ -10687,7 +10687,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1076102356 Transform: m_ObjectHideFlags: 0 @@ -13583,9 +13583,9 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 947129552} - - {fileID: 984233631} - {fileID: 1788453626} - {fileID: 1604842429} + - {fileID: 984233631} - {fileID: 515480973} - {fileID: 2302717115629548829} - {fileID: 2003858546407399498} @@ -15833,7 +15833,7 @@ Canvas: m_GameObject: {fileID: 1604842425} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 1076102359} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -15845,7 +15845,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: -510666463 - m_SortingOrder: 9 + m_SortingOrder: 18 m_TargetDisplay: 0 --- !u!224 &1604842429 RectTransform: @@ -17679,7 +17679,7 @@ Canvas: m_GameObject: {fileID: 1788453625} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 1076102359} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -17691,7 +17691,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 813150151 - m_SortingOrder: 9 + m_SortingOrder: 19 m_TargetDisplay: 0 --- !u!1 &1794129318 GameObject: @@ -45334,7 +45334,7 @@ Canvas: m_GameObject: {fileID: 7690584928354748229} m_Enabled: 1 serializedVersion: 3 - m_RenderMode: 1 + m_RenderMode: 0 m_Camera: {fileID: 1076102359} m_PlaneDistance: 100 m_PixelPerfect: 0 @@ -45346,7 +45346,7 @@ Canvas: m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: -789334189 - m_SortingOrder: 6 + m_SortingOrder: 14 m_TargetDisplay: 0 --- !u!224 &6739238970480916096 RectTransform: diff --git a/Assets/Scripts/UI/Cursor/CursorManager.cs b/Assets/Scripts/UI/Cursor/CursorManager.cs index f6c817de8..5acd120b9 100644 --- a/Assets/Scripts/UI/Cursor/CursorManager.cs +++ b/Assets/Scripts/UI/Cursor/CursorManager.cs @@ -22,7 +22,6 @@ namespace AibisDream private CursorState _curState = CursorState.Default; #endregion - // 卸载时注销事件 private List _unRegisters = new(); @@ -68,10 +67,12 @@ namespace AibisDream _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.LineStart, _ => SwitchCursor(talking))); _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.LineShowed, () => SwitchCursor(nextTalk))); - _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.LineEnd, () => SwitchCursorDelay(defaultCursor))); + _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.LineEnd, + () => SwitchCursorDelay(defaultCursor))); _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.OptionShow, () => SwitchCursor(option))); - _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected, () => SwitchCursorDelay(defaultCursor))); - + _unRegisters.Add(EnumEventSystem.Global.Register(DialogEventEnum.OptionSelected, + () => SwitchCursorDelay(defaultCursor))); + // 交互相关 _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.Start, OnInteractiveStart)); _unRegisters.Add(EnumEventSystem.Global.Register(InteractionEventEnum.End, OnInteractiveEnd)); @@ -79,12 +80,12 @@ namespace AibisDream private void LateUpdate() { - // 将虚拟指针与鼠标位置同步 - RectTransformUtility.ScreenPointToLocalPointInRectangle(_cursorCanvas, Input.mousePosition, - CameraKit.Instance.uiCamera, out var worldPos); + // // 将虚拟指针与鼠标位置同步 + // RectTransformUtility.ScreenPointToLocalPointInRectangle(_cursorCanvas, Input.mousePosition, + // CameraKit.Instance.uiCamera, out var worldPos); + + _cursor.rectTransform.position = Input.mousePosition; - _cursor.rectTransform.localPosition = worldPos; - // 在输入状态，要单独处理 }