diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn index a36a26ae1..19f088029 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/ClueBoard.yarn @@ -3,6 +3,7 @@ tags: position: 43,-97 --- <> +<> <> <> <> @@ -83,7 +84,7 @@ position: 43,-97 <> <> <> -<> +<> //<> === @@ -143,7 +144,7 @@ position: 43,-97 --- 【占位】那么看来是要做记忆桥截断术了 【占位】先和患者谈一谈吧 -<> +<> === title: SkipClueBoard tags: diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn new file mode 100644 index 000000000..92c333a46 --- /dev/null +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn @@ -0,0 +1,96 @@ + +title: PlugFinished +tags: 待编辑 +colorID: 8 +position: -362,-2710 +--- +<> + <> + <> +<> + +<> +<> +<> +=== +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 +--- +//待编辑 +//佩佩很害怕，她意识到了原来的颜色再也回不来了 +<> + <> + <> +<> + +=== \ No newline at end of file diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn.meta b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn.meta new file mode 100644 index 000000000..2c7a89acd --- /dev/null +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Plug.yarn.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: c3cd45d6fb00741489442a6b77f335b8 +ScriptedImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 2 + userData: + assetBundleName: + assetBundleVariant: + script: {fileID: 11500000, guid: 94073015eacc34c1d8fc6786e43d60ca, type: 3} diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn index 600483024..0618140e3 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn @@ -93,6 +93,7 @@ position: 249,-1464 <> <> <> +<> 【占位】佩佩来看病，佩佩说她最近的出图有问题，你让他绘制一幅图，她说是通过UF绘制的，需要提示词，感觉UF很难沟通 【占位】你们关于要绘制的图进行了一些交流，在交流的过程中，佩佩看着天空走神了一下，不过还是出了一张图 <> @@ -199,17 +200,17 @@ title: 进入分析前与病人谈话 tags: colorID: 8 group:分析相关 -position: -277,-703 +position: -277,-704 --- <> <> -<> -<> -<> -<> -<> -<> -<> +// <> +// <> +// <> +// <> +// <> +// <> +// <> 【占位】和佩佩阐述检查结果，回答佩佩问题，安抚佩佩情绪等，如果有针对检查结果需要进一步询问的可以询问 【占位】结束后告知佩佩等待分析 <> @@ -221,12 +222,11 @@ colorID: 8 group:分析相关 position: -273,-535 --- -<> -<> -<> -<> -<> - +// <> +// <> +// <> +// <> +// <> //管理discuss相关 <> <> @@ -304,18 +304,18 @@ me: 这不是我应该剪断的线…… title: UF绘图复查 tags: -position: 239,-504 +position: 239,-506 --- me: 检查应该都完成了…我们出去吧，佩佩。 <> <> <> <> -<> -<> -<> -<> -<> +// <> +// <> +// <> +// <> +// <> 【占位】要求佩佩再次绘制之前绘制过的图片 <> <> @@ -584,55 +584,42 @@ position: 463,-2804 // me: 可惜…连最后一点颜色也没能保住。 // <> === -title: PlugInsert -tags: 待编辑 -colorID: 8 -position: 96,-3246 ---- -<> - <> - <> - <> - <> - <> - <> - <> - <> - //<> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> - <> -<> +// title: PlugInsert +// tags: 待编辑 +// colorID: 8 +// position: 96,-3246 +// --- +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// //<> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> +// <> -=== -title: PlugFinished -tags: 待编辑 -colorID: 8 -position: -362,-2710 ---- -<> - <> - <> -<> +// === -<> -<> -<> -=== title: 没有检查视觉的提示 tags: 待编辑 colorID: 8 -position: -364,-2460 +position: -364,-2461 --- 【占位】视觉好像有错误还没有深入，我们或应该深入检查下视觉模块 === diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/tutorial.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/tutorial.yarn index 6539add80..6a38cb756 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/tutorial.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/tutorial.yarn @@ -8,7 +8,7 @@ position: -870,-2464 me: 探针查到了缺陷波形…我需要把它找出来，才能进行深入检查。 me: 拖动波形显示下方的滑条，直到“缺陷波形”变得最清晰，然后点击【深入】。 <> -暴漏后点击“深入”即可深入 + <> <>> <> <=3>> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Memory.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Memory.yarn index 1de56abc0..9f4fe58c2 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Memory.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Memory.yarn @@ -9,7 +9,6 @@ position: -579,564 <> me: 我们该去做视觉色彩校准了... <> - <> === diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn index 0a63eb9f6..df89369e2 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday2/Re_LTS_Peipeiday2.yarn @@ -109,6 +109,7 @@ position: 239,-1813 <> <> <> +<> 【占位】佩佩再次前来，她的绘图还是有问题，而且这次感觉状态不太正常 【占位】你和她做绘图测试，但是这次她时不时伴随着头痛，会显得显得非常的暴躁和具有攻击性 【占位】关于她的绘制，你有三种需求可以提 @@ -371,6 +372,7 @@ tags: colorID: 8 position: -33,1347 --- +<> <> 佩佩没有回来 对此，你并不是完全没有预料 @@ -385,6 +387,7 @@ tags: colorID: 8 position: 507,1343 --- +<> <> 自此之后你再没有见过佩佩 你没有在回收名单上见到她，但是总觉得，好像什么东西已经消失了 @@ -663,6 +666,7 @@ position: -170,-1066 --- //TODO-需要一个命名规范？ //<> +<> <> me: 啊，这是... me: 色觉晶圆？怎么会在这里... @@ -717,6 +721,7 @@ position: -541,-628 //【移除了所有UF的螺丝，取下UF，发热停止了】 <> <> +<> <> <> <> @@ -743,6 +748,7 @@ colorID: 1 position: -543,-283 --- <> +<> <> <> <> @@ -767,10 +773,10 @@ position: -286,192 me: 佩佩？ <> //TODO-佩佩出现 -<> -<> -<> -<> +<> +<> + <> + <> <> me: 你醒了…… peipei: 我感觉到了…… diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index c3a2dbdb2..55a76d5c2 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -8800,7 +8800,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &507625640 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9868,7 +9868,7 @@ MonoBehaviour: Pos: - {fileID: 1678197549} - {fileID: 962974901} - - {fileID: 2071292136} + - {fileID: 1484838014} - {fileID: 1616768533} - {fileID: 1983689271} - {fileID: 190481521} @@ -19965,6 +19965,90 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1484838013 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1484838014} + - component: {fileID: 1484838015} + m_Layer: 0 + m_Name: heatmap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1484838014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484838013} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.195, y: 0.147, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1822610250} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1484838015 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1484838013} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: 21300000, guid: 7936cdb0ed1814d46968c96dbdcb90fa, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.36, y: 2.13} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1496761514 GameObject: m_ObjectHideFlags: 0 @@ -23836,6 +23920,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2071292136} + - {fileID: 1484838014} - {fileID: 1465407177} - {fileID: 633823202} - {fileID: 1434391375} @@ -23869,6 +23954,90 @@ MonoBehaviour: waveHasError: 1 ignoreWaveCheck: 0 cantStopRunning: 0 +--- !u!1 &1841275528 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1841275529} + - component: {fileID: 1841275530} + m_Layer: 0 + m_Name: Module Pic (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1841275529 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841275528} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -4.622, y: 0.604, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6045551082333026153} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1841275530 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1841275528} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 4 + m_Sprite: {fileID: -8510992098524624651, guid: fd04c28739017964789d58d573f9fabb, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.99, y: 1.08} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1854177014 GameObject: m_ObjectHideFlags: 0 @@ -28185,6 +28354,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3722350651361937496, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 addedObject: {fileID: 1912719094} + - targetCorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + insertIndex: -1 + addedObject: {fileID: 1841275529} - targetCorrespondingSourceObject: {fileID: 2309837242789316790, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} insertIndex: -1 addedObject: {fileID: 887438620} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index f1cfb9aae..67850f609 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -7699,7 +7699,7 @@ MonoBehaviour: runMode: 0 firstTalkSo: {fileID: 11400000, guid: 6d49b124127007b48b6881ce33350263, type: 2} clinicScene: ClinicScene - testYarnProject: Re_LTS_Peipeiday2 + testYarnProject: Re_LTS_Peipeiday1 --- !u!4 &719228339 Transform: m_ObjectHideFlags: 0 @@ -34428,7 +34428,7 @@ MonoBehaviour: iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3} exclusiveOnDragCanvas: {fileID: 0} useLegacyDragMethod: 0 - position: {x: 1039.8378, y: 1172.9757, z: 0} + position: {x: 1005.4032, y: 1175.2722, z: 0} dragSelection: customRenderer: {fileID: 0} line: diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BaseSocket.cs b/Assets/Scripts/FixSystemNew/BodyModule/BaseSocket.cs index fe438c14e..942eff9ba 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BaseSocket.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BaseSocket.cs @@ -7,10 +7,13 @@ namespace AibisDream.FixSystem public void PlugIn(); public void PlugOut(); public Vector3 GetSocketPos(); + public bool IsAvailable(); // 新增方法 + } public class BaseSocket : MonoBehaviour, ISocket { + private bool available = true; public void PlugIn() { Debug.Log("Plug Back InitSocket"); @@ -25,6 +28,10 @@ namespace AibisDream.FixSystem { return transform.position; } + public bool IsAvailable() + { + return available; + } } } diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs index ca85fe6f0..06ad10896 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs @@ -18,6 +18,7 @@ namespace AibisDream.FixSystem // 模块基本数据 [SerializeField] public BodyModuleData data; + private bool available = true; private void Awake() { @@ -33,6 +34,15 @@ namespace AibisDream.FixSystem #region 插槽功能 + public bool IsAvailable() + { + return available; + } + public void SetSocketAvailable(bool isAvailable) + { + available=isAvailable; + } + public void PlugIn() { // 插入后先播放wave @@ -45,6 +55,7 @@ namespace AibisDream.FixSystem public void PlugOut() { // 先关闭wave + _bodyModuleSystem.oscilloscopeSystem.ShowScreenMessage("未插入任何模块", Color.white); CloseWave(); // TODO 触发Yarn节点（似乎目前没有拔出对话？） } @@ -152,6 +163,7 @@ namespace AibisDream.FixSystem // 功能信息 public WaveformType waveformType; + public bool waveHasError; public bool ignoreWaveCheck; diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs index 1bb6c09b6..936d7e6a7 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleSystem.cs @@ -85,6 +85,10 @@ namespace AibisDream.FixSystem // 寻找最接近的BodyModule foreach (var bodyModule in BodyModules) { + if (!bodyModule.IsAvailable()) // 检查模块是否可用 + { + continue; // 跳过不可用的模块 + } float tempDistance = Vector3.Distance(sourcePos, bodyModule.GetSocketPos()); if (tempDistance < closestDistance) diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs index 545eb4564..9baaa4f75 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModuleYarnCommand.cs @@ -83,5 +83,11 @@ namespace AibisDream _UFCover.SetActive(false); } } + [YarnCommand("SetSocketAvailable")] + public static void SetSocketAvailable(string moduleName,bool isAvailable) + { + var targetModule = BodyModuleSystem.FindBodyModuleByName(moduleName); + targetModule.SetSocketAvailable(isAvailable); + } } }