diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn index e5916f20c..ef64bd023 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Eye.yarn @@ -1,4 +1,4 @@ -title: DeepInEye +title: EyeDeepIn tags: position: -9,21 --- @@ -257,14 +257,14 @@ position: 251,1116 <> me:没什么头绪，先看看别的地方 <> -<> +<> <> <> me:这里应该已经彻底检查过了 <> -<> +<> <> <> @@ -285,7 +285,7 @@ me:这里应该已经彻底检查过了 <> <> <> - <> + <> <> <> <> @@ -296,11 +296,10 @@ me:这里应该已经彻底检查过了 【占位】虽然不知道为什么，但是我们应该去检查一下这些记忆都是什么，是否和UF的非法记忆有关 <> <> - <> <> <> <> - <> + <> <> <> <> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn index beda6de44..f95265de8 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Memory.yarn @@ -1,4 +1,4 @@ -title: DeepInMemory +title: MemoryDeepIn tags: --- <> diff --git a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn index 0b0af3e3c..30edf3acb 100644 --- a/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn +++ b/Assets/Resources/Yarn/Re_LTS_Peipeiday1/Re_LTS_Peipeiday1.yarn @@ -1,7 +1,7 @@ title: Start tags: colorID: 8 -position: 234,-2054 +position: 253,-2041 --- // 打开ClueBoard //<> @@ -11,7 +11,7 @@ position: 234,-2054 title: 数据初始化 tags: colorID: 4 -position: 235,-1739 +position: 248,-1739 --- ///在这里决定这次诊疗的目标是什么，以及目标判断相关的数值 @@ -116,12 +116,11 @@ colorID: 3 position: 256,-1154 --- <> -<> +<> //<> //<> <> <> - <> <> 【占位】进入维修后，你想要进UF内部看一看，但是UF不允许，UF只允许调取最近1h的记录 @@ -203,7 +202,7 @@ group:分析相关 position: -274,-580 --- <> -<> +<> <> <> <> @@ -220,7 +219,7 @@ title: 结论 tags: colorID: 8 group:分析相关 -position: -270,-411 +position: -270,-412 --- <> <> @@ -255,13 +254,12 @@ title: 手术准备 tags: colorID: 8 group:手术相关 -position: -273,-93 +position: -269,-100 --- -<> +//<> <> -<> +<> <> -<> <> <> <> @@ -310,7 +308,7 @@ position: 297,-77 --- me: 检查应该都完成了…我们出去吧，佩佩。 <> -<> +<> <> <> <> diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index b1abe9612..4a70e865b 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -2382,110 +2382,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 142983753} m_CullTransparentMesh: 1 ---- !u!1 &145509952 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 145509956} - - component: {fileID: 145509955} - - component: {fileID: 145509954} - - component: {fileID: 145509953} - m_Layer: 5 - m_Name: HeatMapCanvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &145509953 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 145509952} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &145509954 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 145509952} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 1 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 1 ---- !u!223 &145509955 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 145509952} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 959782197 - m_SortingOrder: 8 - m_TargetDisplay: 0 ---- !u!224 &145509956 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 145509952} - 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: 777225788} - - {fileID: 632022511} - - {fileID: 794854074} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 18, y: 10} - m_Pivot: {x: 0.5, y: 0.5} --- !u!21 &145797215 Material: serializedVersion: 8 @@ -3659,140 +3555,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &173024356 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 173024357} - - component: {fileID: 173024359} - - component: {fileID: 173024358} - 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 &173024357 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173024356} - 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: 1163139614} - 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 &173024358 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173024356} - 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 &173024359 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 173024356} - m_CullTransparentMesh: 1 --- !u!1 &173061723 GameObject: m_ObjectHideFlags: 0 @@ -6360,6 +6122,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 247562151} m_CullTransparentMesh: 1 +--- !u!1 &253767083 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 253767084} + - component: {fileID: 253767086} + - component: {fileID: 253767085} + 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 &253767084 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 253767083} + 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: 1170503231} + 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 &253767085 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 253767083} + 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 &253767086 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 253767083} + m_CullTransparentMesh: 1 --- !u!1 &259861587 GameObject: m_ObjectHideFlags: 0 @@ -7318,6 +7214,111 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 2 m_SpriteSortPoint: 0 +--- !u!1 &320706161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 320706165} + - component: {fileID: 320706164} + - component: {fileID: 320706163} + - component: {fileID: 320706162} + m_Layer: 5 + m_Name: ToolUpperCableCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &320706162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320706161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &320706163 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320706161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 1 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!223 &320706164 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320706161} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 959782197 + m_SortingOrder: 8 + m_TargetDisplay: 0 +--- !u!224 &320706165 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 320706161} + 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: 1632908302} + - {fileID: 777225788} + - {fileID: 1652512855} + - {fileID: 632022511} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 18, y: 10} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &347112472 GameObject: m_ObjectHideFlags: 0 @@ -7900,6 +7901,81 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 383915069} m_CullTransparentMesh: 1 +--- !u!1 &387044956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 387044957} + - component: {fileID: 387044959} + - component: {fileID: 387044958} + m_Layer: 5 + m_Name: innerbackground + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &387044957 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 387044956} + 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: 1632908302} + 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.0068, y: 0.0276} + m_SizeDelta: {x: 2.2, y: 2.2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &387044958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 387044956} + 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.11320752, g: 0.022855101, b: 0.022855101, 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!222 &387044959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 387044956} + m_CullTransparentMesh: 1 --- !u!114 &388085958 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1068036109852377048, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} @@ -9415,6 +9491,134 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &542992025 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 542992026} + - component: {fileID: 542992029} + - component: {fileID: 542992028} + - component: {fileID: 542992027} + m_Layer: 0 + m_Name: HeatMapcontent + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &542992026 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542992025} + 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: [] + m_Father: {fileID: 1652512855} + 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.176} + m_SizeDelta: {x: 2.528, y: 2.1929} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &542992027 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542992025} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: 72b0010e1307b614ebb427b0d8dc54ee, type: 2} + 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: 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!222 &542992028 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542992025} + m_CullTransparentMesh: 1 +--- !u!212 &542992029 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 542992025} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 72b0010e1307b614ebb427b0d8dc54ee, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: -1707257027 + m_SortingLayer: 8 + m_SortingOrder: 10 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &588235811 GameObject: m_ObjectHideFlags: 0 @@ -9710,12 +9914,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 632022510} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 145509956} + m_Father: {fileID: 320706165} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11423,6 +11627,81 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &764992140 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 764992141} + - component: {fileID: 764992143} + - component: {fileID: 764992142} + m_Layer: 5 + m_Name: Toolimage + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &764992141 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764992140} + 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: 1632908302} + 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.0068, y: 0.0276} + m_SizeDelta: {x: 2, y: 2} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &764992142 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764992140} + 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: 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!222 &764992143 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 764992140} + m_CullTransparentMesh: 1 --- !u!1 &765117475 GameObject: m_ObjectHideFlags: 0 @@ -11662,7 +11941,7 @@ RectTransform: m_LocalScale: {x: 1.3119445, y: 1.3119445, z: 1.3119445} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 145509956} + m_Father: {fileID: 320706165} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -11913,99 +12192,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 790007030} m_CullTransparentMesh: 1 ---- !u!1 &794854073 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 794854074} - - component: {fileID: 794854077} - - component: {fileID: 794854076} - - component: {fileID: 794854075} - m_Layer: 5 - m_Name: movement - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &794854074 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 794854073} - 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: - - {fileID: 1163139614} - - {fileID: 1163522825} - m_Father: {fileID: 145509956} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -2.48, y: -3.58} - m_SizeDelta: {x: 2.5, y: 2.5} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &794854075 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 794854073} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0b5082f03abebb04bb4a916aa64579dc, type: 3} - m_Name: - m_EditorClassIdentifier: - target: {fileID: 777225788} - button: {fileID: 1163139613} - isDone: 0 ---- !u!114 &794854076 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 794854073} - 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: 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: 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 &794854077 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 794854073} - m_CullTransparentMesh: 1 --- !u!1 &795246565 GameObject: m_ObjectHideFlags: 0 @@ -15859,7 +16045,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1162055060} m_CullTransparentMesh: 1 ---- !u!1 &1163139613 +--- !u!1 &1170503230 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -15867,10 +16053,10 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1163139614} - - component: {fileID: 1163139617} - - component: {fileID: 1163139616} - - component: {fileID: 1163139615} + - component: {fileID: 1170503231} + - component: {fileID: 1170503234} + - component: {fileID: 1170503233} + - component: {fileID: 1170503232} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -15878,33 +16064,33 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &1163139614 +--- !u!224 &1170503231 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163139613} + m_GameObject: {fileID: 1170503230} 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: 173024357} - m_Father: {fileID: 794854074} + - {fileID: 253767084} + m_Father: {fileID: 1652512855} 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 &1163139615 +--- !u!114 &1170503232 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163139613} + m_GameObject: {fileID: 1170503230} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} @@ -15938,7 +16124,7 @@ MonoBehaviour: m_SelectedTrigger: Selected m_DisabledTrigger: Disabled m_Interactable: 1 - m_TargetGraphic: {fileID: 1163139616} + m_TargetGraphic: {fileID: 1170503233} m_OnClick: m_PersistentCalls: m_Calls: @@ -15954,13 +16140,13 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!114 &1163139616 +--- !u!114 &1170503233 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163139613} + m_GameObject: {fileID: 1170503230} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -15984,142 +16170,14 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1163139617 +--- !u!222 &1170503234 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163139613} + m_GameObject: {fileID: 1170503230} m_CullTransparentMesh: 1 ---- !u!1 &1163522824 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1163522825} - - component: {fileID: 1163522829} - - component: {fileID: 1163522827} - - component: {fileID: 1163522826} - m_Layer: 0 - m_Name: HeatMapcontent - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1163522825 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163522824} - 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: [] - m_Father: {fileID: 794854074} - 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.176} - m_SizeDelta: {x: 2.528, y: 2.1929} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1163522826 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163522824} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 2100000, guid: 72b0010e1307b614ebb427b0d8dc54ee, type: 2} - 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: 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!222 &1163522827 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163522824} - m_CullTransparentMesh: 1 ---- !u!212 &1163522829 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1163522824} - m_Enabled: 0 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 72b0010e1307b614ebb427b0d8dc54ee, type: 2} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: -1707257027 - m_SortingLayer: 8 - m_SortingOrder: 10 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1173985880 GameObject: m_ObjectHideFlags: 0 @@ -21364,6 +21422,57 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1603419540} m_CullTransparentMesh: 1 +--- !u!1 &1604523921 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1604523923} + - component: {fileID: 1604523922} + m_Layer: 0 + m_Name: ToolManager + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1604523922 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604523921} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 89ebd69b82a440a4794beb4ef2717a3b, type: 3} + m_Name: + m_EditorClassIdentifier: + toolBox: {fileID: 1632908301} + toolPrefabs: + - {fileID: 5156684866132484758, guid: dac7c27f779d8db4683b60ca67946a84, type: 3} + - {fileID: 2485500826200128654, guid: 1afc7e4d2be0126438b5fe65aaccc901, type: 3} + - {fileID: 5156684866132484758, guid: 4dedd22662cba1c409b19152b0d04df1, type: 3} + - {fileID: 5156684866132484758, guid: 118a27260e16cb4439c8bb630f07ad31, type: 3} + toolCanvas: {fileID: 320706164} +--- !u!4 &1604523923 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1604523921} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.29908502, y: -0.108584344, z: -0.022224218} + 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 &1613409759 GameObject: m_ObjectHideFlags: 0 @@ -21826,6 +21935,83 @@ Transform: - {fileID: 533663231} m_Father: {fileID: 183765384} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1632908301 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1632908302} + - component: {fileID: 1632908304} + - component: {fileID: 1632908303} + m_Layer: 5 + m_Name: ToolBox + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1632908302 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632908301} + 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: 387044957} + - {fileID: 764992141} + m_Father: {fileID: 320706165} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 3, y: -6.35} + m_SizeDelta: {x: 2.5, y: 2.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1632908303 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632908301} + 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.3207547, g: 0.08291204, b: 0.08291204, 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!222 &1632908304 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1632908301} + m_CullTransparentMesh: 1 --- !u!1 &1635219589 GameObject: m_ObjectHideFlags: 0 @@ -21963,6 +22149,99 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1652512854 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1652512855} + - component: {fileID: 1652512858} + - component: {fileID: 1652512857} + - component: {fileID: 1652512856} + m_Layer: 5 + m_Name: movement + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1652512855 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1652512854} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.31194, y: 1.31194, z: 1.31194} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1170503231} + - {fileID: 542992026} + m_Father: {fileID: 320706165} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -2.48, y: -3.58} + m_SizeDelta: {x: 2.5, y: 2.5} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1652512856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1652512854} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b5082f03abebb04bb4a916aa64579dc, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 777225788} + button: {fileID: 1170503230} + isDone: 0 +--- !u!114 &1652512857 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1652512854} + 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: 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: 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 &1652512858 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1652512854} + m_CullTransparentMesh: 1 --- !u!1 &1678197548 GameObject: m_ObjectHideFlags: 0 @@ -26468,7 +26747,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2089180127 MonoBehaviour: m_ObjectHideFlags: 0 @@ -28037,6 +28316,18 @@ PrefabInstance: propertyPath: oscilloscopeSystem value: objectReference: {fileID: 388085958} + - target: {fileID: 4878312366005375122, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4878312366005375122, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_SortingOrder + value: 18 + objectReference: {fileID: 0} + - target: {fileID: 4878312366005375122, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4911887232694427234, guid: 92aec29b557d59a4ca5363aadd06c7bb, type: 3} propertyPath: m_SortingOrder value: 6 @@ -28247,15 +28538,16 @@ PrefabInstance: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 145509956} - {fileID: 183765382} - {fileID: 105412843} - {fileID: 1037046522} - {fileID: 763669272} - {fileID: 110632228} + - {fileID: 1604523923} - {fileID: 202863630} - {fileID: 507625641} - {fileID: 755572874} + - {fileID: 320706165} - {fileID: 7026926953013077400} - {fileID: 6045551082333026152} - {fileID: 9210352354887959608} diff --git a/Assets/Scenes/Persistence.unity b/Assets/Scenes/Persistence.unity index 5f537b6fa..8becde911 100644 --- a/Assets/Scenes/Persistence.unity +++ b/Assets/Scenes/Persistence.unity @@ -1721,6 +1721,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 99451801} m_PrefabAsset: {fileID: 0} +--- !u!114 &99451806 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 99451801} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 99451805} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &114645688 GameObject: m_ObjectHideFlags: 0 @@ -2281,6 +2292,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 149374359} m_PrefabAsset: {fileID: 0} +--- !u!114 &149374364 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 149374359} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 149374363} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &152335402 PrefabInstance: m_ObjectHideFlags: 0 @@ -2660,6 +2682,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 188420210} m_PrefabAsset: {fileID: 0} +--- !u!114 &188420215 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 188420210} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188420214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &190090867 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -3140,6 +3173,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 216794752} m_PrefabAsset: {fileID: 0} +--- !u!114 &216794757 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 216794752} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 216794756} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &237392154 GameObject: m_ObjectHideFlags: 0 @@ -5279,6 +5323,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 475823254} m_PrefabAsset: {fileID: 0} +--- !u!114 &475823259 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 475823254} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 475823258} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &476337178 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2261302370767925378, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} @@ -6892,6 +6947,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 629580921} m_PrefabAsset: {fileID: 0} +--- !u!114 &629580926 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 629580921} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629580925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &651726652 GameObject: m_ObjectHideFlags: 0 @@ -9757,6 +9823,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 852388791} m_PrefabAsset: {fileID: 0} +--- !u!114 &852388796 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 852388791} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 852388795} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &855263533 GameObject: m_ObjectHideFlags: 0 @@ -11875,7 +11952,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1200911921 MonoBehaviour: m_ObjectHideFlags: 0 @@ -15098,6 +15175,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1556863295} m_PrefabAsset: {fileID: 0} +--- !u!114 &1556863300 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 1556863295} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1556863299} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1560719975 GameObject: m_ObjectHideFlags: 0 @@ -15774,6 +15862,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1437328103} m_PrefabAsset: {fileID: 0} +--- !u!114 &1599989369 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 1437328103} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1599989368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1604842425 GameObject: m_ObjectHideFlags: 0 @@ -16191,7 +16290,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a2f82f623f7c479cb5d1935ee6067484, type: 3} m_Name: m_EditorClassIdentifier: - _nodes: [] + _nodes: + - {fileID: 1989818787} + - {fileID: 216794757} + - {fileID: 475823259} + - {fileID: 1599989369} + - {fileID: 149374364} + - {fileID: 99451806} + - {fileID: 852388796} + - {fileID: 629580926} + - {fileID: 188420215} + - {fileID: 1556863300} + - {fileID: 500438203} + - {fileID: 1592246587} _connections: [] _cacheRaycasters: 1 --- !u!4 &1620453322 @@ -19134,6 +19245,17 @@ GameObject: m_CorrespondingSourceObject: {fileID: 7768698746163907630, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} m_PrefabInstance: {fileID: 1989818781} m_PrefabAsset: {fileID: 0} +--- !u!114 &1989818787 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5319491456343907424, guid: a1dbef2a0a50ecf49a39eae2d3e486b2, type: 3} + m_PrefabInstance: {fileID: 1989818781} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1989818785} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 38cb05a0012a4c99982acfcd8ebd2b10, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1990871918 GameObject: m_ObjectHideFlags: 0 @@ -23660,7 +23782,7 @@ RectTransform: m_Father: {fileID: 265254503306996572} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -30596,7 +30718,7 @@ MonoBehaviour: rectTransform: {fileID: 8007592087727081612} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -32292,7 +32414,7 @@ MonoBehaviour: rectTransform: {fileID: 7282059703919780462} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -34286,7 +34408,19 @@ MonoBehaviour: mainCamera: {fileID: 519420031} lineRenderer: {fileID: 3253743068496567163} contentPanel: {fileID: 243936684424215245} - localNodes: [] + localNodes: + - {fileID: 1989818787} + - {fileID: 216794757} + - {fileID: 475823259} + - {fileID: 1599989369} + - {fileID: 149374364} + - {fileID: 99451806} + - {fileID: 852388796} + - {fileID: 629580926} + - {fileID: 188420215} + - {fileID: 1556863300} + - {fileID: 500438203} + - {fileID: 1592246587} localConnections: [] pointer: customImage: {fileID: 1475193827753151906} @@ -34294,7 +34428,7 @@ MonoBehaviour: iconOnDrag: {fileID: 8895775685280376203, guid: eb11ac9a06fb4792b393db9b83ab43b4, type: 3} exclusiveOnDragCanvas: {fileID: 0} useLegacyDragMethod: 0 - position: {x: 2686.129, y: 882.63367, z: 0} + position: {x: 974.2973, y: 1166.5173, z: 0} dragSelection: customRenderer: {fileID: 0} line: @@ -34670,7 +34804,7 @@ MonoBehaviour: rectTransform: {fileID: 8980408154347076217} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -35153,7 +35287,7 @@ MonoBehaviour: rectTransform: {fileID: 9150678032829601296} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -36144,7 +36278,7 @@ MonoBehaviour: rectTransform: {fileID: 8305720147907504314} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -43003,7 +43137,7 @@ MonoBehaviour: rectTransform: {fileID: 2041500036121329234} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -46801,7 +46935,7 @@ MonoBehaviour: rectTransform: {fileID: 3037079921269169012} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -48769,7 +48903,7 @@ MonoBehaviour: rectTransform: {fileID: 2592852046776807969} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -49924,7 +50058,7 @@ RectTransform: m_Father: {fileID: 6498488201931268245} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} @@ -50198,7 +50332,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &7966889870541532172 RectTransform: m_ObjectHideFlags: 0 @@ -52610,7 +52744,7 @@ MonoBehaviour: rectTransform: {fileID: 4596928483061751012} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 @@ -53526,7 +53660,7 @@ MonoBehaviour: rectTransform: {fileID: 3538142130825932876} linkTransform: {fileID: 0} groupTransform: {fileID: 0} - graphManager: {fileID: 0} + graphManager: {fileID: 3728315362672514892} enableSelfConnection: 0 _enableDrag: 0 _enableHover: 1 diff --git a/Assets/Scripts/FixSystem/Tools/ToolManager.cs b/Assets/Scripts/FixSystem/Tools/ToolManager.cs index 9a1e47766..0559a5cf1 100644 --- a/Assets/Scripts/FixSystem/Tools/ToolManager.cs +++ b/Assets/Scripts/FixSystem/Tools/ToolManager.cs @@ -20,7 +20,7 @@ public class ToolManager : MonoBehaviour public bool HasTool => currentTool != null; // 判断玩家是否已获得工具 private Module currentModule; - public Transform faceCanvas; + // public Transform faceCanvas; private Vector3 originalCanvasPosition; // 原始面板位置 @@ -42,7 +42,7 @@ public class ToolManager : MonoBehaviour private void Start() { - originalCanvasPosition=faceCanvas.position; + //originalCanvasPosition=faceCanvas.position; currentModule=null; toolBox.SetActive(false); // 初始隐藏工具盒 @@ -63,7 +63,7 @@ public class ToolManager : MonoBehaviour { //module.StartRepairIfToolIsScrewdriver(currentTool); currentModule=module; - EnterRepairMode(); + //EnterRepairMode(); } else { @@ -171,33 +171,33 @@ public class ToolManager : MonoBehaviour } } - public void EnterRepairMode() - { - isInRepiarMode=true; - //isRepairMode = true; - currentModule.RemoveAllPlugsFromSockets(); - // 使用 DOTween 对 Canvas 的位置和缩放进行平滑过渡 - faceCanvas.DOMove(currentModule.repairCanvasPosition, 1) - .SetEase(Ease.OutQuad) // 移动面板 - .OnComplete(() => currentModule.EnableScrewsInteraction(true)); // 动画完成后才启用交互 - faceCanvas.DOScale(currentModule.repairCanvasScale, 1) - .SetEase(Ease.OutQuad) - .OnComplete(() => DialogController.Instance.StartDialogNode("EnterRepairMode")); // 缩放面板 - } + // public void EnterRepairMode() + // { + // isInRepiarMode=true; + // //isRepairMode = true; + // currentModule.RemoveAllPlugsFromSockets(); + // // 使用 DOTween 对 Canvas 的位置和缩放进行平滑过渡 + // faceCanvas.DOMove(currentModule.repairCanvasPosition, 1) + // .SetEase(Ease.OutQuad) // 移动面板 + // .OnComplete(() => currentModule.EnableScrewsInteraction(true)); // 动画完成后才启用交互 + // faceCanvas.DOScale(currentModule.repairCanvasScale, 1) + // .SetEase(Ease.OutQuad) + // .OnComplete(() => DialogController.Instance.StartDialogNode("EnterRepairMode")); // 缩放面板 + // } - [YarnCommand("ExitRepairMode")] - public void ExitRepairMode() - { - isInRepiarMode=false; - // 使用 DOTween 对 Canvas 的位置和缩放进行平滑过渡 - faceCanvas.DOMove(originalCanvasPosition, 1) - .SetEase(Ease.InQuad); + // [YarnCommand("ExitRepairMode")] + // public void ExitRepairMode() + // { + // isInRepiarMode=false; + // // 使用 DOTween 对 Canvas 的位置和缩放进行平滑过渡 + // faceCanvas.DOMove(originalCanvasPosition, 1) + // .SetEase(Ease.InQuad); - faceCanvas.DOScale(1f, 1) - .SetEase(Ease.InQuad); // 恢复面板缩放 - ShowToolBoxAfterTask(); - currentModule=null; - } + // faceCanvas.DOScale(1f, 1) + // .SetEase(Ease.InQuad); // 恢复面板缩放 + // ShowToolBoxAfterTask(); + // currentModule=null; + // } [YarnCommand("ShowTool")] diff --git a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs index 594e84211..c2a7af6c3 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/BodyModule.cs @@ -72,8 +72,7 @@ namespace AibisDream.FixSystem else if(data.ignoreWaveCheck) { _bodyModuleSystem.oscilloscopeSystem.ShowScreenMessage("无需检查，允许进入", Color.yellow); - - //_bodyModuleSystem.oscilloscopeSystem.PlayWave(data.waveformType, data.waveHasError); + _bodyModuleSystem.oscilloscopeSystem.ChangeDeepInButtonState(true); } else if(data.waveHasError) { diff --git a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs index 7c846a92c..aa7e761d1 100644 --- a/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs +++ b/Assets/Scripts/FixSystemNew/BodyModule/OscilloscopeSystem.cs @@ -49,7 +49,7 @@ namespace AibisDream.FixSystem _scanLine.SetScreenSize(_screen.bounds.size.x, _screen.bounds.size.y); _screenText.text = ""; - _deepinButton.OnButtonDown += StartScan; + _deepinButton.OnButtonDown += HandleDeepInButtonClick; _scanLine.ScanErrorEvent += OnScanSuccess; } @@ -91,6 +91,11 @@ namespace AibisDream.FixSystem _scanLine.CloseScan(); } + public void ChangeDeepInButtonState(bool state) + { + _deepinButton.SetActive(state); + } + /// /// 调整相位 /// @@ -112,12 +117,25 @@ namespace AibisDream.FixSystem float spikeX = _waveformLine.GetSpikeX(); StartCoroutine(_scanLine.ScanForError(spikeX)); } + public void HandleDeepInButtonClick() + { + if(_bodyModuleSystem.CableSystem.curBodyModule.data.ignoreWaveCheck==true) + { + _bodyModuleSystem.HandleDeepIn(); + } + else + { + StartScan(); + } + + } + /// /// 扫描成功后 /// public void OnScanSuccess() - { + { _bodyModuleSystem.HandleDeepIn(); _ = CommonUtil.Delay(2000, StopWave); } diff --git a/Assets/Scripts/Mouse/MouseCursorManager.cs b/Assets/Scripts/Mouse/MouseCursorManager.cs index 788565dd5..225b81220 100644 --- a/Assets/Scripts/Mouse/MouseCursorManager.cs +++ b/Assets/Scripts/Mouse/MouseCursorManager.cs @@ -79,9 +79,9 @@ public class MouseCursorManager : MonoBehaviour } SetCursor(dialogueCursorSprite); - dialogueCanvas.sortingOrder = 1000; // 确保对话窗口在最前 - dialogueCanvas.overrideSorting = true; - dialogueCanvas.GetComponent().blockingMask = LayerMask.GetMask("Everything"); + // dialogueCanvas.sortingOrder = 1000; // 确保对话窗口在最前 + // dialogueCanvas.overrideSorting = true; + //dialogueCanvas.GetComponent().blockingMask = LayerMask.GetMask("Everything"); } else { @@ -91,8 +91,8 @@ public class MouseCursorManager : MonoBehaviour } - dialogueCanvas.overrideSorting = false; - dialogueCanvas.GetComponent().blockingMask = LayerMask.GetMask("Nothing"); + //dialogueCanvas.overrideSorting = false; + //dialogueCanvas.GetComponent().blockingMask = LayerMask.GetMask("Nothing"); if(isDraggingPlug) { diff --git a/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json b/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json index 2aa66618d..71dcf88e8 100644 --- a/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json +++ b/Assets/StreamingAssets/LevelData/BodyModuleSystem/temp.json @@ -1 +1 @@ -{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Memory","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/记忆模块","modulePos":{"x":-2.524,"y":2.662,"z":0.0},"socketPos":{"x":0.092,"y":0.017,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"UF","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/UF底板","modulePos":{"x":-4.406,"y":0.431,"z":0.0},"socketPos":{"x":-0.243,"y":0.148,"z":0.0},"waveformType":2,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Eye","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/右眼","modulePos":{"x":-0.471,"y":0.604,"z":0.0},"socketPos":{"x":-0.879,"y":-0.57,"z":0.0},"waveformType":1,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/色觉","modulePos":{"x":-2.554,"y":0.689,"z":0.0},"socketPos":{"x":-0.003,"y":-0.744,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Emo","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/情绪模块","modulePos":{"x":-4.5,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Logic","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/思维模块","modulePos":{"x":-0.67,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":2,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Speak","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/讲话模块","modulePos":{"x":-2.58,"y":-2.51,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false}]} \ No newline at end of file +{"hasHotErr":false,"moduleDataArray":[{"moduleName":"Memory","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/记忆模块","modulePos":{"x":-2.524,"y":2.662,"z":0.0},"socketPos":{"x":0.092,"y":0.017,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":true},{"moduleName":"UF","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/UF底板","modulePos":{"x":-4.406,"y":0.431,"z":0.0},"socketPos":{"x":-0.243,"y":0.148,"z":0.0},"waveformType":2,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Eye","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/右眼","modulePos":{"x":-0.471,"y":0.604,"z":0.0},"socketPos":{"x":-0.879,"y":-0.57,"z":0.0},"waveformType":1,"waveHasError":true,"ignoreWaveCheck":false},{"moduleName":"Color","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/色觉","modulePos":{"x":-2.554,"y":0.689,"z":0.0},"socketPos":{"x":-0.003,"y":-0.744,"z":0.0},"waveformType":0,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Emo","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/情绪模块","modulePos":{"x":-4.5,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Logic","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/思维模块","modulePos":{"x":-0.67,"y":2.16,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":2,"waveHasError":false,"ignoreWaveCheck":false},{"moduleName":"Speak","modulePicPath":"Art/Fix/Peipei/大脑维修细化导出new/讲话模块","modulePos":{"x":-2.58,"y":-2.51,"z":0.0},"socketPos":{"x":0.005,"y":-0.011,"z":0.0},"waveformType":1,"waveHasError":false,"ignoreWaveCheck":false}]} \ No newline at end of file