diff --git a/Assets/Resources/Prefabs/Common/PauseMenu/ArrowAnim.anim b/Assets/Resources/Prefabs/Common/PauseMenu/ArrowAnim.anim index fb49c12b3..1cf483fcd 100644 --- a/Assets/Resources/Prefabs/Common/PauseMenu/ArrowAnim.anim +++ b/Assets/Resources/Prefabs/Common/PauseMenu/ArrowAnim.anim @@ -51,7 +51,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_AnchoredPosition.x - path: + path: PausePanel/OptionsPanel/Arrow classID: 224 script: {fileID: 0} m_PPtrCurves: [] @@ -63,7 +63,7 @@ AnimationClip: m_ClipBindingConstant: genericBindings: - serializedVersion: 2 - path: 0 + path: 3605248767 attribute: 1460864421 script: {fileID: 0} typeID: 224 @@ -125,7 +125,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_AnchoredPosition.x - path: + path: PausePanel/OptionsPanel/Arrow classID: 224 script: {fileID: 0} m_EulerEditorCurves: [] diff --git a/Assets/Resources/Prefabs/Common/PauseMenu/PauseArrow.controller b/Assets/Resources/Prefabs/Common/PauseMenu/PauseArrow.controller deleted file mode 100644 index 696c9d723..000000000 --- a/Assets/Resources/Prefabs/Common/PauseMenu/PauseArrow.controller +++ /dev/null @@ -1,72 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-3012138682267480480 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: ArrowAnim - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: [] - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 7eb2eddb72b368c4187fd1a0cf6a2cf2, type: 2} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: ---- !u!91 &9100000 -AnimatorController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: PauseArrow - serializedVersion: 5 - m_AnimatorParameters: [] - m_AnimatorLayers: - - serializedVersion: 5 - m_Name: Base Layer - m_StateMachine: {fileID: 6662455586740448928} - m_Mask: {fileID: 0} - m_Motions: [] - m_Behaviours: [] - m_BlendingMode: 0 - m_SyncedLayerIndex: -1 - m_DefaultWeight: 0 - m_IKPass: 0 - m_SyncedLayerAffectsTiming: 0 - m_Controller: {fileID: 9100000} ---- !u!1107 &6662455586740448928 -AnimatorStateMachine: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -3012138682267480480} - m_Position: {x: 200, y: 0, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -3012138682267480480} diff --git a/Assets/Resources/Prefabs/Common/PauseMenu/PauseArrow.controller.meta b/Assets/Resources/Prefabs/Common/PauseMenu/PauseArrow.controller.meta deleted file mode 100644 index b469ad518..000000000 --- a/Assets/Resources/Prefabs/Common/PauseMenu/PauseArrow.controller.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 8e289d73791a1da4f8eceeeb3a9f05ba -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 9100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/Common/PauseMenu/PauseView.controller b/Assets/Resources/Prefabs/Common/PauseMenu/PauseView.controller index 1caf9885d..da4beed04 100644 --- a/Assets/Resources/Prefabs/Common/PauseMenu/PauseView.controller +++ b/Assets/Resources/Prefabs/Common/PauseMenu/PauseView.controller @@ -1,5 +1,31 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-6484081725620639828 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ArrowAnim + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 7eb2eddb72b368c4187fd1a0cf6a2cf2, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &-142180537568014793 AnimatorState: serializedVersion: 6 @@ -48,6 +74,40 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + - serializedVersion: 5 + m_Name: Arrow + m_StateMachine: {fileID: 1421966593728994295} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 1 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &1421966593728994295 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Arrow + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -6484081725620639828} + m_Position: {x: 230, y: 120, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -6484081725620639828} --- !u!1107 &2125439705161768588 AnimatorStateMachine: serializedVersion: 6 diff --git a/Assets/Resources/Prefabs/GameView/CamerasGame.prefab b/Assets/Resources/Prefabs/GameView/CamerasGame.prefab index db05ba5fc..c684493c7 100644 --- a/Assets/Resources/Prefabs/GameView/CamerasGame.prefab +++ b/Assets/Resources/Prefabs/GameView/CamerasGame.prefab @@ -1620,7 +1620,155 @@ MonoBehaviour: m_BeforeStackBundles: - assemblyQualifiedName: PostProcessOutline, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null - m_AfterStackBundles: [] + - assemblyQualifiedName: XPostProcessing.PixelizeCircle, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.PixelizeDiamond, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.PixelizeHexagon, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.PixelizeHexagonGrid, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.PixelizeLeaf, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.PixelizeLed, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.PixelizeQuad, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.PixelizeSector, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.PixelizeTriangle, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + m_AfterStackBundles: + - assemblyQualifiedName: CRT, Assembly-CSharp, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.AuroraVignette, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.BokehBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.BoxBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentBleachBypass, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentBrightness, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentContrast, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentContrastV2, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentContrastV3, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentHue, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentLensFilter, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentSaturation, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentTechnicolor, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentTint, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorAdjustmentWhiteBalance, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorReplace, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.ColorReplaceV2, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.DirectionalBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.DualBoxBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.DualGaussianBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.DualKawaseBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.DualTentBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.EdgeDetectionRoberts, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.EdgeDetectionRobertsNeon, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.EdgeDetectionRobertsNeonV2, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.EdgeDetectionScharr, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.EdgeDetectionScharrNeon, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.EdgeDetectionScharrNeonV2, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.EdgeDetectionSobel, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.EdgeDetectionSobelNeon, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.EdgeDetectionSobelNeonV2, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GaussianBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchAnalogNoise, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchDigitalStripe, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchImageBlock, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchImageBlockV2, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchImageBlockV3, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchImageBlockV4, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchLineBlock, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchRGBSplit, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchRGBSplitV2, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchRGBSplitV3, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchRGBSplitV4, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchRGBSplitV5, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchScanLineJitter, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchScreenJump, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchScreenShake, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchTileJitter, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GlitchWaveJitter, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.GrainyBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.IrisBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.IrisBlurV2, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.KawaseBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.RadialBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.RadialBlurV2, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.RapidOldTVVignette, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.RapidOldTVVignetteV2, Assembly-CSharp, + Version=0.0.0.0, Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.RapidVignette, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.RapidVignetteV2, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.SharpenV1, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.SharpenV2, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.SharpenV3, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.TentBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.TiltShiftBlur, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null + - assemblyQualifiedName: XPostProcessing.TiltShiftBlurV2, Assembly-CSharp, Version=0.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &5530727079185901299 GameObject: m_ObjectHideFlags: 0 @@ -2173,7 +2321,6 @@ GameObject: - component: {fileID: 5910053668072627295} - component: {fileID: 1479785503205304790} - component: {fileID: 6445699047331451444} - - component: {fileID: 8059306390540640774} m_Layer: 31 m_Name: Arrow m_TagString: Untagged @@ -2239,27 +2386,6 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!95 &8059306390540640774 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6943570849566976590} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 8e289d73791a1da4f8eceeeb3a9f05ba, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1 &7252983913051326197 GameObject: m_ObjectHideFlags: 0