diff --git a/.idea/.idea.Jeremy BBJam/.idea/vcs.xml b/.idea/.idea.Jeremy BBJam/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/.idea.Jeremy BBJam/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assets/Art.meta b/Assets/Art.meta new file mode 100644 index 0000000..924c4f8 --- /dev/null +++ b/Assets/Art.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2adec5e90afbd9f428758418d442bcc3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/WIP.meta b/Assets/Art/WIP.meta new file mode 100644 index 0000000..a645ecb --- /dev/null +++ b/Assets/Art/WIP.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 544e364bdd3d80646be45cd8ae0ad0e8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/WIP/WIP Arrow.afphoto b/Assets/Art/WIP/WIP Arrow.afphoto new file mode 100644 index 0000000..4772524 Binary files /dev/null and b/Assets/Art/WIP/WIP Arrow.afphoto differ diff --git a/Assets/Art/WIP/WIP Arrow.afphoto.meta b/Assets/Art/WIP/WIP Arrow.afphoto.meta new file mode 100644 index 0000000..fc051d4 --- /dev/null +++ b/Assets/Art/WIP/WIP Arrow.afphoto.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2f71ac16614a4774382b71eaa85ecab0 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Art/WIP/WIP Arrow.afphoto~lock~ b/Assets/Art/WIP/WIP Arrow.afphoto~lock~ new file mode 100644 index 0000000..6437650 Binary files /dev/null and b/Assets/Art/WIP/WIP Arrow.afphoto~lock~ differ diff --git a/Assets/Art/WIP/WIP Arrow.png b/Assets/Art/WIP/WIP Arrow.png new file mode 100644 index 0000000..938b9f0 Binary files /dev/null and b/Assets/Art/WIP/WIP Arrow.png differ diff --git a/Assets/Art/WIP/WIP Arrow.png.meta b/Assets/Art/WIP/WIP Arrow.png.meta new file mode 100644 index 0000000..6588227 --- /dev/null +++ b/Assets/Art/WIP/WIP Arrow.png.meta @@ -0,0 +1,155 @@ +fileFormatVersion: 2 +guid: cab0ee2c4c92f614bb3c726c7f75e126 +TextureImporter: + internalIDToNameTable: + - first: + 213: 3193712258226666178 + second: WIP Arrow_0 + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 2 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: + - serializedVersion: 2 + name: WIP Arrow_0 + rect: + serializedVersion: 2 + x: 132 + y: 47 + width: 3341 + height: 2377 + alignment: 0 + pivot: {x: 0, y: 0} + border: {x: 0, y: 0, z: 0, w: 0} + customData: + outline: [] + physicsShape: [] + tessellationDetail: -1 + bones: [] + spriteID: 2ca396ab068525c20800000000000000 + internalID: 3193712258226666178 + vertices: [] + indices: + edges: [] + weights: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity index c55947e..9db98fc 100644 --- a/Assets/Scenes/MainScene.unity +++ b/Assets/Scenes/MainScene.unity @@ -119,6 +119,197 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &495253857 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 495253858} + - component: {fileID: 495253861} + - component: {fileID: 495253862} + - component: {fileID: 495253860} + - component: {fileID: 495253859} + - component: {fileID: 495253863} + m_Layer: 0 + m_Name: ContinueButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &495253858 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495253857} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 23.8, y: -9.8, z: 0} + m_LocalScale: {x: 0.3, y: 0.3, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 680791503} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &495253859 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495253857} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e545d598a5d16f4e8b9a70fedc8b7a3, type: 3} + m_Name: + m_EditorClassIdentifier: + _onClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 495253863} + m_TargetAssemblyTypeName: SwitchToScene, Assembly-CSharp + m_MethodName: Switch + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &495253860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495253857} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4218d78ef2d54d0898b7514e121a781f, type: 3} + m_Name: + m_EditorClassIdentifier: + _color: {r: 1, g: 0, b: 0, a: 1} +--- !u!212 &495253861 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495253857} + m_Enabled: 1 + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 3193712258226666178, guid: cab0ee2c4c92f614bb3c726c7f75e126, type: 3} + m_Color: {r: 0.47912958, g: 0.9150943, b: 0.72990835, 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!61 &495253862 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495253857} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 33.41989, y: 23.77} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 33.41989, y: 23.77} + m_EdgeRadius: 0 +--- !u!114 &495253863 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 495253857} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e085a6bafb27f9f4abf848fdc2f073b3, type: 3} + m_Name: + m_EditorClassIdentifier: + _scene: + index: 2 --- !u!1 &607033216 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1766368079009719264, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} @@ -230,6 +421,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 1766368079009719264, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} insertIndex: -1 addedObject: {fileID: 635476294} + - targetCorrespondingSourceObject: {fileID: 1766368079009719264, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + insertIndex: -1 + addedObject: {fileID: 635476299} m_SourcePrefab: {fileID: 100100000, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} --- !u!4 &635476291 stripped Transform: @@ -271,6 +465,50 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: _animation: {fileID: 635476293} +--- !u!114 &635476299 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 635476292} + 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: 0 + 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: + m_Quality: 3 + m_FrameInfluence: 0.1 + m_JitterScale: 1 + m_MipBias: 0 + m_VarianceClampScale: 0.9 + m_ContrastAdaptiveSharpening: 0 --- !u!1 &680791502 GameObject: m_ObjectHideFlags: 0 @@ -286,7 +524,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &680791503 Transform: m_ObjectHideFlags: 0 @@ -303,6 +541,7 @@ Transform: - {fileID: 635476291} - {fileID: 1252317701} - {fileID: 1743166475} + - {fileID: 495253858} m_Father: {fileID: 1037840390} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &695263387 @@ -355,7 +594,6 @@ MonoBehaviour: m_EditorClassIdentifier: _scene: index: 1 - _triggerOnClick: 1 --- !u!212 &695263390 SpriteRenderer: m_ObjectHideFlags: 0 @@ -482,9 +720,247 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0e545d598a5d16f4e8b9a70fedc8b7a3, type: 3} m_Name: m_EditorClassIdentifier: + _onClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 695263389} + m_TargetAssemblyTypeName: SwitchToScene, Assembly-CSharp + m_MethodName: Switch + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!1001 &892613427 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2068309527} + m_Modifications: + - target: {fileID: 1841087141622184032, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_Name + value: SceneBasics + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} +--- !u!4 &892613428 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6534699924056499542, guid: 6288754d3f1f19e4aac4dbf1b5033c50, type: 3} + m_PrefabInstance: {fileID: 892613427} + m_PrefabAsset: {fileID: 0} +--- !u!1 &937838657 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 937838658} + - component: {fileID: 937838662} + - component: {fileID: 937838661} + - component: {fileID: 937838660} + - component: {fileID: 937838659} + m_Layer: 0 + m_Name: ContinueButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &937838658 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 937838657} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 39.8, y: -0.1, z: 0} + m_LocalScale: {x: 0.58856994, y: 0.57048, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2068309527} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &937838659 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 937838657} + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 0 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 33.41989, y: 23.77} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 33.41989, y: 23.77} + m_EdgeRadius: 0 +--- !u!114 &937838660 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 937838657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0e545d598a5d16f4e8b9a70fedc8b7a3, type: 3} + m_Name: + m_EditorClassIdentifier: _onClick: m_PersistentCalls: m_Calls: [] +--- !u!114 &937838661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 937838657} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4218d78ef2d54d0898b7514e121a781f, type: 3} + m_Name: + m_EditorClassIdentifier: + _color: {r: 1, g: 0, b: 0, a: 1} +--- !u!212 &937838662 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 937838657} + m_Enabled: 1 + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, 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: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 3193712258226666178, guid: cab0ee2c4c92f614bb3c726c7f75e126, type: 3} + m_Color: {r: 0.47912958, g: 0.9150943, b: 0.72990835, 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 &1037840389 GameObject: m_ObjectHideFlags: 0 @@ -517,6 +993,7 @@ Transform: m_Children: - {fileID: 1391342912} - {fileID: 680791503} + - {fileID: 2068309527} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1037840391 @@ -592,6 +1069,22 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 + - waitSeconds: 5 + unityEvent: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 495253857} + m_TargetAssemblyTypeName: UnityEngine.GameObject, UnityEngine + m_MethodName: SetActive + m_Mode: 6 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 1 + m_CallState: 2 --- !u!1 &1391342911 GameObject: m_ObjectHideFlags: 0 @@ -607,7 +1100,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1391342912 Transform: m_ObjectHideFlags: 0 @@ -780,6 +1273,39 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2068309526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2068309527} + m_Layer: 0 + m_Name: 4-Doggy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2068309527 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068309526} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 892613428} + - {fileID: 937838658} + m_Father: {fileID: 1037840390} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2839863372261682904 PrefabInstance: m_ObjectHideFlags: 0 @@ -849,5 +1375,5 @@ Transform: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1037840390} - {fileID: 1976724025} + - {fileID: 1037840390} diff --git a/Assets/Scripts/MyButton.cs b/Assets/Scripts/MyButton.cs index 3129a45..4bebcee 100644 --- a/Assets/Scripts/MyButton.cs +++ b/Assets/Scripts/MyButton.cs @@ -15,7 +15,13 @@ public class MyButton : MonoBehaviour, IPointerClickHandler, IPointerEnterHandle private void Awake() { + if (!TryGetComponent(out Collider2D _)) + { + Debug.LogError("MyButton needs a Collider2D to work", gameObject); + } + _outlineFx = GetComponent(); + _outlineFx.enabled = false; } public void OnPointerClick(PointerEventData eventData) diff --git a/Assets/Scripts/SwitchToScene.cs b/Assets/Scripts/SwitchToScene.cs index c2102a4..b57d68d 100644 --- a/Assets/Scripts/SwitchToScene.cs +++ b/Assets/Scripts/SwitchToScene.cs @@ -3,24 +3,13 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; -public class SwitchToScene : MonoBehaviour, IPointerClickHandler +public class SwitchToScene : MonoBehaviour { [SerializeField] private SwitchableScene _scene; - [SerializeField] - private bool _triggerOnClick; - public void Switch() { SceneSwitcher.Instance.SwitchScene(_scene.index); } - - public void OnPointerClick(PointerEventData eventData) - { - Debug.Log("Click"); - - if (_triggerOnClick) - Switch(); - } }