diff --git a/Assets/Scenes/PeipeiFixScene.unity b/Assets/Scenes/PeipeiFixScene.unity index 013f97f3c..ef3b30028 100644 --- a/Assets/Scenes/PeipeiFixScene.unity +++ b/Assets/Scenes/PeipeiFixScene.unity @@ -228,7 +228,7 @@ GameObject: - component: {fileID: 28197537} - component: {fileID: 28197536} - component: {fileID: 28197535} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -346,7 +346,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 35416255} - m_Layer: 5 + m_Layer: 9 m_Name: "\u6253\u5370\u673A" m_TagString: Untagged m_Icon: {fileID: 0} @@ -903,7 +903,7 @@ GameObject: - component: {fileID: 74279253} - component: {fileID: 74279255} - component: {fileID: 74279254} - m_Layer: 5 + m_Layer: 9 m_Name: Item Checkmark m_TagString: Untagged m_Icon: {fileID: 0} @@ -978,7 +978,7 @@ GameObject: - component: {fileID: 77015536} - component: {fileID: 77015538} - component: {fileID: 77015537} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -1113,7 +1113,7 @@ GameObject: - component: {fileID: 91136830} - component: {fileID: 91136829} - component: {fileID: 91136828} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -1473,7 +1473,7 @@ GameObject: - component: {fileID: 109653322} - component: {fileID: 109653321} - component: {fileID: 109653320} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -1733,7 +1733,7 @@ GameObject: - component: {fileID: 113104497} - component: {fileID: 113104499} - component: {fileID: 113104498} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -1808,7 +1808,7 @@ GameObject: - component: {fileID: 125795316} - component: {fileID: 125795318} - component: {fileID: 125795317} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -1882,7 +1882,7 @@ GameObject: m_Component: - component: {fileID: 135806335} - component: {fileID: 135806336} - m_Layer: 5 + m_Layer: 9 m_Name: color m_TagString: Untagged m_Icon: {fileID: 0} @@ -2081,7 +2081,7 @@ GameObject: - component: {fileID: 142983757} - component: {fileID: 142983756} - component: {fileID: 142983755} - m_Layer: 5 + m_Layer: 9 m_Name: Button (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3000,7 +3000,7 @@ GameObject: - component: {fileID: 150309217} - component: {fileID: 150309219} - component: {fileID: 150309218} - m_Layer: 5 + m_Layer: 9 m_Name: Menu m_TagString: Untagged m_Icon: {fileID: 0} @@ -3077,7 +3077,7 @@ GameObject: - component: {fileID: 152092642} - component: {fileID: 152092641} - component: {fileID: 152092640} - m_Layer: 5 + m_Layer: 9 m_Name: RawImage m_TagString: Untagged m_Icon: {fileID: 0} @@ -3487,7 +3487,7 @@ GameObject: - component: {fileID: 178947447} - component: {fileID: 178947449} - component: {fileID: 178947448} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -3912,6 +3912,34 @@ PrefabInstance: propertyPath: m_TextStyleHashCode value: -1183493901 objectReference: {fileID: 0} + - target: {fileID: 536572174185929720, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1200673020346522525, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1460698461071452310, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1816989196148034697, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345868045372, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345906872067, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345920604344, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -3924,10 +3952,22 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 3083274346940298100, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274347254332314, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347254332314, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3083274347384374708, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -3940,6 +3980,10 @@ PrefabInstance: propertyPath: m_Name value: SliderScaleBasic_Stamp (1) objectReference: {fileID: 0} + - target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_IsActive value: 1 @@ -4040,10 +4084,30 @@ PrefabInstance: propertyPath: m_WholeNumbers value: 0 objectReference: {fileID: 0} + - target: {fileID: 3770969739482169645, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 6118684074714811541, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: hasText value: 0 objectReference: {fileID: 0} + - target: {fileID: 6372361153642431477, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6973589123833841946, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8144688368270242003, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 9155876842306098898, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -5269,7 +5333,7 @@ GameObject: - component: {fileID: 236862862} - component: {fileID: 236862864} - component: {fileID: 236862863} - m_Layer: 5 + m_Layer: 9 m_Name: PunchTapemask m_TagString: Untagged m_Icon: {fileID: 0} @@ -5478,13 +5542,13 @@ GameObject: - component: {fileID: 247562152} - component: {fileID: 247562154} - component: {fileID: 247562153} - m_Layer: 5 + m_Layer: 9 m_Name: eyeView m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &247562152 RectTransform: m_ObjectHideFlags: 0 @@ -5690,7 +5754,7 @@ GameObject: m_Component: - component: {fileID: 259861588} - component: {fileID: 259861589} - m_Layer: 5 + m_Layer: 9 m_Name: focus m_TagString: Untagged m_Icon: {fileID: 0} @@ -5782,7 +5846,7 @@ GameObject: - component: {fileID: 270409710} - component: {fileID: 270409712} - component: {fileID: 270409711} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -5918,7 +5982,7 @@ GameObject: - component: {fileID: 277380798} - component: {fileID: 277380800} - component: {fileID: 277380799} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -6066,138 +6130,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &291061723 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 291061724} - - component: {fileID: 291061727} - - component: {fileID: 291061725} - m_Layer: 5 - m_Name: Deep Camera - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &291061724 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 291061723} - 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: 755572874} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &291061725 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 291061723} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_RenderShadows: 1 - m_RequiresDepthTextureOption: 2 - m_RequiresOpaqueTextureOption: 2 - m_CameraType: 1 - m_Cameras: [] - m_RendererIndex: -1 - m_VolumeLayerMask: - serializedVersion: 2 - m_Bits: 1 - m_VolumeTrigger: {fileID: 0} - m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 - m_Antialiasing: 0 - m_AntialiasingQuality: 2 - m_StopNaN: 0 - m_Dithering: 0 - m_ClearDepth: 1 - m_AllowXRRendering: 1 - m_AllowHDROutput: 1 - m_UseScreenCoordOverride: 0 - m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} - m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} - m_RequiresDepthTexture: 0 - m_RequiresColorTexture: 0 - m_Version: 2 - m_TaaSettings: - quality: 3 - frameInfluence: 0.1 - jitterScale: 1 - mipBias: 0 - varianceClampScale: 0.9 - contrastAdaptiveSharpening: 0 ---- !u!20 &291061727 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 291061723} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 --- !u!1 &293524578 GameObject: m_ObjectHideFlags: 0 @@ -6207,7 +6139,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 293524579} - m_Layer: 5 + m_Layer: 9 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -6289,7 +6221,7 @@ GameObject: - component: {fileID: 298621640} - component: {fileID: 298621642} - component: {fileID: 298621641} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -6381,6 +6313,10 @@ PrefabInstance: propertyPath: m_Name value: PunchTapeSlot objectReference: {fileID: 0} + - target: {fileID: 2424662228528623556, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 2424662228528623556, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3} propertyPath: m_IsActive value: 1 @@ -6405,6 +6341,10 @@ PrefabInstance: propertyPath: m_Name value: close objectReference: {fileID: 0} + - target: {fileID: 7880595094219686492, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 7880595094219686492, guid: 0eeca7d625d8a9a40ad9a02ca0c4aad2, type: 3} propertyPath: m_IsActive value: 1 @@ -6677,7 +6617,7 @@ GameObject: - component: {fileID: 347112476} - component: {fileID: 347112475} - component: {fileID: 347112474} - m_Layer: 5 + m_Layer: 9 m_Name: ManualButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -7071,7 +7011,7 @@ GameObject: - component: {fileID: 369252989} - component: {fileID: 369252991} - component: {fileID: 369252990} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -7206,7 +7146,7 @@ GameObject: - component: {fileID: 383915073} - component: {fileID: 383915072} - component: {fileID: 383915071} - m_Layer: 5 + m_Layer: 9 m_Name: ZoomInUF m_TagString: Untagged m_Icon: {fileID: 0} @@ -7485,7 +7425,7 @@ GameObject: - component: {fileID: 454830773} - component: {fileID: 454830775} - component: {fileID: 454830774} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryProcess m_TagString: Untagged m_Icon: {fileID: 0} @@ -7560,7 +7500,7 @@ GameObject: - component: {fileID: 466676743} - component: {fileID: 466676745} - component: {fileID: 466676744} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8012,7 +7952,7 @@ GameObject: - component: {fileID: 480476657} - component: {fileID: 480476656} - component: {fileID: 480476655} - m_Layer: 5 + m_Layer: 9 m_Name: HeadMask m_TagString: Untagged m_Icon: {fileID: 0} @@ -8101,7 +8041,7 @@ GameObject: - component: {fileID: 487032385} - component: {fileID: 487032388} - component: {fileID: 487032387} - m_Layer: 5 + m_Layer: 9 m_Name: open m_TagString: Untagged m_Icon: {fileID: 0} @@ -8176,7 +8116,7 @@ GameObject: - component: {fileID: 501441329} - component: {fileID: 501441331} - component: {fileID: 501441330} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8310,7 +8250,7 @@ GameObject: - component: {fileID: 503082897} - component: {fileID: 503082899} - component: {fileID: 503082898} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryView m_TagString: Untagged m_Icon: {fileID: 0} @@ -8499,7 +8439,7 @@ GameObject: - component: {fileID: 515993798} - component: {fileID: 515993800} - component: {fileID: 515993799} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -8631,7 +8571,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 517117469} - m_Layer: 5 + m_Layer: 9 m_Name: Content m_TagString: Untagged m_Icon: {fileID: 0} @@ -8704,7 +8644,7 @@ GameObject: - component: {fileID: 522428455} - component: {fileID: 522428454} - component: {fileID: 522428453} - m_Layer: 5 + m_Layer: 9 m_Name: Template m_TagString: Untagged m_Icon: {fileID: 0} @@ -9613,7 +9553,7 @@ GameObject: - component: {fileID: 530194903} - component: {fileID: 530194905} - component: {fileID: 530194904} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -9848,7 +9788,7 @@ GameObject: - component: {fileID: 532162184} - component: {fileID: 532162186} - component: {fileID: 532162185} - m_Layer: 5 + m_Layer: 9 m_Name: punchTape m_TagString: Untagged m_Icon: {fileID: 0} @@ -10380,7 +10320,7 @@ GameObject: - component: {fileID: 588235815} - component: {fileID: 588235814} - component: {fileID: 588235813} - m_Layer: 5 + m_Layer: 9 m_Name: ZoomInMemory m_TagString: Untagged m_Icon: {fileID: 0} @@ -10694,6 +10634,10 @@ PrefabInstance: propertyPath: m_Name value: Line (1) objectReference: {fileID: 0} + - target: {fileID: 5470153155665659945, guid: 7e1248171f8348e4db6e10ab0667a497, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -10713,7 +10657,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 627739805} - m_Layer: 5 + m_Layer: 9 m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -10986,6 +10930,10 @@ PrefabInstance: propertyPath: m_Name value: Line objectReference: {fileID: 0} + - target: {fileID: 5470153155665659945, guid: 7e1248171f8348e4db6e10ab0667a497, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -11167,7 +11115,7 @@ GameObject: - component: {fileID: 696533770} - component: {fileID: 696533772} - component: {fileID: 696533771} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryFinishedNoColor m_TagString: Untagged m_Icon: {fileID: 0} @@ -11391,6 +11339,10 @@ PrefabInstance: propertyPath: m_Name value: Eye objectReference: {fileID: 0} + - target: {fileID: 7058771273709505771, guid: 076ce1386c7b1df45bf5c92a2ff4c5ea, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 7086589638264441731, guid: 076ce1386c7b1df45bf5c92a2ff4c5ea, type: 3} propertyPath: m_IsActive value: 0 @@ -11415,6 +11367,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7947718163668976181, guid: 076ce1386c7b1df45bf5c92a2ff4c5ea, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 7947718163668976181, guid: 076ce1386c7b1df45bf5c92a2ff4c5ea, type: 3} propertyPath: m_IsActive value: 1 @@ -11548,7 +11504,7 @@ GameObject: m_Component: - component: {fileID: 730553275} - component: {fileID: 730553276} - m_Layer: 5 + m_Layer: 9 m_Name: Item m_TagString: Untagged m_Icon: {fileID: 0} @@ -11637,7 +11593,7 @@ GameObject: - component: {fileID: 748395818} - component: {fileID: 748395817} - component: {fileID: 748395816} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -11756,7 +11712,7 @@ GameObject: - component: {fileID: 753279731} - component: {fileID: 753279733} - component: {fileID: 753279732} - m_Layer: 5 + m_Layer: 9 m_Name: TaskManager m_TagString: Untagged m_Icon: {fileID: 0} @@ -11819,7 +11775,7 @@ GameObject: - component: {fileID: 755572873} - component: {fileID: 755572872} - component: {fileID: 755572871} - m_Layer: 5 + m_Layer: 9 m_Name: DeepCanvas m_TagString: Untagged m_Icon: {fileID: 0} @@ -11876,17 +11832,17 @@ Canvas: m_Enabled: 1 serializedVersion: 3 m_RenderMode: 1 - m_Camera: {fileID: 291061727} + 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_VertexColorAlwaysGammaSpace: 1 m_AdditionalShaderChannelsFlag: 25 m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 1016946085 + m_SortingLayerID: 813150151 m_SortingOrder: 4 m_TargetDisplay: 0 --- !u!224 &755572874 @@ -11915,7 +11871,6 @@ RectTransform: - {fileID: 142983754} - {fileID: 1810834547} - {fileID: 1687435156} - - {fileID: 291061724} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -12481,7 +12436,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 784449372} - m_Layer: 5 + m_Layer: 9 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -12519,7 +12474,7 @@ GameObject: - component: {fileID: 790007031} - component: {fileID: 790007033} - component: {fileID: 790007032} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -12737,7 +12692,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 839463332} - m_Layer: 5 + m_Layer: 9 m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -12874,7 +12829,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 847697968} - m_Layer: 5 + m_Layer: 9 m_Name: Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -13082,7 +13037,7 @@ GameObject: - component: {fileID: 856622111} - component: {fileID: 856622113} - component: {fileID: 856622112} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -13157,7 +13112,7 @@ GameObject: - component: {fileID: 876835175} - component: {fileID: 876835177} - component: {fileID: 876835176} - m_Layer: 5 + m_Layer: 9 m_Name: headview m_TagString: Untagged m_Icon: {fileID: 0} @@ -13232,7 +13187,7 @@ GameObject: - component: {fileID: 879953260} - component: {fileID: 879953262} - component: {fileID: 879953261} - m_Layer: 5 + m_Layer: 9 m_Name: entry1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -13309,7 +13264,7 @@ GameObject: - component: {fileID: 884696054} - component: {fileID: 884696053} - component: {fileID: 884696052} - m_Layer: 5 + m_Layer: 9 m_Name: ExecuteButton m_TagString: Untagged m_Icon: {fileID: 0} @@ -13489,7 +13444,7 @@ GameObject: - component: {fileID: 893682038} - component: {fileID: 893682040} - component: {fileID: 893682039} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryFinishedforFade m_TagString: Untagged m_Icon: {fileID: 0} @@ -13565,7 +13520,7 @@ GameObject: - component: {fileID: 902033656} - component: {fileID: 902033655} - component: {fileID: 902033654} - m_Layer: 5 + m_Layer: 9 m_Name: EyeBackToFace m_TagString: Untagged m_Icon: {fileID: 0} @@ -14024,7 +13979,7 @@ GameObject: - component: {fileID: 908121221} - component: {fileID: 908121223} - component: {fileID: 908121222} - m_Layer: 0 + m_Layer: 9 m_Name: "\u6253\u5370\u673A\u9876\u90E8" m_TagString: Untagged m_Icon: {fileID: 0} @@ -14097,7 +14052,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 911086724} - m_Layer: 5 + m_Layer: 9 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -14259,7 +14214,7 @@ GameObject: - component: {fileID: 964820572} - component: {fileID: 964820571} - component: {fileID: 964820570} - m_Layer: 5 + m_Layer: 9 m_Name: Panel m_TagString: Untagged m_Icon: {fileID: 0} @@ -14334,7 +14289,7 @@ GameObject: - component: {fileID: 966176896} - component: {fileID: 966176898} - component: {fileID: 966176897} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -14592,7 +14547,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1008884025} - m_Layer: 5 + m_Layer: 9 m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -14631,7 +14586,7 @@ GameObject: - component: {fileID: 1010589978} - component: {fileID: 1010589977} - component: {fileID: 1010589976} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -14719,7 +14674,7 @@ GameObject: - component: {fileID: 1021119647} - component: {fileID: 1021119649} - component: {fileID: 1021119648} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -14855,7 +14810,7 @@ GameObject: - component: {fileID: 1029300070} - component: {fileID: 1029300072} - component: {fileID: 1029300071} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -14991,7 +14946,7 @@ GameObject: - component: {fileID: 1030302554} - component: {fileID: 1030302556} - component: {fileID: 1030302555} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -15598,7 +15553,7 @@ GameObject: - component: {fileID: 1088275437} - component: {fileID: 1088275439} - component: {fileID: 1088275438} - m_Layer: 5 + m_Layer: 9 m_Name: frame m_TagString: Untagged m_Icon: {fileID: 0} @@ -15673,7 +15628,7 @@ GameObject: - component: {fileID: 1098761360} - component: {fileID: 1098761362} - component: {fileID: 1098761361} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -15805,7 +15760,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1110463260} - m_Layer: 5 + m_Layer: 9 m_Name: Sliding Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -16137,7 +16092,7 @@ GameObject: - component: {fileID: 1149585994} - component: {fileID: 1149585996} - component: {fileID: 1149585995} - m_Layer: 5 + m_Layer: 9 m_Name: Item Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -16213,7 +16168,7 @@ GameObject: - component: {fileID: 1152260727} - component: {fileID: 1152260726} - component: {fileID: 1152260725} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryRender m_TagString: Untagged m_Icon: {fileID: 0} @@ -16405,7 +16360,7 @@ GameObject: - component: {fileID: 1162055061} - component: {fileID: 1162055063} - component: {fileID: 1162055062} - m_Layer: 5 + m_Layer: 9 m_Name: MemoryFinished m_TagString: Untagged m_Icon: {fileID: 0} @@ -16856,7 +16811,7 @@ GameObject: - component: {fileID: 1179576785} - component: {fileID: 1179576787} - component: {fileID: 1179576786} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -17017,7 +16972,7 @@ GameObject: - component: {fileID: 1183750205} - component: {fileID: 1183750204} - component: {fileID: 1183750203} - m_Layer: 5 + m_Layer: 9 m_Name: Dropdown m_TagString: Untagged m_Icon: {fileID: 0} @@ -17169,7 +17124,7 @@ GameObject: - component: {fileID: 1189421215} - component: {fileID: 1189421214} - component: {fileID: 1189421213} - m_Layer: 5 + m_Layer: 9 m_Name: Scrollbar m_TagString: Untagged m_Icon: {fileID: 0} @@ -17295,7 +17250,7 @@ GameObject: - component: {fileID: 1194991039} - component: {fileID: 1194991038} - component: {fileID: 1194991037} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -17416,7 +17371,7 @@ GameObject: - component: {fileID: 1207870025} - component: {fileID: 1207870024} - component: {fileID: 1207870023} - m_Layer: 5 + m_Layer: 9 m_Name: page2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -17512,7 +17467,7 @@ GameObject: - component: {fileID: 1209510058} - component: {fileID: 1209510060} - component: {fileID: 1209510059} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -17999,7 +17954,7 @@ GameObject: - component: {fileID: 1220514958} - component: {fileID: 1220514960} - component: {fileID: 1220514959} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -18074,7 +18029,7 @@ GameObject: - component: {fileID: 1224176948} - component: {fileID: 1224176950} - component: {fileID: 1224176949} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18208,7 +18163,7 @@ GameObject: - component: {fileID: 1235255815} - component: {fileID: 1235255817} - component: {fileID: 1235255816} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -18342,7 +18297,7 @@ GameObject: - component: {fileID: 1244183433} - component: {fileID: 1244183435} - component: {fileID: 1244183434} - m_Layer: 5 + m_Layer: 9 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -18417,7 +18372,7 @@ GameObject: - component: {fileID: 1255230569} - component: {fileID: 1255230571} - component: {fileID: 1255230570} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -18611,6 +18566,34 @@ PrefabInstance: propertyPath: m_TextStyleHashCode value: -1183493901 objectReference: {fileID: 0} + - target: {fileID: 536572174185929720, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1200673020346522525, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1460698461071452310, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 1816989196148034697, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345868045372, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345906872067, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274345920604344, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274345920604345, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -18623,10 +18606,22 @@ PrefabInstance: propertyPath: m_AnchorMin.x value: 0.5 objectReference: {fileID: 0} + - target: {fileID: 3083274346940298100, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 3083274347254332314, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347254332314, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 3083274347384374708, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347384374709, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_AnchorMax.x value: 0.5 @@ -18639,6 +18634,10 @@ PrefabInstance: propertyPath: m_Name value: SliderScaleBasic_Stamp objectReference: {fileID: 0} + - target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 3083274347408712451, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: m_IsActive value: 1 @@ -18727,10 +18726,30 @@ PrefabInstance: propertyPath: m_WholeNumbers value: 0 objectReference: {fileID: 0} + - target: {fileID: 3770969739482169645, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 6118684074714811541, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} propertyPath: hasText value: 0 objectReference: {fileID: 0} + - target: {fileID: 6372361153642431477, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 6973589123833841946, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 8144688368270242003, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} + - target: {fileID: 9155876842306098898, guid: 2cec9b064a8a95f41ba830d25ea87d2e, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -18966,7 +18985,7 @@ GameObject: - component: {fileID: 1307071590} - component: {fileID: 1307071592} - component: {fileID: 1307071591} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -19100,7 +19119,7 @@ GameObject: - component: {fileID: 1334591742} - component: {fileID: 1334591744} - component: {fileID: 1334591743} - m_Layer: 5 + m_Layer: 9 m_Name: CodeWindow m_TagString: Untagged m_Icon: {fileID: 0} @@ -19588,7 +19607,7 @@ GameObject: - component: {fileID: 1404540170} - component: {fileID: 1404540169} - component: {fileID: 1404540171} - m_Layer: 5 + m_Layer: 9 m_Name: PlayBackground m_TagString: Untagged m_Icon: {fileID: 0} @@ -19715,7 +19734,7 @@ GameObject: - component: {fileID: 1422065000} - component: {fileID: 1422064999} - component: {fileID: 1422064998} - m_Layer: 5 + m_Layer: 9 m_Name: ZoomInEye m_TagString: Untagged m_Icon: {fileID: 0} @@ -20132,7 +20151,7 @@ GameObject: - component: {fileID: 1446891234} - component: {fileID: 1446891233} - component: {fileID: 1446891232} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -20253,7 +20272,7 @@ GameObject: - component: {fileID: 1447811017} - component: {fileID: 1447811016} - component: {fileID: 1447811015} - m_Layer: 5 + m_Layer: 9 m_Name: tapeImage (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -20444,6 +20463,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 847697968} m_Modifications: + - target: {fileID: 95621502591072554, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 95621502591072554, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} propertyPath: m_IsActive value: 1 @@ -20484,6 +20507,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2539434050591565950, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 4703978764888130386, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} propertyPath: m_IsActive value: 0 @@ -20500,6 +20527,10 @@ PrefabInstance: propertyPath: m_Name value: UF objectReference: {fileID: 0} + - target: {fileID: 5248113521652737614, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 5612588720789407537, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} propertyPath: m_IsActive value: 0 @@ -20520,6 +20551,10 @@ PrefabInstance: propertyPath: m_Maskable value: 1 objectReference: {fileID: 0} + - target: {fileID: 7235470322137206611, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} - target: {fileID: 8058912131025573858, guid: 8f5a6866f8a4c844e9e9c9280990fe6c, type: 3} propertyPath: m_Enabled value: 0 @@ -20958,7 +20993,7 @@ GameObject: - component: {fileID: 1474527768} - component: {fileID: 1474527770} - component: {fileID: 1474527769} - m_Layer: 5 + m_Layer: 9 m_Name: UFView m_TagString: Untagged m_Icon: {fileID: 0} @@ -21386,7 +21421,7 @@ GameObject: - component: {fileID: 1496761515} - component: {fileID: 1496761517} - component: {fileID: 1496761516} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -21461,7 +21496,7 @@ GameObject: - component: {fileID: 1498347707} - component: {fileID: 1498347709} - component: {fileID: 1498347708} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -21598,7 +21633,7 @@ GameObject: - component: {fileID: 1502187946} - component: {fileID: 1502187945} - component: {fileID: 1502187944} - m_Layer: 5 + m_Layer: 9 m_Name: background m_TagString: Untagged m_Icon: {fileID: 0} @@ -21690,7 +21725,7 @@ GameObject: - component: {fileID: 1512557162} - component: {fileID: 1512557164} - component: {fileID: 1512557163} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -21765,7 +21800,7 @@ GameObject: - component: {fileID: 1534779241} - component: {fileID: 1534779243} - component: {fileID: 1534779242} - m_Layer: 5 + m_Layer: 9 m_Name: Memery m_TagString: Untagged m_Icon: {fileID: 0} @@ -22538,7 +22573,7 @@ GameObject: - component: {fileID: 1590015856} - component: {fileID: 1590015858} - component: {fileID: 1590015857} - m_Layer: 5 + m_Layer: 9 m_Name: entry2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -22698,7 +22733,7 @@ GameObject: - component: {fileID: 1596246722} - component: {fileID: 1596246724} - component: {fileID: 1596246723} - m_Layer: 5 + m_Layer: 9 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -22774,7 +22809,7 @@ GameObject: - component: {fileID: 1597388066} - component: {fileID: 1597388065} - component: {fileID: 1597388064} - m_Layer: 5 + m_Layer: 9 m_Name: TargetIndicator (1) m_TagString: Untagged m_Icon: {fileID: 0} @@ -22867,7 +22902,7 @@ GameObject: - component: {fileID: 1598659268} - component: {fileID: 1598659267} - component: {fileID: 1598659266} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -22955,7 +22990,7 @@ GameObject: - component: {fileID: 1603419541} - component: {fileID: 1603419543} - component: {fileID: 1603419542} - m_Layer: 5 + m_Layer: 9 m_Name: entry1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -23080,7 +23115,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1613409760} - m_Layer: 5 + m_Layer: 9 m_Name: Handle Slide Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -23118,7 +23153,7 @@ GameObject: - component: {fileID: 1615079357} - component: {fileID: 1615079359} - component: {fileID: 1615079358} - m_Layer: 5 + m_Layer: 9 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -23362,7 +23397,7 @@ GameObject: - component: {fileID: 1620905589} - component: {fileID: 1620905588} - component: {fileID: 1620905587} - m_Layer: 5 + m_Layer: 9 m_Name: next m_TagString: Untagged m_Icon: {fileID: 0} @@ -24048,7 +24083,7 @@ GameObject: - component: {fileID: 1684830029} - component: {fileID: 1684830031} - component: {fileID: 1684830030} - m_Layer: 5 + m_Layer: 9 m_Name: Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -24181,7 +24216,7 @@ GameObject: m_Component: - component: {fileID: 1687435156} - component: {fileID: 1687435157} - m_Layer: 5 + m_Layer: 9 m_Name: Slider m_TagString: Untagged m_Icon: {fileID: 0} @@ -25994,7 +26029,7 @@ GameObject: - component: {fileID: 1728600799} - component: {fileID: 1728600798} - component: {fileID: 1728600797} - m_Layer: 5 + m_Layer: 9 m_Name: punchTapeoutline m_TagString: Untagged m_Icon: {fileID: 0} @@ -26086,7 +26121,7 @@ GameObject: - component: {fileID: 1734431900} - component: {fileID: 1734431899} - component: {fileID: 1734431898} - m_Layer: 5 + m_Layer: 9 m_Name: Button m_TagString: Untagged m_Icon: {fileID: 0} @@ -27061,7 +27096,7 @@ GameObject: - component: {fileID: 1805580365} - component: {fileID: 1805580367} - component: {fileID: 1805580366} - m_Layer: 5 + m_Layer: 9 m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} @@ -27137,7 +27172,7 @@ GameObject: - component: {fileID: 1810288628} - component: {fileID: 1810288627} - component: {fileID: 1810288626} - m_Layer: 5 + m_Layer: 9 m_Name: page1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -27233,7 +27268,7 @@ GameObject: - component: {fileID: 1810834547} - component: {fileID: 1810834549} - component: {fileID: 1810834548} - m_Layer: 5 + m_Layer: 9 m_Name: BlackPanel m_TagString: Untagged m_Icon: {fileID: 0} @@ -27308,7 +27343,7 @@ GameObject: - component: {fileID: 1821060324} - component: {fileID: 1821060326} - component: {fileID: 1821060325} - m_Layer: 5 + m_Layer: 9 m_Name: Item Label m_TagString: Untagged m_Icon: {fileID: 0} @@ -27827,7 +27862,7 @@ GameObject: - component: {fileID: 1854177015} - component: {fileID: 1854177017} - component: {fileID: 1854177016} - m_Layer: 5 + m_Layer: 9 m_Name: Arrow m_TagString: Untagged m_Icon: {fileID: 0} @@ -27900,7 +27935,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1882069007} - m_Layer: 5 + m_Layer: 9 m_Name: Visual m_TagString: Untagged m_Icon: {fileID: 0} @@ -27945,7 +27980,7 @@ GameObject: - component: {fileID: 1905949535} - component: {fileID: 1905949534} - component: {fileID: 1905949533} - m_Layer: 5 + m_Layer: 9 m_Name: Viewport m_TagString: Untagged m_Icon: {fileID: 0} @@ -28139,7 +28174,7 @@ GameObject: - component: {fileID: 1940301554} - component: {fileID: 1940301556} - component: {fileID: 1940301555} - m_Layer: 5 + m_Layer: 9 m_Name: Handle m_TagString: Untagged m_Icon: {fileID: 0} @@ -28215,7 +28250,7 @@ GameObject: - component: {fileID: 1944658453} - component: {fileID: 1944658452} - component: {fileID: 1944658451} - m_Layer: 5 + m_Layer: 9 m_Name: Previous m_TagString: Untagged m_Icon: {fileID: 0} @@ -28335,7 +28370,7 @@ GameObject: - component: {fileID: 1953358213} - component: {fileID: 1953358215} - component: {fileID: 1953358214} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -28503,7 +28538,7 @@ GameObject: - component: {fileID: 1976507904} - component: {fileID: 1976507906} - component: {fileID: 1976507905} - m_Layer: 5 + m_Layer: 9 m_Name: Manual m_TagString: Untagged m_Icon: {fileID: 0} @@ -28666,7 +28701,7 @@ GameObject: - component: {fileID: 1995873728} - component: {fileID: 1995873730} - component: {fileID: 1995873729} - m_Layer: 5 + m_Layer: 9 m_Name: camera m_TagString: Untagged m_Icon: {fileID: 0} @@ -29195,7 +29230,7 @@ GameObject: - component: {fileID: 2028795587} - component: {fileID: 2028795589} - component: {fileID: 2028795588} - m_Layer: 0 + m_Layer: 9 m_Name: "\u6253\u5B54\u5E26 \u62F7\u8D1D" m_TagString: Untagged m_Icon: {fileID: 0} @@ -29270,7 +29305,7 @@ GameObject: - component: {fileID: 2029038284} - component: {fileID: 2029038286} - component: {fileID: 2029038285} - m_Layer: 0 + m_Layer: 9 m_Name: "\u6253\u5370\u673A\u5E95\u90E8" m_TagString: Untagged m_Icon: {fileID: 0} @@ -29345,7 +29380,7 @@ GameObject: - component: {fileID: 2043782141} - component: {fileID: 2043782143} - component: {fileID: 2043782142} - m_Layer: 5 + m_Layer: 9 m_Name: Back m_TagString: Untagged m_Icon: {fileID: 0} @@ -29423,7 +29458,7 @@ GameObject: - component: {fileID: 2051653936} - component: {fileID: 2051653938} - component: {fileID: 2051653937} - m_Layer: 5 + m_Layer: 9 m_Name: entry2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -29499,7 +29534,7 @@ GameObject: - component: {fileID: 2061474655} - component: {fileID: 2061474657} - component: {fileID: 2061474656} - m_Layer: 5 + m_Layer: 9 m_Name: Text (TMP) m_TagString: Untagged m_Icon: {fileID: 0} @@ -29801,7 +29836,7 @@ GameObject: - component: {fileID: 2066942290} - component: {fileID: 2066942292} - component: {fileID: 2066942291} - m_Layer: 5 + m_Layer: 9 m_Name: Fill m_TagString: Untagged m_Icon: {fileID: 0} @@ -30045,7 +30080,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2076089330} - m_Layer: 5 + m_Layer: 9 m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} @@ -30141,7 +30176,7 @@ GameObject: m_Component: - component: {fileID: 2088818327} - component: {fileID: 2088818328} - m_Layer: 5 + m_Layer: 9 m_Name: exposure m_TagString: Untagged m_Icon: {fileID: 0} @@ -31688,7 +31723,7 @@ GameObject: - component: {fileID: 2099861576} - component: {fileID: 2099861575} - component: {fileID: 2099861574} - m_Layer: 5 + m_Layer: 9 m_Name: element m_TagString: Untagged m_Icon: {fileID: 0} @@ -31883,6 +31918,10 @@ PrefabInstance: propertyPath: m_Name value: Tasktext objectReference: {fileID: 0} + - target: {fileID: 5295477770541402281, guid: ab166642babe53e4993fa1bd9bd57204, type: 3} + propertyPath: m_Layer + value: 9 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -32010,7 +32049,7 @@ GameObject: - component: {fileID: 2122469748} - component: {fileID: 2122469750} - component: {fileID: 2122469749} - m_Layer: 5 + m_Layer: 9 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -32856,7 +32895,7 @@ GameObject: - component: {fileID: 2147012103} - component: {fileID: 2147012105} - component: {fileID: 2147012104} - m_Layer: 5 + m_Layer: 9 m_Name: back m_TagString: Untagged m_Icon: {fileID: 0} @@ -33336,7 +33375,7 @@ PrefabInstance: - target: {fileID: 667196269251774960, guid: 95188b5d2a557274fb52febde14400b8, type: 3} propertyPath: sceneCamera value: - objectReference: {fileID: 291061727} + objectReference: {fileID: 0} - target: {fileID: 4256475766480134775, guid: 95188b5d2a557274fb52febde14400b8, type: 3} propertyPath: m_LocalPosition.x value: 0 diff --git a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs index 85db9836a..8f7d605ba 100644 --- a/Assets/Scripts/FixSystemNew/FixSystemCenter.cs +++ b/Assets/Scripts/FixSystemNew/FixSystemCenter.cs @@ -9,6 +9,7 @@ namespace AibisDream.FixSystem public FixState CurState => StateMachine.CurState; public Camera sceneCamera; + public Canvas deepCanvas; public override void OnSingletonInit() { @@ -39,6 +40,11 @@ namespace AibisDream.FixSystem { CameraKit.Instance.AddUICamera(sceneCamera); } + + if (deepCanvas) + { + deepCanvas.worldCamera = CameraKit.Instance.uiCamera; + } } private void UnloadScene() diff --git a/Assets/Scripts/Framework/OtherKit/CameraKit.cs b/Assets/Scripts/Framework/OtherKit/CameraKit.cs index 294cd0a7b..c0123ec14 100644 --- a/Assets/Scripts/Framework/OtherKit/CameraKit.cs +++ b/Assets/Scripts/Framework/OtherKit/CameraKit.cs @@ -26,6 +26,7 @@ namespace AibisDream.Framework private FixState _curFixState; private CamState _curInitState; + public Camera uiCamera; private struct CamState { @@ -43,6 +44,16 @@ namespace AibisDream.Framework { _cameraBrain = Camera.main?.GetComponent(); _curFixState = FixState.Default; + + // 获取UICamera + if (Camera.main && Camera.main.TryGetComponent(out var cameraData)) + { + // 获取Stack Cameras + var stackCameras = cameraData.cameraStack; + + // 获取UICamera + uiCamera = stackCameras.Find(cam => cam && cam.name == "UI Camera"); + } } #region 相机信息注册 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index e2c6a1363..9f353ed19 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -20,7 +20,7 @@ TagManager: - Post - ViewPost - Clinic - - + - DeepCanvas - - -