From 9bef7ceaa3235a1b75750b67ddaa1ec0db93a345 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Sun, 17 Nov 2024 22:14:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=99=8D=E6=B8=A9?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=A7=A6=E5=8F=91bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prototype/佩佩/佩佩视觉模块.unity | 217 +++++++++++++++++- .../Resources/Yarn/PeipeiNew/ClueBoard.yarn | 22 +- .../Resources/Yarn/PeipeiNew/PeipeiNew.yarn | 15 +- Assets/Scenes/Persistence.unity | 41 +++- Assets/Scripts/Clue/ClueBaordNew.cs | 109 +++++++++ Assets/Scripts/FixSystem/DraggableUI.cs | 4 +- .../FixSystem/Scope/OscilloscopeController.cs | 12 +- 7 files changed, 395 insertions(+), 25 deletions(-) diff --git a/Assets/Prototype/佩佩/佩佩视觉模块.unity b/Assets/Prototype/佩佩/佩佩视觉模块.unity index 2838d5017..97906545d 100644 --- a/Assets/Prototype/佩佩/佩佩视觉模块.unity +++ b/Assets/Prototype/佩佩/佩佩视觉模块.unity @@ -22891,7 +22891,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: 0, y: 0} + m_AnchoredPosition: {x: 8, y: 0} m_SizeDelta: {x: 200, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &982326624 @@ -22914,7 +22914,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\u7D22\u5F15\u5361\u63A5\u53E3" + m_text: "\u62D6\u62FD\u7D22\u5F15\u5361\u5230\u6B64\u64AD\u653E\u8BB0\u5FC6" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} @@ -22977,7 +22977,7 @@ MonoBehaviour: m_VertexBufferAutoSizeReduction: 0 m_useMaxVisibleDescender: 1 m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} + m_margin: {x: -29.560791, y: 0, z: -19.707153, w: 0} m_isUsingLegacyAnimationComponent: 0 m_isVolumetricText: 0 m_hasFontAssetChanged: 0 @@ -24807,7 +24807,7 @@ Canvas: m_OverridePixelPerfect: 0 m_SortingBucketNormalizedSize: 0 m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 0 + m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 m_SortingLayerID: 1607245853 m_SortingOrder: 2 @@ -25794,6 +25794,7 @@ RectTransform: - {fileID: 486116302} - {fileID: 1196152381} - {fileID: 4042129} + - {fileID: 2057133324} m_Father: {fileID: 2027266814} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -28131,6 +28132,7 @@ MonoBehaviour: m_EditorClassIdentifier: target: {fileID: 1384609859} button: {fileID: 1613608978} + isDone: 0 --- !u!1 &1259092914 GameObject: m_ObjectHideFlags: 0 @@ -30991,7 +30993,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1371483724} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: c2a37d0f43cb6f14c8011e55a756c448, type: 3} m_Name: @@ -36154,7 +36156,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.18431373} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -44968,6 +44970,74 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1990648376 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1990648379} + - component: {fileID: 1990648378} + - component: {fileID: 1990648377} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1990648377 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1990648376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1990648378 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1990648376} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1990648379 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1990648376} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1992286095 GameObject: m_ObjectHideFlags: 0 @@ -46434,6 +46504,140 @@ Material: - _ShadowColor: {r: 0, g: 0, b: 0, a: 1} - _ShineColor: {r: 1, g: 1, b: 1, a: 1} m_BuildTextureStacks: [] +--- !u!1 &2057133323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2057133324} + - component: {fileID: 2057133326} + - component: {fileID: 2057133325} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2057133324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057133323} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1141076862} + 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.856, y: 2.166} + m_SizeDelta: {x: 1, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2057133325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057133323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_sharedMaterial: {fileID: -6659093157667844055, guid: f242fb3dde1933640859f1c54591c9c8, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 0.2 + m_fontSizeBase: 0.2 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0.677531, z: -0.033798218, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &2057133326 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2057133323} + m_CullTransparentMesh: 1 --- !u!1 &2060600358 GameObject: m_ObjectHideFlags: 0 @@ -49070,3 +49274,4 @@ SceneRoots: - {fileID: 1541634223} - {fileID: 363024449} - {fileID: 303263616} + - {fileID: 1990648379} diff --git a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn index 4abc3f1e6..71f6e0506 100644 --- a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn @@ -28,17 +28,10 @@ title: 记忆问题回答正确 tags: position: 49,-314 --- -me: 视觉模块。 -me: 这是一种罕见的症状…记忆模块种的数据逆向进入了视觉模块。 -me: 这似乎也就是导致佩佩会看见一部分颜色的原因。 -me: 我们对这种症状的产生原因知之甚少… - <> - me: 这或许和佩佩看不见颜色有关系。 - me: 直观地说…这像是一种代偿，“因为她看不见颜色，所以通过某种方式补偿了回来”。 - me: 不过…机体医学更关心机体如何正常工作，对于它们能不能看见颜色这种小问题…探索得很少。 - <> +me: 这个记忆还被视觉模块调用了 <> <> +me: 这是一种罕见的症状…记忆模块种的数据逆向进入了视觉模块。 <> <> <> @@ -46,14 +39,21 @@ me: 我们对这种症状的产生原因知之甚少… <> <> <> -<> +me: 这似乎也就是导致佩佩会看见一部分颜色的原因。 +me: 我们对这种症状的产生原因知之甚少… + <> + me: 这或许和佩佩看不见颜色有关系。 + me: 直观地说…这像是一种代偿，“因为她看不见颜色，所以通过某种方式补偿了回来”。 + me: 不过…机体医学更关心机体如何正常工作，对于它们能不能看见颜色这种小问题…探索得很少。 + <> +//<> me: 总之，针对“记忆反流” ，机体医学已知的应对方案是…… <> <> <> <> <> -<> +me: 只有这个办法，切断记忆和视觉的传输途径 <> === title: 执行手术 diff --git a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn index 60d0c0925..f817db922 100644 --- a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn @@ -11,7 +11,7 @@ position: 242,-2378 可以微信联系：15209116298 或QQ群325268983进行反馈 如果您能够在游玩过程中记录反馈，我们将不胜感激 好了！游戏开始~ -<> +<> <> 2024已经是遥远的过去。数十年间，社会飞速发展，人体机械化技术已经臻于成熟。 从简单的机械肢体，到脑区的电子模块化，人们竞相改造自身，直到完全机械化，以适应愈发残酷的社会竞争。 @@ -268,7 +268,15 @@ me: 总之，我们先到诊疗台这边来吧。 // ->开始治疗 <> === - +title: board +tags: +colorID: 3 +position: 240,-1440 +--- +<> +////<> +<> +=== @@ -281,7 +289,8 @@ position: 240,-1440 <> <> <> -// <> + //<> + //<> //<> <> <> diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 565f07356..170366c0b 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -2476,6 +2476,14 @@ PrefabInstance: propertyPath: m_text value: "\u5B83\u5E26\u6765\u7684\u4E00\u7CFB\u5217\u95EE\u9898\uFF0C\u7B26\u5408\u4E00\u79CD\u5DF2\u77E5\u7684\u75C5\u75C7\u2026" objectReference: {fileID: 0} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: scrollView + value: + objectReference: {fileID: 2006017874} + - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + propertyPath: contentRectTransform + value: + objectReference: {fileID: 639620682} - target: {fileID: 6374982573157599259, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} propertyPath: nodeLists.Array.size value: 26 @@ -5554,7 +5562,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 18a3ec3914131d44199ae33902edf159, type: 3} m_Name: m_EditorClassIdentifier: - runMode: 1 + runMode: 0 firstTalkSO: {fileID: 11400000, guid: 10601ce26230723479d875a630f15732, type: 2} clinicScene: ClinicScene testYarnProject: PeipeiNew2 @@ -7086,6 +7094,22 @@ PrefabInstance: propertyPath: m_hasFontAssetChanged value: 0 objectReference: {fileID: 0} + - target: {fileID: 42809014796558882, guid: faa2f8d357d30504aa50ca9fa23830e3, type: 3} + propertyPath: m_Color.a + value: 0.69411767 + objectReference: {fileID: 0} + - target: {fileID: 42809014796558882, guid: faa2f8d357d30504aa50ca9fa23830e3, type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 42809014796558882, guid: faa2f8d357d30504aa50ca9fa23830e3, type: 3} + propertyPath: m_Color.g + value: 0.8103259 + objectReference: {fileID: 0} + - target: {fileID: 42809014796558882, guid: faa2f8d357d30504aa50ca9fa23830e3, type: 3} + propertyPath: m_Color.r + value: 1 + objectReference: {fileID: 0} - target: {fileID: 450652695604557379, guid: faa2f8d357d30504aa50ca9fa23830e3, type: 3} propertyPath: m_text value: "\u672A\u77E5\u8FDB\u7A0B\u8BF7\u6C42\u8BB0\u5F55\uFF0C\u6B63\u5728\u4ECE\u8BB0\u5FC6\u975E\u6CD5\u5199\u5165\uFF0C\u6253\u5370\u8BB0\u5FC6\u7D22\u5F15\u5361\u4E2D..." @@ -7118,6 +7142,10 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5496640533733971058, guid: faa2f8d357d30504aa50ca9fa23830e3, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8061307773979316499, guid: faa2f8d357d30504aa50ca9fa23830e3, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13124,6 +13152,17 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2002174790} m_CullTransparentMesh: 1 +--- !u!114 &2006017874 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 2889502997424142027, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + m_PrefabInstance: {fileID: 366548950} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fa47f82dd1774578abdb8443d56fb539, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2038437601 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Clue/ClueBaordNew.cs b/Assets/Scripts/Clue/ClueBaordNew.cs index 7fb0e1909..9efca6387 100644 --- a/Assets/Scripts/Clue/ClueBaordNew.cs +++ b/Assets/Scripts/Clue/ClueBaordNew.cs @@ -6,7 +6,10 @@ using MeadowGames.UINodeConnect4; using UnityEngine; using Yarn.Unity; using RainbowArt.CleanFlatUI; +using MeadowGames.UINodeConnect4.SampleScene.ScrollViewGraph; +using DG.Tweening; +using UnityEngine.UI; public class ClueBaordNew : MonoBehaviour { @@ -27,6 +30,12 @@ public class ClueBaordNew : MonoBehaviour private Connection currentConnection; private bool isTriggerDialogue=true; + + public ScrollRect scrollRect; // ScrollView的ScrollRect组件 + public RectTransform contentRectTransform; // Content的RectTransform + public float padding = 10f; // 节点的额外间隔 + public float scrollDuration = 0.5f; // 滚动动画持续时间 + public float scaleDuration = 0.3f; // 缩放动画持续时间 void Start() { gm=GetComponent(); @@ -38,6 +47,106 @@ public class ClueBaordNew : MonoBehaviour { } + // public void CenterImage(string name) + // { + // Node newNode=GetNode(name); + + // // 获取目标图像相对于 ScrollView 的位置 + // Vector2 targetPosition = newNode.GetComponent().localPosition; + + // // 获取 ScrollView 容器的尺寸 + // Vector2 contentSize = contentRectTransform.sizeDelta; + // Vector2 viewPortSize = scrollView.viewport.rect.size; + + // // 计算目标位置相对于 Viewport 的偏移 + // Vector2 offset = targetPosition - viewPortSize / 2; + + // // 调整 ScrollRect.content 的位置来居中图像 + // contentRectTransform.anchoredPosition = new Vector2( + // Mathf.Clamp(offset.x, 0, contentSize.x - viewPortSize.x), + // Mathf.Clamp(offset.y, 0, contentSize.y - viewPortSize.y) + // ); + // } +[YarnCommand("ScrollToNode")] +public IEnumerator ScrollToNode(string nodeName) +{ + // 获取目标节点 + Transform targetNode = GetNode(nodeName).transform; + if (targetNode == null) + { + Debug.LogWarning($"Node {nodeName} not found!"); + yield break; + } + + // 计算目标节点在ScrollView中的相对位置 + RectTransform targetRectTransform = targetNode.GetComponent(); + if (targetRectTransform == null) + { + Debug.LogWarning($"Node {nodeName} does not have a RectTransform!"); + yield break; + } + + // 计算目标节点的目标位置，使其居中 + Vector2 targetContentPos = contentRectTransform.anchoredPosition; + targetContentPos.y = targetRectTransform.localPosition.y - scrollRect.viewport.rect.height / 2 + targetRectTransform.rect.height / 2; + + // 使用DOTween平滑移动Content + contentRectTransform.DOAnchorPos(targetContentPos, scrollDuration).SetEase(Ease.InOutQuad); + + // 使用DOTween平滑缩放目标节点 + targetRectTransform.DOScale(Vector3.one * 1.5f, scaleDuration).SetEase(Ease.OutBack); + + // 等待动画完成 + yield return new WaitForSeconds(scrollDuration); + + // 恢复目标节点的缩放 + targetRectTransform.DOScale(Vector3.one, scaleDuration).SetEase(Ease.OutBack); + + // 更新Content的LocalSize（如果内容发生变化） + //UpdateContentSize(); +} +// [YarnCommand("CenterNode")] +// public IEnumerator SmoothScrollToTarget(string name, float targetScale = 1.6f) +// { +// // 获取目标节点 +// Node newNode = GetNode(name); +// RectTransform targetRectTransform = newNode.GetComponent(); + +// // 获取 ScrollView 容器的尺寸 +// Vector2 contentSize = contentRectTransform.sizeDelta; +// Vector2 viewPortSize = scrollView.viewport.rect.size; + +// // 获取目标图像相对于 Content 的位置（局部坐标） +// Vector2 targetLocalPosition = targetRectTransform.localPosition; + +// // 先根据缩放调整目标位置 +// Vector2 targetPositionAdjusted = targetLocalPosition / contentRectTransform.localScale.x; + +// // 计算目标位置相对于 Viewport 的偏移 +// // 视口中应居中的目标位置 +// Vector2 offset = targetLocalPosition - (viewPortSize / 2); + +// // 计算滚动的目标位置 +// Vector2 targetAnchoredPosition = -offset; + +// // 使用 DOTween 执行平滑滚动和缩放 +// Sequence sequence = DOTween.Sequence(); + +// // 执行平滑滚动 +// sequence.Append(DOTween.To(() => contentRectTransform.anchoredPosition, +// x => contentRectTransform.anchoredPosition = x, +// targetAnchoredPosition, 1) +// .SetEase(Ease.InOutQuad)); // 设置滚动动画的缓动效果 + +// // 执行平滑缩放 +// sequence.Join(DOTween.To(() => contentRectTransform.localScale, +// x => contentRectTransform.localScale = x, +// Vector3.one * targetScale, 1) +// .SetEase(Ease.InOutQuad)); // 设置缩放动画的缓动效果 + +// // 等待动画结束 +// yield return sequence.WaitForCompletion(); +// } [YarnCommand("SetNodeState")] public void ActiveNodeToBoard(string nodeID,bool isactive) { diff --git a/Assets/Scripts/FixSystem/DraggableUI.cs b/Assets/Scripts/FixSystem/DraggableUI.cs index c69003109..16b7aa4dc 100644 --- a/Assets/Scripts/FixSystem/DraggableUI.cs +++ b/Assets/Scripts/FixSystem/DraggableUI.cs @@ -11,6 +11,8 @@ public class DraggableUI : MonoBehaviour,IDragHandler, IPointerDownHandler public GameObject button; + public bool isDone=false; + private void Awake() { rectTransform = GetComponent(); @@ -38,7 +40,7 @@ public class DraggableUI : MonoBehaviour,IDragHandler, IPointerDownHandler float distance = Vector3.Distance(transform.position, target.position); // 检查距离是否在范围内，并激活或禁用 Button - if (distance <= 1) + if (distance <= 1&&!isDone) { button.SetActive(true); } diff --git a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs index 3117bc844..721728477 100644 --- a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs +++ b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs @@ -56,6 +56,7 @@ public class OscilloscopeController : MonoBehaviour public GameObject heatMap; HeatMapController hm; + //public GameObject heatMapButton; void Start() { @@ -88,6 +89,7 @@ public class OscilloscopeController : MonoBehaviour public void ShowHeatMap(bool show) { heatMap.SetActive(show); + heatMap.GetComponent().isDone=false; } public void StartReduceHeat() { @@ -100,19 +102,23 @@ public class OscilloscopeController : MonoBehaviour { if(cantReduce) { + Debug.Log("降温失败"); + heatMap.GetComponent().isDone=true; yield return new WaitForSeconds(1); DialogController.Instance.StartDialogNode("降温失败"); - yield break; + yield break; } else { + Debug.Log("降温成功"); + heatMap.GetComponent().isDone=true; float duration = 2f; // 动画时长为 2 秒 - // 使用 DOTween 来动画化数值变化 yield return DOTween.To(() => HeatNum, x => HeatNum = x, 0, duration).WaitForCompletion(); DialogController.Instance.StartDialogNode("降温成功"); + // 动画完成后，数值已经降为 0，可以在这里添加进一步的逻辑 Debug.Log("Value has reached zero."); @@ -363,7 +369,7 @@ private IEnumerator ScanForError(string trimmedString) { string originalString = currentSocket.name; string trimmedString = originalString.Replace("Socket", ""); - screenText.text=trimmedString+ ":检测到异常，请寻找错误深入"; + screenText.text=trimmedString+ ":异常,拖拽滑动条，寻找波形抖动并深入"; screenText.color=Color.red; //DialogController.Instance.StartDialogNode("发现异常模块"); } From 3b5001c75e0934bcf9d0d394c8b5570dbf8cefc3 Mon Sep 17 00:00:00 2001 From: Ovid Date: Mon, 18 Nov 2024 03:22:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?yarn=E5=B0=8F=E5=B0=8F=E7=BB=86=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resources/Yarn/PeipeiNew/ClueBoard.yarn | 44 +++-- .../Resources/Yarn/PeipeiNew/PeipeiNew.yarn | 37 +++- .../Yarn/PeipeiNew2/ClueBoardDay2.yarn | 167 +++++++++++++----- .../Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn | 27 +-- 4 files changed, 194 insertions(+), 81 deletions(-) diff --git a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn index 71f6e0506..6c77c9281 100644 --- a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn @@ -9,7 +9,7 @@ position: 43,-97 <> <> <> -me: 好像不太对，我再想想 +me: 好像不太对，再想想…… <> === @@ -17,10 +17,13 @@ title: UF图像问题回答正确 tags: position: 43,-97 --- +<> +<> me: UF绘图出现的色彩问题…源自于它调用的“色彩素材”记忆。 -me: 谁能想到…这些广告画的颜色，都来自于这些意义非凡的记忆呢…… -me: 总之，在UF调用记忆的过程中除了问题。 -me: 这个记忆被“另一个来源”调用了，那就是…… +<> +<> +me: 谁能想到…这些广告画的颜色，都来自于这些意义非凡的记忆呢？ +me: 但UF无法正常调取这个记忆，因为它被“另一个来源”调用了…… <> <> === @@ -28,41 +31,46 @@ title: 记忆问题回答正确 tags: position: 49,-314 --- -me: 这个记忆还被视觉模块调用了 +<> +<> +me: 也就是视觉模块。 <> -<> -me: 这是一种罕见的症状…记忆模块种的数据逆向进入了视觉模块。 <> -<> +me: 这符合一种罕见的病症… <> -<> <> -<> +<> +<> +me: 记忆反流，即记忆模块的数据逆向进入了视觉模块。这在机体中是不被允许的。 <> me: 这似乎也就是导致佩佩会看见一部分颜色的原因。 -me: 我们对这种症状的产生原因知之甚少… +me: 可惜，我们对这种症状的产生原因知之甚少… <> - me: 这或许和佩佩看不见颜色有关系。 + me: 这或许也和佩佩看不见颜色有关系。 me: 直观地说…这像是一种代偿，“因为她看不见颜色，所以通过某种方式补偿了回来”。 me: 不过…机体医学更关心机体如何正常工作，对于它们能不能看见颜色这种小问题…探索得很少。 <> //<> -me: 总之，针对“记忆反流” ，机体医学已知的应对方案是…… <> -<> +me: 但机体医学指南对“记忆反流” ，目前已有明确推荐方案…… <> -<> <> -me: 只有这个办法，切断记忆和视觉的传输途径 +<> +<> +me: 截断记忆和视觉之间的联系，以阻止这种反流的产生。 +me: 这个手术是可逆的。而且对于已经成年的机体，这条连接被认为已经没有用处…是可以切除的。 +me: 就像过去人类体内的“蓝尾”一样…希望我没记错它的名字。 <> +me: 那么，该选择提供给佩佩的方案了…尽管看起来现在只有一种。 +//!!之后加一些可以做的事？ === title: 执行手术 tags: position: 39,149 --- -me: 记忆-视觉桥截断术。唯一的方案。 +me: 是的，记忆-视觉桥截断术。唯一的方案。 me: 这很可能代表着她可能连那些零碎的颜色都……再也看不见了…… -me: 但这应该可以解决UF需要的素材被重复调用的问题。而且，这个手术是可逆的。 +me: 但这应该可以解决UF需要的素材被重复调用的问题。 me: 无论如何，这是患者的选择了。和佩佩聊聊吧。 <> <> diff --git a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn index f817db922..ba61275e7 100644 --- a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn @@ -232,9 +232,12 @@ peipei: 生成好了。#auto_next <> <> peipei: 啊！就是这样…这就是我遇到的问题。 -<> me: 这个图片看起来确实有一问题…先放入诊疗单吧。 -me: 先深度检查一下UF吧。 +<> +<> +<> +<> +me: 那么，先深度检查一下UF吧。 peipei: 医生，技术员说这个UF…是无法检查的。 me: 无法检查？……这个你别担心。 me: 只要能把检查线插上，我就有办法读取到里面的数据。对机体医生来说这是很基本的。 @@ -341,8 +344,11 @@ tags: colorID: 6 position: -870,-2464 --- + <> -拖动波形显示下方的滑动条来“暴漏”异常波形 + me: 探针查到了缺陷波形…我需要把它找出来，才能进行深入检查。 + me: 拖动波形显示下方的滑条，直到“缺陷波形”变得最清晰，然后点击【深入】。 + <> 暴漏后点击“深入”即可深入 <> === @@ -564,7 +570,7 @@ position: -269,-733 // <> <> <> -me: 现在似乎要剪断别的模块 +me: 这不是我应该剪断的线…… <> === @@ -1081,14 +1087,18 @@ position: 2631,-843 <> <> === + + + + title: OnMemoryViewShow tags: colorID: 3 position: 2623,-1564 --- <> - me: 把左边的打孔带拖动到中间的槽位即可搜寻记忆 - me: 之后拖拽滑动条校准记忆即可 + me: 把打孔带放进插槽里，读取记忆吧。 + <> <> <> <> @@ -1104,6 +1114,21 @@ position: 2623,-1564 +title: OnMemoryInsert +tags: +colorID: 3 +position: 2623,-1564 +--- +<> + me: 需要拖动滑条，校正频率才能播放记忆… + me: 要把两个滑条都拖到正确的位置，先拖动上面这个吧。 +<> +<> +=== + + + + title: 天空 tags: colorID: 8 diff --git a/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn b/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn index 117160e94..24f721865 100644 --- a/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn +++ b/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn @@ -2,6 +2,7 @@ tags: position: -95,-631 --- +<> <> <> <> @@ -19,7 +20,7 @@ position: -95,-631 <> <> <> -me: 好像不太对，我再想想 +me: 好像不太对，再想想…… <> === @@ -30,9 +31,21 @@ title: 找到视觉检查和打孔带的联系 tags: position: -204,-329 --- +<> + <> +<> + <> +<> + <> +<> +<> me: 佩佩的视觉中出现了怪异的颜色…这和昨天看到的记忆反流情况类似，却也不同。 -me: 最直接的不同之处在于，昨天的记忆反流生成了索引向记忆的打孔带… -me: 而这一次却生成了一张奇怪的打孔带，这意味着数据的来源却和昨天的不一样。 +me: 最直接的不同之处在于…… +<> +<> +<> +me: 这一次输出的打孔带…是我没有见过的形制。至少和昨天产生的记忆打孔带不同。 +me: 这至少意味着数据的来源却和昨天的不一样。 <> === @@ -43,14 +56,23 @@ title: 试图安装UF中的晶圆 tags: position: -204,-329 --- +<> +<> me: UF模块内部就有一个色觉晶圆。 -me: 这很有可能也就是佩佩自己的色觉晶圆，而现在我可以把它装回原来的位置。 +me: 这很有可能也就是佩佩自己的色觉晶圆，而现在…… +<> +me: 我可以把它装回原来的位置。 me: 但是UF的正常工作似乎依赖这个晶圆…… +<> me: 如果移除这个晶圆，佩佩的UF也就不可能正常工作了。 <> <> -me: 很遗憾，这可能不是一个选项。 +<> +<> +<> +me: 患者的主诉是“希望解决UF绘图问题”…拿走就晶圆无法解决这个问题。 <> + === @@ -60,7 +82,9 @@ title: UF发热原因找到 tags: position: -204,-329 --- -me: 看来就是这个持续运行的“自动学习”进程导致了持续的发热。 +<> +<> +me: 看来就是这个持续运行的“自动图像处理”进程导致了持续的发热。 me: 它在不断地将记忆转化成AI处理过的图像，然后再从中提取色彩…… //me: 这个持续的AI学习进程使UF保持高负荷运转…造成了发热。 @@ -79,8 +103,13 @@ tags: position: 568,-327 --- me: 这恐怕是这里最简单的问题了…但也是最无法解决的。 -me: 佩佩的色觉晶圆缺失，导致了佩佩看不到色彩。 -me: 不过…色觉晶圆的下落，我似乎也找到了。 +<> +<> +<> +me: 佩佩的色觉晶圆缺失…… +<> +me: 导致了佩佩看不到色彩。 + <> === @@ -91,6 +120,8 @@ title: UF绘图错误原因找到 tags: position: 40,-327 --- +<> +<> me: 正是这个无法停止的“自动学习”进程扰乱了UF的绘图进程… me: 它在不断从记忆模块索取素材，最终导致绘图进程读取了多余的错误素材。 //me: 可是这个发出指令的“未知进程”到底又是啥呢…… @@ -105,7 +136,11 @@ title: 找到晶圆来源 tags: position: -422,-322 --- +<> +<> me: 原来晶圆是被放在UF中了，并不是先天缺陷…… +<> +<> me: 这都是技术部那帮人做的吗……可是为什么呢？ <> === @@ -117,8 +152,15 @@ title: 找到UF打孔带来源 tags: position: 311,-334 --- +<> +<> me: 这些打孔带竟然是索引向UF的。 -me: 也就是说，UF正在从记忆中获取素材，再传递给视觉。 +<> +<> +me: 也就是说，UF正在从记忆中获取素材…… +<> +<> +me: 再传递给视觉。 me: 这就是佩佩看到诡异颜色的原因…… <> <> @@ -133,26 +175,44 @@ tags: position: 154,-41 --- <> +me: 这太诡异了…是什么在让UF不断地重复这个进程？ <> +<> +<> <> +me: 像是存在一个另外的神秘未知进程在扰乱他。 +<> +<> <> -me: 这太诡异了…… <> -<> -me: 看起来像是存在一个另外的神秘未知进程… -me: 正在让佩佩的视觉，尝试重新够着记忆，从中提取色彩。 -<> -<> +<> +me: 或者说… +<> +<> +me: 它在让佩佩的视觉… +<> +<> +me: 发起穿过一连串模块的请求…… +<> +<> +<> +<> +me: 去尝试重新够着记忆，从中提取色彩。 me: 也就是说，这个神秘进程在尝试重新“色彩反流”。 -me: 所以它尝试重新建立一条新的通路，穿过UF，从记忆向视觉传输数据。 +<> +<> +me: 直接通路已经断了，所以记忆只能穿过UF，向视觉传输数据。 me: 可这是为什么呢？ <> <> -me: 就像佩佩的头脑深处有什么东西，不适应所看到的黑白，拼命地想要将记忆中的色彩传给视觉…… +<> +me: 佩佩的头脑深处的这个神秘进程，像是不适应所看到的黑白，拼命地想要将记忆中的色彩传给视觉…… +<> +me: 这个神秘进程…到底是什么？ +<> <> <> peipei: 你是说…想象力吗？医生。 -<> <> //<> <> @@ -168,55 +228,67 @@ tags: position: 552,-51 --- me: 来重新梳理一下…… +<> +<> me: 由于色觉晶圆的缺失，佩佩失去了色觉。 -me: 这却异常地激发了她的想象力……想要通过记忆的色彩，来填补视觉中的黑白。 +<> +<> +me: 视觉的黑白和记忆中的色彩形成了剧烈的反差… <> +<> <> -<> -me: 能够拿得到颜色的地方只有记忆了，但现在，视觉记忆之间的通路却被切断了。 -me: 于是“想象力”去借助UF来传递…… -//<> -<> +<> +me: 这刺激了她的想象力。 +me: 它通过记忆的色彩，来填补视觉中的黑白……这就是她看见的那些色彩。 <> -<> +<> +me: 但现在，视觉记忆之间的通路却被切断了。 +<> +me: 于是“想象力”只能通过新的线路传递…所以它找到了UF模块中的通路。 +me: 这扰乱了UF，导致了“自动图像生成”进程的不断运行。 +<> +<> me: 所以这个神秘进程…就是想象力。 -me: 发热也好，眼睛痛也好，这些都符合我所知的一种神秘的综合征…… +me: 可惜…在机体医学里，想象力并不是一种可以被诊断的东西。 +me: 它所导致的一系列问题……怪异的颜色，到处乱跑的进程，发热，眼睛痛…… +<> +me: 在机体医学领域，其实都属于一种臭名昭著的疑难杂症—— +<> +<> +<> +<> me: 幻痛。 <> <> -me: 因为无法适应失去的颜色，而产生的幻痛…… -<> -<> -<> -<> -<> -<> -me: 想要停止幻痛，就要让佩佩的视觉和记忆中的色彩对齐。要么让记忆失去颜色，要么让视觉出现颜色。 -me: 一种思路是，让佩佩能够看到颜色。 -me: 如果能看到颜色，当然也就不存在幻痛了。 -me: 可是如果要让视觉出现颜色，就必须要一个色觉晶圆…但是这个晶圆已经被UF占用了。 -<> +me: 因为无法适应失去的颜色，被认为是承受能力薄弱才产生的幻痛…… +me: 想要停止幻痛，就要让佩佩的视觉和记忆中的色彩一致。 +<> +<> <> +<> +me: 也就是说…要么让记忆失去颜色，要么让视觉出现颜色。 <> -<> -<> +<> +<> +<> +me: 方案一，安装晶圆。让佩佩能够看到颜色，当然也就不存在幻痛了。 <> -me: 可是这存在一个前置问题…… +me: 但这存在一个前置问题…… me: 晶圆是严格管制品，外部不可能找得到。该从哪弄一个晶圆来呢…… <> <> -me: 另一种可能的方案是彻底去除色彩…… -me: 对佩佩所渴求的记忆中的颜色，进行抹除。 -me: 不再有所渴求，也就不再会痛了。 -<> +<> +<> +me: 方案二，对记忆进行色彩抹除。不记得有任何色彩…也就不再会痛了。 <> <> ///这里怎么理解UF里的色觉？UF有色觉为么还要调用记忆的色彩？引导？感觉有点难理解，记忆抹除为什么不影响UF？就算不影响，需要担心UF的色彩泄露么 -me: 只是这… +me: 只是这…真的是我作为一个医生…该做的吗？ <> <> me: 现在…要么想办法解决晶圆来源的问题… -me: 要么，就只剩下色彩抹除这一个方案了吗？ +me: 要么，就只剩下色彩抹除这一个方案了。 +me: 选择可行的方案，提供给佩佩吧…… //<> //<> === @@ -228,6 +300,7 @@ position: 154,-41 me: 是的…这恐怕是唯一的方案…… me: 如果给佩佩安装色觉晶圆，发热是解决了，但绘图问题就会变得更糟…UF甚至会无法运行了。 me: 如果执行色彩抹除…… +<> me: 如果佩佩从没见过颜色……她也就没办法想象颜色了。 me: 对她来说，世界本来就是黑白的，夕阳、绿叶…… <> diff --git a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn index 9cda1a9fc..816211a3c 100644 --- a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn +++ b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn @@ -134,7 +134,7 @@ me: 佩佩？这么快就回来了…这不是预约的复诊时间。 <> <> peipei: 搞砸了…工作…搞砸了…… -peipei: 医生，我的工作完了……我肯定会进PIP 的。 +peipei: 医生，我的工作完了……我肯定会被回收 的。 me: 发生了什么？ <> <> @@ -160,7 +160,7 @@ peipei: 总之…我赶紧又试了一张，还是一样的情况…… peipei: 下一张也有错误…#auto_next peipei: 再下一张也有错误…… peipei: 我完了…我真的要完了……#auto_next -peipei: 我已经在这张画上耽误了太久…后边的任务我要怎么完成？如果这次任务不能完成，我很有可能就会进PIP，再也没有人需要我#auto_next +peipei: 我已经在这张画上耽误了太久…后边的任务我要怎么完成？如果这次任务不能完成，我很有可能就会被回收#auto_next me: 你真的太紧张了。 peipei: 我能怎么办？我的工作要完不成了！我要被回收了…… peipei: 我的头好痛…… @@ -251,11 +251,14 @@ peipei: 但是我可以…… peipei: 医生…你看……就是这样…… // <> me: 昨天是缺失一些素材，今天…好像反过来…… -me: 多了一些不该有的东西 +me: 多了一些不该有的东西。 +<> +<> <> -peipei: 不行了…我的头…痛的厉害…… -me: 怪事越来越多了。而且佩佩现在的状况开起来非常糟糕。 -me: 事不宜迟，开始诊疗吧。 +<> +me: 怪事越来越多了…… +peipei: 不行了…我的头…痛的厉害。 +me: 佩佩现在的状况看起来非常不好…赶紧开始诊疗吧。 <> <> === @@ -499,7 +502,7 @@ peipei: 该怎么做才能停止想象？我不明白。 me: 你是你自己的主人，无论是你的想象力还是你的UF，不要被它们干扰。 peipei: 呼…好的，保持专注…… ->让佩佩紧张起来 - me: 这很重要，佩佩。你不想要被抹除想象，你也不想要进PIP ，对吧？ + me: 这很重要，佩佩。你不想要被抹除想象，你也不想要被回收 ，对吧？ peipei: 我不想……我不知道。医生。我只是害怕…… me: 现在只有你自己能做到这件事情，只有你自己才能救你自己。 peipei: 你说得对，医生。 @@ -2023,11 +2026,15 @@ peipei: 我有一个请求。 me: 什么？ peipei: 既然已经拆除了UF… peipei: 就请再帮我把我的晶圆装上去吧。 -me: 但UF怎么办？ -peipei: 别担心…这只是暂时的。 -peipei: 我只是想重新看看这个世界… +me: 你是说，你还是想把晶圆装上吗？但UF怎么办？这是不能解决绘图的问题的。 +peipei: 别担心…这只是暂时的，我最后会回来做色彩抹除的。 +peipei: 我只是想重新看看这个世界……就…只是看看。 peipei: 现在几点了？我能赶上夕阳吗？ me: 你想离开这里？ +<> +<> +me: 你知道的…如果擅自一直不装uf还旷工，公司肯定不会放过你的。 +me: 你知道后果会是什么… peipei: 我不会走远的…… peipei: 幸福市太小了…你知道我们走不掉。 peipei: 我会回来做那个记忆初始化的。 From 35266075a2332863a2dd6c027850368a76335a3b Mon Sep 17 00:00:00 2001 From: Ovid Date: Mon, 18 Nov 2024 03:42:22 +0800 Subject: [PATCH 3/3] debug --- .../Resources/Yarn/PeipeiNew/ClueBoard.yarn | 2 +- .../Resources/Yarn/PeipeiNew/PeipeiNew.yarn | 2 +- .../Yarn/PeipeiNew2/ClueBoardDay2.yarn | 1 - .../Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn | 2 +- Assets/Scenes/Persistence.unity | 434 +++++++++--------- 5 files changed, 220 insertions(+), 221 deletions(-) diff --git a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn index 6c77c9281..4fd1e6a4c 100644 --- a/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/ClueBoard.yarn @@ -19,7 +19,7 @@ position: 43,-97 --- <> <> -me: UF绘图出现的色彩问题…源自于它调用的“色彩素材”记忆。 +me: UF绘图出现的色彩问题…源自于它引用的“色彩素材”，也就是佩佩的一段记忆。 <> <> me: 谁能想到…这些广告画的颜色，都来自于这些意义非凡的记忆呢？ diff --git a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn index ba61275e7..a5b60ffb6 100644 --- a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn @@ -232,7 +232,7 @@ peipei: 生成好了。#auto_next <> <> peipei: 啊！就是这样…这就是我遇到的问题。 -me: 这个图片看起来确实有一问题…先放入诊疗单吧。 +me: 这个图片的色彩看起来确实很奇怪…先放入诊疗单吧。 <> <> <> diff --git a/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn b/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn index 24f721865..96e7d2c1e 100644 --- a/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn +++ b/Assets/Resources/Yarn/PeipeiNew2/ClueBoardDay2.yarn @@ -2,7 +2,6 @@ tags: position: -95,-631 --- -<> <> <> <> diff --git a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn index 816211a3c..1fe5f02c1 100644 --- a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn +++ b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn @@ -252,7 +252,7 @@ peipei: 医生…你看……就是这样…… // <> me: 昨天是缺失一些素材，今天…好像反过来…… me: 多了一些不该有的东西。 -<> +<> <> <> <> diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 0dc5c7ddf..ab5241958 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -483,30 +483,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 639620682} m_Modifications: - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -731,6 +707,30 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -3536,30 +3536,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 639620682} m_Modifications: - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 121bb6da-9055-40a5-ae33-05be2ec09f54 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3c0ead6f-afd4-41bf-968d-0d36f758e232 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 6b671834-73b4-403d-94d3-0726554589ee - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -3740,6 +3716,30 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 121bb6da-9055-40a5-ae33-05be2ec09f54 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3c0ead6f-afd4-41bf-968d-0d36f758e232 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 6b671834-73b4-403d-94d3-0726554589ee + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4321,30 +4321,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 639620682} m_Modifications: - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 121bb6da-9055-40a5-ae33-05be2ec09f54 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3c0ead6f-afd4-41bf-968d-0d36f758e232 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 6b671834-73b4-403d-94d3-0726554589ee - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -4509,6 +4485,30 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 121bb6da-9055-40a5-ae33-05be2ec09f54 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3c0ead6f-afd4-41bf-968d-0d36f758e232 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 6b671834-73b4-403d-94d3-0726554589ee + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -5158,30 +5158,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 639620682} m_Modifications: - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3336344b-f73d-481c-bd5a-548f8a4bead4 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: ddd9082f-516c-4e2f-bd55-78c29857f972 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -5374,6 +5350,30 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3336344b-f73d-481c-bd5a-548f8a4bead4 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: ddd9082f-516c-4e2f-bd55-78c29857f972 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -6308,30 +6308,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 639620682} m_Modifications: - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -6556,6 +6532,30 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -8819,30 +8819,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 639620682} m_Modifications: - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3336344b-f73d-481c-bd5a-548f8a4bead4 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: ddd9082f-516c-4e2f-bd55-78c29857f972 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9035,6 +9011,30 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 65545b51-845c-4df4-8f5c-90c1f04cbe23 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3336344b-f73d-481c-bd5a-548f8a4bead4 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: ddd9082f-516c-4e2f-bd55-78c29857f972 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 7940112695066571942, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -9375,30 +9375,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 639620682} m_Modifications: - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -9525,7 +9501,7 @@ PrefabInstance: objectReference: {fileID: 380148808} - target: {fileID: 2651560808168083272, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_text - value: "\u4EC0\u4E48\u5BFC\u81F4\u4E86UF\u7684\u7ED8\u56FE\u9519\u8BEF\uFF1F\n" + value: "UF\u5F15\u7528\u7684\u7D20\u6750\u6765\u81EA\u4E8E\u4EC0\u4E48\u6A21\u5757\uFF1F" objectReference: {fileID: 0} - target: {fileID: 4705676358770684524, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_AnchoredPosition.y @@ -9607,6 +9583,30 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -11266,30 +11266,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 639620682} m_Modifications: - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 121bb6da-9055-40a5-ae33-05be2ec09f54 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 3c0ead6f-afd4-41bf-968d-0d36f758e232 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 6b671834-73b4-403d-94d3-0726554589ee - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -11454,6 +11430,30 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 121bb6da-9055-40a5-ae33-05be2ec09f54 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 3c0ead6f-afd4-41bf-968d-0d36f758e232 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 6b671834-73b4-403d-94d3-0726554589ee + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -12780,30 +12780,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 639620682} m_Modifications: - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 67e03198-f3fa-40e3-88ca-042210787447 - objectReference: {fileID: 0} - - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 - objectReference: {fileID: 0} - - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: _sID - value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 - objectReference: {fileID: 0} - - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} - propertyPath: graphManager - value: - objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} - target: {fileID: 23699057384935269, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -13028,6 +13004,30 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 67e03198-f3fa-40e3-88ca-042210787447 + objectReference: {fileID: 0} + - target: {fileID: 973112152669269883, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 39cf0bb1-4276-40ca-8336-c91048fb4ba1 + objectReference: {fileID: 0} + - target: {fileID: 1496828829037596491, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: _sID + value: 27840e3a-f0c8-4ee8-a048-4e57774c3376 + objectReference: {fileID: 0} + - target: {fileID: 8404161828147755465, guid: 5a170c0b6c933c540a86be691fa6745c, type: 3} + propertyPath: graphManager + value: + objectReference: {fileID: 3728315363019128986, guid: c998a63bd211990449fe9bb1f2832e3d, type: 3} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: