From ff1b00d37c2af75fe969656b6e3756ba05d63425 Mon Sep 17 00:00:00 2001 From: bottlefish <781230111@qq.com> Date: Thu, 14 Nov 2024 07:44:14 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=83=AD=E5=8A=9F=E8=83=BD=E5=AE=8C?= =?UTF-8?q?=E6=88=90=EF=BC=8C=E8=AF=95=E5=9B=BE=E7=BB=99=E6=89=93=E5=AD=94?= =?UTF-8?q?=E5=B8=A6=E5=8A=A0=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Prefabs/PunchTape.prefab | 212 +++++ .../Prototype/佩佩/Scripts/MemoryProcess.cs | 16 +- Assets/Prototype/佩佩/佩佩视觉模块.unity | 830 ++++++++---------- .../WenQuanYi Bitmap Song 14px SDF.asset | 2 +- Assets/Resources/SceneSO/PeipeiDay1.asset | 2 +- Assets/Resources/SceneSO/PeipeiDay2.asset | 2 +- .../Resources/Yarn/PeipeiNew/PeipeiNew.yarn | 5 +- .../Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn | 2 +- Assets/Scripts/Clue/ClueBaordNew.cs | 9 +- Assets/Scripts/Clue/ClueItem.cs | 5 + Assets/Scripts/Clue/FavoritesManager.cs | 5 + Assets/Scripts/Clue/MemoryClueSlot.cs | 4 +- .../Scripts/Dialog System/DialogController.cs | 7 + Assets/Scripts/FixSystem/DraggableUI.cs | 52 ++ Assets/Scripts/FixSystem/DraggableUI.cs.meta | 11 + .../FixSystem/HeatMap/HeatMapController.cs | 65 +- .../FixSystem/Scope/OscilloscopeController.cs | 63 +- 17 files changed, 770 insertions(+), 522 deletions(-) create mode 100644 Assets/Scripts/FixSystem/DraggableUI.cs create mode 100644 Assets/Scripts/FixSystem/DraggableUI.cs.meta diff --git a/Assets/Prefabs/PunchTape.prefab b/Assets/Prefabs/PunchTape.prefab index d31d8dfa9..06dc4243a 100644 --- a/Assets/Prefabs/PunchTape.prefab +++ b/Assets/Prefabs/PunchTape.prefab @@ -165,6 +165,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7258487465795527054} + - {fileID: 5895421642722728367} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -200,6 +201,217 @@ MonoBehaviour: clueImageUI: {fileID: 0} categoryText: {fileID: 6752808136549648365} nameText: {fileID: 1936171647708474621} + finished: {fileID: 3491718056792811219} +--- !u!1 &3491718056792811219 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5895421642722728367} + - component: {fileID: 3987412774124949389} + - component: {fileID: 7089785832902015332} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &5895421642722728367 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491718056792811219} + 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: + - {fileID: 1079140377179986774} + m_Father: {fileID: 336632692385338071} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 75.84277, y: 0} + m_SizeDelta: {x: 151.6855, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3987412774124949389 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491718056792811219} + m_CullTransparentMesh: 1 +--- !u!114 &7089785832902015332 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3491718056792811219} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5908319379106464382 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1079140377179986774} + - component: {fileID: 4164341087811203602} + - component: {fileID: 2249358862491167212} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1079140377179986774 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5908319379106464382} + 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: 5895421642722728367} + 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: 46, y: -13} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4164341087811203602 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5908319379106464382} + m_CullTransparentMesh: 1 +--- !u!114 &2249358862491167212 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5908319379106464382} + 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: "\u5DF2\u67E5\u770B" + 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: 36 + m_fontSizeBase: 36 + 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, z: 0, 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!1 &7391900425371338666 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs index 2fb360dec..f1367fb48 100644 --- a/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs +++ b/Assets/Prototype/佩佩/Scripts/MemoryProcess.cs @@ -330,14 +330,14 @@ public IEnumerator PlayMemory(bool useYarn=false,string memName="") // yield break; // } - if (processedPunchTapes.TryGetValue(punchTape, out bool isProcessed) && isProcessed) - { - Sprite memorySprite1 = Resources.Load("Art/Memory/" + PunchTape.MemoryIndex); - memoryFinishedImage.sprite = memorySprite1; - memoryFinishedImageNoColor.sprite = memorySprite1; - PlayMemory(); - yield break; - } + // if (processedPunchTapes.TryGetValue(punchTape, out bool isProcessed) && isProcessed) + // { + // Sprite memorySprite1 = Resources.Load("Art/Memory/" + PunchTape.MemoryIndex); + // memoryFinishedImage.sprite = memorySprite1; + // memoryFinishedImageNoColor.sprite = memorySprite1; + // PlayMemory(); + // yield break; + // } AudioManager.PauseMemoryAudio(); if (isProcessing) diff --git a/Assets/Prototype/佩佩/佩佩视觉模块.unity b/Assets/Prototype/佩佩/佩佩视觉模块.unity index 52245779d..cbc38ac76 100644 --- a/Assets/Prototype/佩佩/佩佩视觉模块.unity +++ b/Assets/Prototype/佩佩/佩佩视觉模块.unity @@ -875,7 +875,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &18925489 RectTransform: m_ObjectHideFlags: 0 @@ -10558,12 +10558,12 @@ GameObject: - component: {fileID: 412531435} - component: {fileID: 412531436} m_Layer: 5 - m_Name: heatMap + m_Name: heatMapController m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &412531435 RectTransform: m_ObjectHideFlags: 0 @@ -10575,15 +10575,12 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 870118639} - - {fileID: 757754523} - - {fileID: 1257460298} + m_Children: [] m_Father: {fileID: 1022441798} 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.75, y: 0.84} + m_AnchoredPosition: {x: -4.23, y: -2.68} m_SizeDelta: {x: 3, y: 3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &412531436 @@ -10607,14 +10604,10 @@ MonoBehaviour: - {fileID: 2077058953} - {fileID: 157256356} - {fileID: 1838506079} - slider: {fileID: 96266211} - tempNumMax: 0 uf: 1 back: 0.47 module: 0.5 - xSlider: {fileID: 757754525} - ySlider: {fileID: 1796664513} - targetObject: {fileID: 1257460298} + heatMap: {fileID: 0} --- !u!1 &420385001 GameObject: m_ObjectHideFlags: 0 @@ -18427,22 +18420,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!224 &757754523 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - m_PrefabInstance: {fileID: 1387332055} - m_PrefabAsset: {fileID: 0} ---- !u!114 &757754525 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3083274347408712454, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - m_PrefabInstance: {fileID: 1387332055} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &759325038 GameObject: m_ObjectHideFlags: 0 @@ -20561,212 +20538,140 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &870118638 -PrefabInstance: +--- !u!1 &869951691 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 412531435} - m_Modifications: - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_text - value: 2 - objectReference: {fileID: 0} - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_isOrthographic - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 3083274345868045373, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 64.903 - objectReference: {fileID: 0} - - target: {fileID: 3083274345868045373, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: 32.452 - objectReference: {fileID: 0} - - target: {fileID: 3083274345906872068, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 64.91 - objectReference: {fileID: 0} - - target: {fileID: 3083274345906872068, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: 32.45 - objectReference: {fileID: 0} - - target: {fileID: 3083274346940298101, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 54.9 - objectReference: {fileID: 0} - - target: {fileID: 3083274346940298101, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: 37.45503 - objectReference: {fileID: 0} - - target: {fileID: 3083274347254332314, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3083274347384374709, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.x - value: 0.087 - objectReference: {fileID: 0} - - target: {fileID: 3083274347384374709, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712451, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_Name - value: Yslider - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 461.3849 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalScale.x - value: 0.016424116 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalScale.y - value: 0.016424116 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalScale.z - value: 0.016424114 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalRotation.z - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: -4.087571 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.y - value: -1.2423584 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712454, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_Value - value: 0.87 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712454, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_MinValue - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712454, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_WholeNumbers - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4250824246860155685, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4250824246860155685, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9073318458624755705, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.x - value: 0.087 - objectReference: {fileID: 0} - - target: {fileID: 9073318458624755705, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9073318458624755705, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMin.x - value: 0.087 - objectReference: {fileID: 0} - - target: {fileID: 9073318458624755705, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 30 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} ---- !u!224 &870118639 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - m_PrefabInstance: {fileID: 870118638} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 869951692} + - component: {fileID: 869951694} + - component: {fileID: 869951693} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &869951692 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869951691} + 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: 1613608979} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &869951693 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869951691} + 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: "\u964D\u6E29" + 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: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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.6 + m_fontSizeBase: 0.6 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + 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, z: 0, 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 &869951694 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 869951691} + m_CullTransparentMesh: 1 --- !u!1 &876146510 GameObject: m_ObjectHideFlags: 0 @@ -23457,7 +23362,9 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1637660640} + - {fileID: 1384609859} - {fileID: 412531435} + - {fileID: 1257460298} m_Father: {fileID: 2027266814} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -23744,6 +23651,8 @@ MonoBehaviour: - {fileID: 1022441799} - {fileID: 1323307887} - {fileID: 1108670795} + isClueBoardIn: 0 + isDeepViewIn: 0 --- !u!1 &1076377841 GameObject: m_ObjectHideFlags: 0 @@ -25569,6 +25478,7 @@ MonoBehaviour: checkLine: {fileID: 0} DeepInButton: {fileID: 486116303} screenText: {fileID: 2027094973} + heatMap: {fileID: 1257460297} --- !u!1 &1138631437 GameObject: m_ObjectHideFlags: 0 @@ -28006,13 +27916,14 @@ GameObject: - component: {fileID: 1257460298} - component: {fileID: 1257460300} - component: {fileID: 1257460299} + - component: {fileID: 1257460301} m_Layer: 5 m_Name: movement m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1257460298 RectTransform: m_ObjectHideFlags: 0 @@ -28025,12 +27936,13 @@ RectTransform: m_LocalScale: {x: 1.3119445, y: 1.3119445, z: 1.3119445} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1613608979} - {fileID: 1698543278} - m_Father: {fileID: 412531435} + m_Father: {fileID: 1022441798} 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.58, y: 2.16} + m_AnchoredPosition: {x: -2.49, y: -2.18} m_SizeDelta: {x: 2.5, y: 2.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1257460299 @@ -28046,7 +27958,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0.37998462, b: 0.6792453, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -28071,6 +27983,20 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1257460297} m_CullTransparentMesh: 1 +--- !u!114 &1257460301 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1257460297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b5082f03abebb04bb4a916aa64579dc, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 1384609859} + button: {fileID: 1613608978} --- !u!1 &1259092914 GameObject: m_ObjectHideFlags: 0 @@ -31518,207 +31444,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1383513208} m_CullTransparentMesh: 1 ---- !u!1001 &1387332055 -PrefabInstance: +--- !u!1 &1384609858 +GameObject: m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 412531435} - m_Modifications: - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_text - value: 2.4 - objectReference: {fileID: 0} - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_fontAsset - value: - objectReference: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_isOrthographic - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_sharedMaterial - value: - objectReference: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - - target: {fileID: -8713033806019478243, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_TextStyleHashCode - value: -1183493901 - objectReference: {fileID: 0} - - target: {fileID: 3083274345868045373, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 64.903 - objectReference: {fileID: 0} - - target: {fileID: 3083274345868045373, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: 32.452 - objectReference: {fileID: 0} - - target: {fileID: 3083274345906872068, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 64.91 - objectReference: {fileID: 0} - - target: {fileID: 3083274345906872068, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: 32.45 - objectReference: {fileID: 0} - - target: {fileID: 3083274346940298101, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 54.9 - objectReference: {fileID: 0} - - target: {fileID: 3083274346940298101, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: 37.45503 - objectReference: {fileID: 0} - - target: {fileID: 3083274347254332314, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3083274347384374709, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.x - value: 0.047500014 - objectReference: {fileID: 0} - - target: {fileID: 3083274347384374709, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712451, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_Name - value: Xslider - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 500 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.y - value: 80 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalScale.x - value: 0.016424114 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalScale.y - value: 0.016424114 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalScale.z - value: 0.016424114 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.15171874 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.y - value: -5.0863523 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712452, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712454, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_Value - value: 2.38 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712454, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_MinValue - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3083274347408712454, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_WholeNumbers - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4250824246860155685, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4250824246860155685, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9073318458624755705, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.x - value: 0.047500014 - objectReference: {fileID: 0} - - target: {fileID: 9073318458624755705, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9073318458624755705, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_AnchorMin.x - value: 0.047500014 - objectReference: {fileID: 0} - - target: {fileID: 9073318458624755705, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - propertyPath: m_SizeDelta.x - value: 30 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1384609859} + - component: {fileID: 1384609862} + - component: {fileID: 1384609860} + m_Layer: 5 + m_Name: Target + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1384609859 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1384609858} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.3119445, y: 1.3119445, z: 1.3119445} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1022441798} + 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: -4.04, y: 0.59} + m_SizeDelta: {x: 2.5, y: 2.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1384609860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1384609858} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0.37998462, b: 0.6792453, a: 0} + m_RaycastTarget: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 55ae56902b371f740a2cefc9b4abe4c9, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1384609862 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1384609858} + m_CullTransparentMesh: 1 --- !u!1 &1389499994 GameObject: m_ObjectHideFlags: 0 @@ -33429,14 +33229,10 @@ MonoBehaviour: - {fileID: 2077058953} - {fileID: 157256356} - {fileID: 0} - slider: {fileID: 96266211} - tempNumMax: 0 uf: 1 back: 1 module: 0.7 - xSlider: {fileID: 0} - ySlider: {fileID: 0} - targetObject: {fileID: 0} + heatMap: {fileID: 0} --- !u!1 &1543897234 GameObject: m_ObjectHideFlags: 0 @@ -35354,6 +35150,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1611855636} m_CullTransparentMesh: 1 +--- !u!1 &1613608978 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1613608979} + - component: {fileID: 1613608982} + - component: {fileID: 1613608981} + - component: {fileID: 1613608980} + m_Layer: 5 + m_Name: Button + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1613608979 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613608978} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.76222736, y: 0.76222736, z: 0.76222736} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 869951692} + m_Father: {fileID: 1257460298} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: 0, y: -0.18} + m_SizeDelta: {x: 0, y: 1} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1613608980 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613608978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1613608981} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1132009647} + m_TargetAssemblyTypeName: OscilloscopeController, Assembly-CSharp + m_MethodName: StartReduceHeat + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1613608981 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613608978} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1613608982 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1613608978} + m_CullTransparentMesh: 1 --- !u!1 &1614854968 GameObject: m_ObjectHideFlags: 0 @@ -37458,14 +37387,10 @@ MonoBehaviour: - {fileID: 2077058953} - {fileID: 157256356} - {fileID: 1838506079} - slider: {fileID: 96266211} - tempNumMax: 0 uf: 1 back: 0.47 module: 0.5 - xSlider: {fileID: 0} - ySlider: {fileID: 0} - targetObject: {fileID: 0} + heatMap: {fileID: 0} --- !u!212 &1698543282 SpriteRenderer: m_ObjectHideFlags: 0 @@ -40828,17 +40753,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1795052669} m_CullTransparentMesh: 1 ---- !u!114 &1796664513 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3083274347408712454, guid: ccb05abfadf2adb40913f92c0327f4fc, type: 3} - m_PrefabInstance: {fileID: 870118638} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1813954927 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset index 5b7285d6b..d3e333615 100644 --- a/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset +++ b/Assets/Resources/Prefabs/FontAsset/WenQuanYi Bitmap Song 14px SDF.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:45fda4044f22cda28d02790957ba8bb5933b36dd5e72ceaa59c8adbd6b1a5af3 +oid sha256:5a4239c60be5b5782b38e76e44e5656f8c370173d68ba76120595feaf097a95a size 70545617 diff --git a/Assets/Resources/SceneSO/PeipeiDay1.asset b/Assets/Resources/SceneSO/PeipeiDay1.asset index 14b3391b5..0e22fbd90 100644 --- a/Assets/Resources/SceneSO/PeipeiDay1.asset +++ b/Assets/Resources/SceneSO/PeipeiDay1.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: PeipeiDay1 m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: ff82a99e791be3e41acf40232f908eb3, type: 2} - yarnProject: {fileID: 7545569452688597077, guid: 34379f39eb8152f44bdf9afb5f5191bb, type: 3} + yarnProject: {fileID: 7545569452688597077, guid: e89d8d89ace424b448a34cd42bb14362, type: 3} isEndOfDay: 1 diff --git a/Assets/Resources/SceneSO/PeipeiDay2.asset b/Assets/Resources/SceneSO/PeipeiDay2.asset index 2e01a94ea..e2e55ba4a 100644 --- a/Assets/Resources/SceneSO/PeipeiDay2.asset +++ b/Assets/Resources/SceneSO/PeipeiDay2.asset @@ -13,5 +13,5 @@ MonoBehaviour: m_Name: PeipeiDay2 m_EditorClassIdentifier: nextScene: {fileID: 11400000, guid: 9e3b2c77ad4a9454188d458da2cf0ddd, type: 2} - yarnProject: {fileID: 7545569452688597077, guid: 1849ba7c0eb4afb48907f3e5e6a7e37b, type: 3} + yarnProject: {fileID: 7545569452688597077, guid: 8cba3ebad5f1b7a4ca781f90f5bc2ddd, type: 3} isEndOfDay: 1 diff --git a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn index 209af2890..c126cb957 100644 --- a/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn +++ b/Assets/Resources/Yarn/PeipeiNew/PeipeiNew.yarn @@ -4,7 +4,7 @@ colorID: 8 position: 242,-2378 --- //<> -<> +//<> <> 本demo为早期验证版本，其中文本，交互，画面,声音均为过程版 如果遇到bug或困扰，请随在玩家群325268983中反馈 @@ -101,6 +101,7 @@ position: 244,-1783 --- //分支剧情的初始化 （敲门声） +<> <> ???: 医生？我…可以进来吗？ me: 当然。 @@ -534,7 +535,7 @@ peipei: 再见…… <> me: 希望这代价是值得的。 <> -<> +<> === diff --git a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn index df275af0f..da86c7f50 100644 --- a/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn +++ b/Assets/Resources/Yarn/PeipeiNew2/PeipeiNew2.yarn @@ -6,7 +6,7 @@ position: 240,-2240 //<> 新闻:balabalabala // <> - <> + //<> //<> === title: VarsInit diff --git a/Assets/Scripts/Clue/ClueBaordNew.cs b/Assets/Scripts/Clue/ClueBaordNew.cs index 4c88f74cd..f28b3794e 100644 --- a/Assets/Scripts/Clue/ClueBaordNew.cs +++ b/Assets/Scripts/Clue/ClueBaordNew.cs @@ -49,6 +49,10 @@ public class ClueBaordNew : MonoBehaviour { node.gameObject.SetActive(true); } + foreach(Node node in Day2InitnodeLists) + { + node.gameObject.SetActive(false); + } } if(day==2) @@ -57,7 +61,10 @@ public class ClueBaordNew : MonoBehaviour { node.gameObject.SetActive(true); } - + foreach(Node node in Day1InitnodeLists) + { + node.gameObject.SetActive(false); + } } } diff --git a/Assets/Scripts/Clue/ClueItem.cs b/Assets/Scripts/Clue/ClueItem.cs index 38a2513d2..cdf8dc3d2 100644 --- a/Assets/Scripts/Clue/ClueItem.cs +++ b/Assets/Scripts/Clue/ClueItem.cs @@ -9,8 +9,13 @@ public class ClueItem : MonoBehaviour public TMP_Text categoryText; public TMP_Text nameText; + [HideInInspector] + public bool used=false; + private Clue clueData; + public GameObject finished; + public void Setup(Clue clue) { clueData = clue; diff --git a/Assets/Scripts/Clue/FavoritesManager.cs b/Assets/Scripts/Clue/FavoritesManager.cs index 5db3c6564..0cbd58b1f 100644 --- a/Assets/Scripts/Clue/FavoritesManager.cs +++ b/Assets/Scripts/Clue/FavoritesManager.cs @@ -134,9 +134,14 @@ public class FavoritesManager : MonoBehaviour // 设置 ClueItem 和 ClueInteraction clueItem = clueItemGO.GetComponent(); + clueInteraction = clueItemGO.GetComponent(); clueItem.Setup(clue); clueInteraction.SetIsFavorited(true); + if(clueItem.used==true) + { + clueItem.clueImageUI.color=Color.gray; + } } } diff --git a/Assets/Scripts/Clue/MemoryClueSlot.cs b/Assets/Scripts/Clue/MemoryClueSlot.cs index 1bf105008..062de4b86 100644 --- a/Assets/Scripts/Clue/MemoryClueSlot.cs +++ b/Assets/Scripts/Clue/MemoryClueSlot.cs @@ -1,3 +1,4 @@ +using System.Drawing; using UnityEngine; public class MemoryClueSlot : ClueSlotBase @@ -27,7 +28,8 @@ public class MemoryClueSlot : ClueSlotBase public override void ReleaseSlot() { if (currentClueItem != null) - { + { + currentClueItem.used=true; ReturnClueToCollection(currentClueItem); currentClueItem = null; // 清除 currentClueItem 的引用 } diff --git a/Assets/Scripts/Dialog System/DialogController.cs b/Assets/Scripts/Dialog System/DialogController.cs index 7ccdb11fb..ca19d7316 100644 --- a/Assets/Scripts/Dialog System/DialogController.cs +++ b/Assets/Scripts/Dialog System/DialogController.cs @@ -262,6 +262,13 @@ namespace AibisDream #region 命令名 + + [YarnCommand("NextYarn")] + public static void NextYarn() + { + DialogController.Instance.StartCoroutine(GameLoopManager.Instance.NextSceneSo()); + } + [YarnCommand("switch_tv")] public static void SwitchTV(string picName) { diff --git a/Assets/Scripts/FixSystem/DraggableUI.cs b/Assets/Scripts/FixSystem/DraggableUI.cs new file mode 100644 index 000000000..98691689e --- /dev/null +++ b/Assets/Scripts/FixSystem/DraggableUI.cs @@ -0,0 +1,52 @@ +using UnityEditor.Localization.Plugins.XLIFF.V12; +using UnityEngine; +using UnityEngine.EventSystems; +using UnityEngine.UI; + +public class DraggableUI : MonoBehaviour,IDragHandler, IPointerDownHandler +{ + private RectTransform rectTransform; + private Canvas canvas; + + public RectTransform target; + + public GameObject button; + + private void Awake() + { + rectTransform = GetComponent(); + canvas = GetComponentInParent(); + } + + public void OnPointerDown(PointerEventData eventData) + { + // 这里可以添加按下时的逻辑，比如记录初始位置 + } + + + public void OnDrag(PointerEventData eventData) + { + Vector3 screenPosition = new Vector3(eventData.position.x, eventData.position.y, + Camera.main.WorldToScreenPoint(transform.position).z); + Vector3 move = Camera.main.ScreenToWorldPoint(screenPosition); + move.z = transform.position.z; + transform.position = move; + //plugSprite.enabled = true; + } + void Update() + { + // 计算两个物体之间的距离 + float distance = Vector3.Distance(transform.position, target.position); + + // 检查距离是否在范围内，并激活或禁用 Button + if (distance <= 1) + { + button.SetActive(true); + } + else + { + button.SetActive(false); + } + } +} + diff --git a/Assets/Scripts/FixSystem/DraggableUI.cs.meta b/Assets/Scripts/FixSystem/DraggableUI.cs.meta new file mode 100644 index 000000000..03eb9f586 --- /dev/null +++ b/Assets/Scripts/FixSystem/DraggableUI.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0b5082f03abebb04bb4a916aa64579dc +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs index 8ce838f62..265da2df8 100644 --- a/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs +++ b/Assets/Scripts/FixSystem/HeatMap/HeatMapController.cs @@ -15,10 +15,9 @@ public class HeatMapController : MonoBehaviour [HideInInspector] private Vector4[] properties = new Vector4[7]; // 存储6个盒子大小的数组, (x,y) = boxsize - public Slider slider; + //public Slider slider; private float tempNum=0; - public float tempNumMax; private float uftempture=1; private float backtemture=1; @@ -30,53 +29,39 @@ public class HeatMapController : MonoBehaviour public float module=0.7f; //public Texture2D hotspotShapeTexture; // 引用热点形状纹理 + private float tempture = 0; - private float tempture=1; + public GameObject heatMap; + public float Tempture + { + get => tempture; + set + { + if (tempture != value) + { + tempture = value; + SetDataToMaterial(); // 调用方法更新材质数据 + } + } + } - public Slider xSlider; // 拖入X轴控制的Slider - public Slider ySlider; // 拖入Y轴控制的Slider - - private float xMin = -4.5f; - private float xMax = 2.1f; - private float yMin = -3.3f; - private float yMax = 2.9f; - - public RectTransform targetObject; // 拖入要控制的物体的Transform void Start() { - xSlider.minValue = 1; - xSlider.maxValue = 10; - ySlider.minValue = 1; - ySlider.maxValue = 10; - - // 注册Slider值改变事件 - xSlider.onValueChanged.AddListener(UpdatePosition); - ySlider.onValueChanged.AddListener(UpdatePosition); - - // 初始调用，设置初始位置 - UpdatePosition(0); + + // // 初始调用，设置初始位置 //tempture=1; - //tempture=tempture; - // 初始化数据，这里是示例，你可以根据实际需求设置 - SetDataToMaterial(); - - } - private void UpdatePosition(float value) - { - // 使用InverseLerp将Slider的值映射到0到1范围，然后再使用Lerp进行插值 - float xPos = Mathf.Lerp(xMin, xMax, Mathf.InverseLerp(1, 10, xSlider.value)); - float yPos = Mathf.Lerp(yMin, yMax, Mathf.InverseLerp(1, 10, ySlider.value)); - - // 更新物体位置 - targetObject.position = new Vector3(xPos, yPos, targetObject.position.z); + // // 初始化数据，这里是示例，你可以根据实际需求设置 + SetDataToMaterial(); } - public void SetTemture(float value) - { - tempture=value; - } + // public void SetTemture(float value) + // { + // tempture=value; + + // } + public void SetDataToMaterial() { diff --git a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs index 0be339792..0c4ebfe41 100644 --- a/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs +++ b/Assets/Scripts/FixSystem/Scope/OscilloscopeController.cs @@ -35,9 +35,27 @@ public class OscilloscopeController : MonoBehaviour private Socket currentSocket; - private int heatNum=0; + private int heatNum=1; - // HeatMapController hm; + public int HeatNum + { + get { return heatNum; } + set + { + heatNum = value; + + // 每次设置 heatNum 时，让 otherScript.A 同步更新 + if (hm != null) + { + hm.Tempture = heatNum; + } + } + } + + private bool cantReduce=false; + + public GameObject heatMap; + HeatMapController hm; void Start() { @@ -55,18 +73,47 @@ public class OscilloscopeController : MonoBehaviour plug.OnPlugInserted += HandlePlugInserted; plug.OnPlugRemoved += HandlePlugRemoved; } - //hm=FindObjectOfType(); + hm=FindObjectOfType(); } [YarnCommand("SetHeat")] - public void SetHeat(int heat) + public void SetHeat(int heat,bool unReduceAble=false) { - heatNum=heat; - //hm.SetTemture(heat); - + cantReduce=unReduceAble; + + heatNum=heat; + } + [YarnCommand("ShowHeatMap")] + public void ShowHeatMap(bool show) + { + heatMap.SetActive(show); + } + public void StartReduceHeat() + { + + StartCoroutine(ReduceValueCoroutine()); + } + + + IEnumerator ReduceValueCoroutine() + { + if(cantReduce) + { + yield return new WaitForSeconds(1); + DialogController.Instance.StartDialogNode("降温失败"); + + } + 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."); } - private void HandlePlugInserted(Plug plug) { DialogController.Instance.SetVariable("$currentSocket",plug.currentSocket.name);