diff --git a/Prototype/Assets/Prefabs/BlackHole.prefab b/Prototype/Assets/Prefabs/BlackHole.prefab deleted file mode 100644 index 9d5c2cf..0000000 --- a/Prototype/Assets/Prefabs/BlackHole.prefab +++ /dev/null @@ -1,107 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1001 &100100000 -Prefab: - m_ObjectHideFlags: 1 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: [] - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 0} - m_RootGameObject: {fileID: 1825723940427572} - m_IsPrefabAsset: 1 ---- !u!1 &1825723940427572 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 6 - m_Component: - - component: {fileID: 4927523239576160} - - component: {fileID: 212476040648355064} - - component: {fileID: 95489229018453264} - m_Layer: 0 - m_Name: BlackHole - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4927523239576160 -Transform: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1825723940427572} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 31.9, y: 31.9, z: 63.8} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &95489229018453264 -Animator: - serializedVersion: 3 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1825723940427572} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: b5a860a5bcfb68041aeb498ac84373ca, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!212 &212476040648355064 -SpriteRenderer: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1825723940427572} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: 1 - m_Sprite: {fileID: 21300000, guid: 6d28ad8e514b7ff4b9159ef2e9577ed2, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 2.5, y: 2.5} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 diff --git a/Prototype/Assets/Prefabs/Directional Light.prefab b/Prototype/Assets/Prefabs/Directional Light.prefab new file mode 100644 index 0000000..635b3e4 --- /dev/null +++ b/Prototype/Assets/Prefabs/Directional Light.prefab @@ -0,0 +1,79 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &100100000 +Prefab: + m_ObjectHideFlags: 1 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: [] + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 0} + m_RootGameObject: {fileID: 1936654030534816} + m_IsPrefabAsset: 1 +--- !u!1 &1936654030534816 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 6 + m_Component: + - component: {fileID: 4029168224632666} + - component: {fileID: 108045027295303974} + m_Layer: 0 + m_Name: Directional Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4029168224632666 +Transform: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1936654030534816} + m_LocalRotation: {x: 0.1464465, y: -0.3535538, z: 0.3535533, w: 0.8535533} + m_LocalPosition: {x: 3.53, y: 5.53, z: -0.76} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 30.000002, y: -35.264, z: 35.264} +--- !u!108 &108045027295303974 +Light: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1936654030534816} + m_Enabled: 1 + serializedVersion: 8 + m_Type: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 + m_Range: 10 + m_SpotAngle: 30 + m_CookieSize: 10 + m_Shadows: + m_Type: 1 + m_Resolution: -1 + m_CustomResolution: -1 + m_Strength: 1 + m_Bias: 0.2 + m_NormalBias: 0.4 + m_NearPlane: 0.1 + m_Cookie: {fileID: 0} + m_DrawHalo: 0 + m_Flare: {fileID: 0} + m_RenderMode: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_Lightmapping: 4 + m_LightShadowCasterMode: 0 + m_AreaSize: {x: 1, y: 1} + m_BounceIntensity: 1 + m_ColorTemperature: 6570 + m_UseColorTemperature: 0 + m_ShadowRadius: 0 + m_ShadowAngle: 0 diff --git a/Prototype/Assets/Prefabs/BlackHole.prefab.meta b/Prototype/Assets/Prefabs/Directional Light.prefab.meta similarity index 79% rename from Prototype/Assets/Prefabs/BlackHole.prefab.meta rename to Prototype/Assets/Prefabs/Directional Light.prefab.meta index e3a9749..864c903 100644 --- a/Prototype/Assets/Prefabs/BlackHole.prefab.meta +++ b/Prototype/Assets/Prefabs/Directional Light.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 686e065bf45f45b45b88594546f9ab40 +guid: 51bc2725b809f5d45b54c658b92d88f4 NativeFormatImporter: externalObjects: {} mainObjectFileID: 100100000 diff --git a/Prototype/Assets/Scenes/Tutorial.unity b/Prototype/Assets/Scenes/Tutorial.unity index 271c220..a8310de 100644 --- a/Prototype/Assets/Scenes/Tutorial.unity +++ b/Prototype/Assets/Scenes/Tutorial.unity @@ -113,93 +113,154 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &114265312 +--- !u!1001 &200023322 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalPosition.x + value: -1.49 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalPosition.y + value: -2.59 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 1111747923641672, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_Name + value: goodSmile2 (2) + objectReference: {fileID: 0} + - target: {fileID: 114134677077384724, guid: 7d181943fa45fee4d934b0f420862447, + type: 2} + propertyPath: isGold + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + m_IsPrefabAsset: 0 +--- !u!1001 &317695500 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalPosition.x + value: -1.49 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalPosition.y + value: -0.59 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 1111747923641672, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_Name + value: goodSmile2 (1) + objectReference: {fileID: 0} + - target: {fileID: 114134677077384724, guid: 7d181943fa45fee4d934b0f420862447, + type: 2} + propertyPath: isAnger + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + m_IsPrefabAsset: 0 +--- !u!1 &450425064 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 114265313} - - component: {fileID: 114265316} - - component: {fileID: 114265315} - - component: {fileID: 114265314} + - component: {fileID: 450425066} + - component: {fileID: 450425065} m_Layer: 0 - m_Name: BWall - m_TagString: Wall + m_Name: Score + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &114265313 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 114265312} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} - m_Children: [] - m_Father: {fileID: 1457788850} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -44} - m_SizeDelta: {x: 1, y: 1} - m_Pivot: {x: 0.5, y: 0} ---- !u!50 &114265314 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 114265312} - m_BodyType: 2 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} - m_Interpolate: 0 - m_SleepingMode: 0 - m_CollisionDetection: 1 - m_Constraints: 0 ---- !u!61 &114265315 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 114265312} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.004981518, y: 0.15193298} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 10.24, y: 7.68} - newSize: {x: 10.24, y: 7.68} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 20.5, y: 0.3} - m_EdgeRadius: 0 ---- !u!212 &114265316 +--- !u!212 &450425065 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 114265312} + m_GameObject: {fileID: 450425064} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -229,97 +290,30 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: aea442802cb7f4644b03104c1a211b7b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 10.24, y: 7.68} + m_Size: {x: 5.12, y: 5.12} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &630878992 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 630878993} - - component: {fileID: 630878994} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &630878993 -RectTransform: +--- !u!4 &450425066 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 630878992} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 130, y: 130, z: 142.2472} + m_GameObject: {fileID: 450425064} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.106, y: 1.58, z: 0} + m_LocalScale: {x: 0.15, y: 0.15, z: 0.15} m_Children: [] - m_Father: {fileID: 1457788850} - m_RootOrder: 4 + m_Father: {fileID: 0} + m_RootOrder: 7 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: 10.24, y: 7.68} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!212 &630878994 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 630878992} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: -1 - m_Sprite: {fileID: 21300000, guid: 4da8c50f26ec84a4b9e746048dec1a30, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.24, y: 7.68} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &667946872 GameObject: m_ObjectHideFlags: 0 @@ -353,7 +347,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.4339623, g: 0.4339623, b: 0.4339623, a: 0} m_projectionMatrixMode: 1 m_SensorSize: {x: 36, y: 24} m_LensShift: {x: 0, y: 0} @@ -397,220 +391,123 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1006673451 +--- !u!1 &867815688 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1006673452} - - component: {fileID: 1006673455} - - component: {fileID: 1006673454} - - component: {fileID: 1006673453} - m_Layer: 0 - m_Name: LWall - m_TagString: Wall + - component: {fileID: 867815689} + - component: {fileID: 867815691} + - component: {fileID: 867815690} + m_Layer: 5 + m_Name: Dont touch + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1006673452 +--- !u!224 &867815689 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1006673451} + m_GameObject: {fileID: 867815688} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} + m_LocalScale: {x: 1.0002, y: 1.0002, z: 1.0002} m_Children: [] m_Father: {fileID: 1457788850} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: -38, y: 0} - m_SizeDelta: {x: 1, y: 1} - m_Pivot: {x: 0, y: 0.5} ---- !u!50 &1006673453 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1006673451} - m_BodyType: 2 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} - m_Interpolate: 0 - m_SleepingMode: 0 - m_CollisionDetection: 1 - m_Constraints: 0 ---- !u!61 &1006673454 -BoxCollider2D: + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 49.999992, y: -29.30001} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &867815690 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1006673451} + m_GameObject: {fileID: 867815688} m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.030000001, y: -0.013874531} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 10.24, y: 7.68} - newSize: {x: 10.24, y: 7.68} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.5, y: 19.720936} - m_EdgeRadius: 0 ---- !u!212 &1006673455 -SpriteRenderer: + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.7264151, g: 0.18845676, b: 0.18845676, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 19 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: do not touch +--- !u!222 &867815691 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1006673451} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.24, y: 7.68} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &1253026231 + m_GameObject: {fileID: 867815688} + m_CullTransparentMesh: 0 +--- !u!1 &1001933453 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1253026232} - - component: {fileID: 1253026235} - - component: {fileID: 1253026234} - - component: {fileID: 1253026233} + - component: {fileID: 1001933454} + - component: {fileID: 1001933455} + - component: {fileID: 1001933457} + - component: {fileID: 1001933456} m_Layer: 0 - m_Name: RWall - m_TagString: Wall + m_Name: MainMenuButton + m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1253026232 +--- !u!224 &1001933454 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1253026231} + m_GameObject: {fileID: 1001933453} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} + m_LocalScale: {x: 9, y: 9, z: 9} m_Children: [] m_Father: {fileID: 1457788850} - m_RootOrder: 3 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 32, y: 0} - m_SizeDelta: {x: 1, y: 1} - m_Pivot: {x: 1, y: 0.5} ---- !u!50 &1253026233 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1253026231} - m_BodyType: 2 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} - m_Interpolate: 0 - m_SleepingMode: 0 - m_CollisionDetection: 1 - m_Constraints: 0 ---- !u!61 &1253026234 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1253026231} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0.030000001, y: -0.020925045} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 10.24, y: 7.68} - newSize: {x: 10.24, y: 7.68} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 0.5, y: 19.700874} - m_EdgeRadius: 0 ---- !u!212 &1253026235 + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 40, y: -40} + m_SizeDelta: {x: 7.5, y: 7.5} + m_Pivot: {x: 0.50000006, y: 0.5} +--- !u!212 &1001933455 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1253026231} + m_GameObject: {fileID: 1001933453} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -640,144 +537,53 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: 4481b657e1d4b394fa8f8dd5545585b9, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 m_DrawMode: 0 - m_Size: {x: 10.24, y: 7.68} + m_Size: {x: 7.5, y: 7.5} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 + m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1257535560 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1257535561} - - component: {fileID: 1257535564} - - component: {fileID: 1257535563} - - component: {fileID: 1257535562} - m_Layer: 0 - m_Name: TWall - m_TagString: Wall - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1257535561 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1257535560} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 143.99998, y: 143.99998, z: 143.99998} - m_Children: [] - m_Father: {fileID: 1457788850} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 1, y: 1} - m_Pivot: {x: 0.5, y: 1} ---- !u!50 &1257535562 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1257535560} - m_BodyType: 2 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDrag: 0 - m_AngularDrag: 0.05 - m_GravityScale: 0 - m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} - m_Interpolate: 0 - m_SleepingMode: 0 - m_CollisionDetection: 1 - m_Constraints: 0 ---- !u!61 &1257535563 +--- !u!61 &1001933456 BoxCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1257535560} + m_GameObject: {fileID: 1001933453} m_Enabled: 1 m_Density: 1 - m_Material: {fileID: 6200000, guid: 4c8a339d423f8664da202e96302f6959, type: 2} + m_Material: {fileID: 6200000, guid: f150a5f346aef81459c0f37038ac4b49, type: 2} m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.004981518, y: 0.15193298} + 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: 10.24, y: 7.68} - newSize: {x: 10.24, y: 7.68} + oldSize: {x: 7.5, y: 7.5} + newSize: {x: 7.5, y: 7.5} adaptiveTilingThreshold: 0.5 drawMode: 0 adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 20.5, y: 0.3} + m_Size: {x: 7.5, y: 7.5} m_EdgeRadius: 0 ---- !u!212 &1257535564 -SpriteRenderer: +--- !u!114 &1001933457 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 1257535560} + m_GameObject: {fileID: 1001933453} m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RenderingLayerMask: 4294967295 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - 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: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 10.24, y: 7.68} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e92c96e95066574aa3130ef9cde1514, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1350556309 GameObject: m_ObjectHideFlags: 0 @@ -840,6 +646,48 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1368465827 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4029168224632666, guid: 51bc2725b809f5d45b54c658b92d88f4, type: 2} + propertyPath: m_LocalPosition.x + value: 3.53 + objectReference: {fileID: 0} + - target: {fileID: 4029168224632666, guid: 51bc2725b809f5d45b54c658b92d88f4, type: 2} + propertyPath: m_LocalPosition.y + value: 5.53 + objectReference: {fileID: 0} + - target: {fileID: 4029168224632666, guid: 51bc2725b809f5d45b54c658b92d88f4, type: 2} + propertyPath: m_LocalPosition.z + value: -0.76 + objectReference: {fileID: 0} + - target: {fileID: 4029168224632666, guid: 51bc2725b809f5d45b54c658b92d88f4, type: 2} + propertyPath: m_LocalRotation.x + value: 0.1464465 + objectReference: {fileID: 0} + - target: {fileID: 4029168224632666, guid: 51bc2725b809f5d45b54c658b92d88f4, type: 2} + propertyPath: m_LocalRotation.y + value: -0.3535538 + objectReference: {fileID: 0} + - target: {fileID: 4029168224632666, guid: 51bc2725b809f5d45b54c658b92d88f4, type: 2} + propertyPath: m_LocalRotation.z + value: 0.3535533 + objectReference: {fileID: 0} + - target: {fileID: 4029168224632666, guid: 51bc2725b809f5d45b54c658b92d88f4, type: 2} + propertyPath: m_LocalRotation.w + value: 0.8535533 + objectReference: {fileID: 0} + - target: {fileID: 4029168224632666, guid: 51bc2725b809f5d45b54c658b92d88f4, type: 2} + propertyPath: m_RootOrder + value: 6 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 51bc2725b809f5d45b54c658b92d88f4, type: 2} + m_IsPrefabAsset: 0 --- !u!1 &1457788846 GameObject: m_ObjectHideFlags: 0 @@ -925,11 +773,10 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_Children: - - {fileID: 114265313} - - {fileID: 1257535561} - - {fileID: 1006673452} - - {fileID: 1253026232} - - {fileID: 630878993} + - {fileID: 1001933454} + - {fileID: 2040746375} + - {fileID: 867815689} + - {fileID: 1865339819} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -938,3 +785,282 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1001 &1563458705 +Prefab: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalPosition.x + value: -1.49 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalPosition.y + value: 1.4104863 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalScale.x + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalScale.y + value: 0.3 + objectReference: {fileID: 0} + - target: {fileID: 4256888377001252, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + propertyPath: m_LocalScale.z + value: 0.3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7d181943fa45fee4d934b0f420862447, type: 2} + m_IsPrefabAsset: 0 +--- !u!1 &1671769775 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1671769777} + - component: {fileID: 1671769776} + m_Layer: 0 + m_Name: Gems + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &1671769776 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1671769775} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RenderingLayerMask: 4294967295 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + 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: 21300000, guid: 1b9f0dc52adb0ed448cd5f8b127732d7, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 5.12, y: 5.12} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1671769777 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1671769775} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.038, y: -2.389, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1865339818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1865339819} + - component: {fileID: 1865339821} + - component: {fileID: 1865339820} + m_Layer: 5 + m_Name: Touch to collect (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1865339819 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1865339818} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.0002, y: 1.0002, z: 1.0002} + m_Children: [] + m_Father: {fileID: 1457788850} + m_RootOrder: 3 + 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: 49.999992, y: -149.30002} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1865339820 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1865339818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 19 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'touch to collect ' +--- !u!222 &1865339821 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1865339818} + m_CullTransparentMesh: 0 +--- !u!1 &2040746374 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2040746375} + - component: {fileID: 2040746377} + - component: {fileID: 2040746376} + m_Layer: 5 + m_Name: 'Touch to collect ' + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2040746375 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040746374} + 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_Children: [] + m_Father: {fileID: 1457788850} + m_RootOrder: 1 + 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: 50, y: 90.7} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2040746376 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040746374} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 19 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 0 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 'touch to collect ' +--- !u!222 &2040746377 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 2040746374} + m_CullTransparentMesh: 0 diff --git a/Prototype/Assets/Scripts/MainMenuButton.cs b/Prototype/Assets/Scripts/Buttons.cs similarity index 81% rename from Prototype/Assets/Scripts/MainMenuButton.cs rename to Prototype/Assets/Scripts/Buttons.cs index 2b9b670..c809caf 100644 --- a/Prototype/Assets/Scripts/MainMenuButton.cs +++ b/Prototype/Assets/Scripts/Buttons.cs @@ -3,10 +3,9 @@ using UnityEngine; using UnityEngine.SceneManagement; -public class MainMenuButton : MonoBehaviour { - - public Sprite SpriteOnMouseUpButton, SpriteOnMouseDownButton; +public class Buttons : MonoBehaviour { + private void OnMouseDown() { @@ -33,9 +32,13 @@ private void OnMouseUpAsButton() case "AdsButton": SceneManager.LoadScene("Ads"); break; - case "ScoreboardButton": + case "OptionsButton": SceneManager.LoadScene("Options"); break; + case "MainMenuButton": + SceneManager.LoadScene("Main menu"); + break; + } } } diff --git a/Prototype/Assets/Scripts/MainMenuButton.cs.meta b/Prototype/Assets/Scripts/Buttons.cs.meta similarity index 100% rename from Prototype/Assets/Scripts/MainMenuButton.cs.meta rename to Prototype/Assets/Scripts/Buttons.cs.meta diff --git a/Prototype/Assets/Scripts/CntrlSmile.cs b/Prototype/Assets/Scripts/CntrlSmile.cs index b2ec806..fd0c0cd 100644 --- a/Prototype/Assets/Scripts/CntrlSmile.cs +++ b/Prototype/Assets/Scripts/CntrlSmile.cs @@ -7,17 +7,20 @@ public class CntrlSmile : MonoBehaviour public GameController gameController; public GameObject objectGoodSmile; public bool isGold = false; + public bool isAnger = false; private float speed, tilt; private Vector3 target; - private bool isAnger = false; private int localScore = 0; private int randomAngerActivator; private void Start() { - speed = gameController.speed; - tilt = gameController.tilt; + if (gameController) + { + speed = gameController.speed; + tilt = gameController.tilt; + } ChangeTarget(); randomAngerActivator = Random.Range(5, 9); } @@ -44,10 +47,7 @@ void Update() } } - if (gameController.cntScore == 20) - { - speed = gameController.speed; - } + } private void OnCollisionEnter2D(Collision2D nearObj) diff --git a/Prototype/Assets/Scripts/GameController.cs b/Prototype/Assets/Scripts/GameController.cs index e9829b4..9334219 100644 --- a/Prototype/Assets/Scripts/GameController.cs +++ b/Prototype/Assets/Scripts/GameController.cs @@ -41,6 +41,8 @@ void Update () { speed += 0.5f; semaphoreForSpeed = false; } + + //Lose if (!GameObject.FindWithTag("Smile")) { PlayerLose(); diff --git a/Prototype/Library/CurrentLayout.dwlt b/Prototype/Library/CurrentLayout.dwlt index ee308a8..38163ca 100644 --- a/Prototype/Library/CurrentLayout.dwlt +++ b/Prototype/Library/CurrentLayout.dwlt @@ -40,8 +40,8 @@ MonoBehaviour: y: 0 width: 528 height: 607 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 20} m_Panes: - {fileID: 20} @@ -67,10 +67,10 @@ MonoBehaviour: y: 30 width: 1920 height: 947 - m_MinSize: {x: 887, y: 492} - m_MaxSize: {x: 16012, y: 14042} + m_MinSize: {x: 885, y: 492} + m_MaxSize: {x: 16010, y: 14042} vertical: 0 - controlID: 125 + controlID: 124 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -114,8 +114,8 @@ MonoBehaviour: y: 0 width: 253 height: 607 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -235,7 +235,7 @@ MonoBehaviour: m_MinSize: {x: 610, y: 492} m_MaxSize: {x: 12010, y: 14042} vertical: 1 - controlID: 126 + controlID: 125 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -260,7 +260,7 @@ MonoBehaviour: m_MinSize: {x: 610, y: 221} m_MaxSize: {x: 12010, y: 4021} vertical: 0 - controlID: 127 + controlID: 126 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -279,8 +279,8 @@ MonoBehaviour: y: 0 width: 780 height: 607 - m_MinSize: {x: 204, y: 221} - m_MaxSize: {x: 4004, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -379,7 +379,7 @@ MonoBehaviour: m_AnimEditor: {fileID: 0} m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -306956 + m_LastSelectedObjectID: -169952 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -442,20 +442,20 @@ MonoBehaviour: m_ShowAllHits: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Prefabs m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts + - Assets/Prefabs m_LastFoldersGridSize: -1 m_LastProjectPath: D:\Documents\Prototype\Prototype m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e62c0000 - m_LastClickedID: 11494 - m_ExpandedIDs: 00000000f2290000ee2b000000ca9a3b + m_SelectedIDs: 5c2c0000 + m_LastClickedID: 11356 + m_ExpandedIDs: 00000000f2290000f02b000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -483,7 +483,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000f2290000ee2b0000282c0000 + m_ExpandedIDs: 00000000f2290000f02b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -599,9 +599,9 @@ MonoBehaviour: m_PersistentViewDataDictionary: {fileID: 0} m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: c6280000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: fafffeff6a0affffa23affffd83bffffa44bffff0258ffff1865ffff967bffff2e7fffff7482ffffea84ffff5c88ffff8a89ffff928affff2e8cffff488dffffd496ffff58e1ffffe4fbffff000000004c2e0000aa300000 + m_ExpandedIDs: c85ffcfffc93fcff2c54feff2857feff5edffefff4f7ffffe6f8ffffe4fbffff000000004e2e00004e2f000014330000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -650,14 +650,14 @@ MonoBehaviour: height: 586 m_PersistentViewDataDictionary: {fileID: 0} m_SceneLighting: 0 - lastFramingTime: 627.0658113999999 + lastFramingTime: 2907.6969908 m_2DMode: 1 m_isRotationLocked: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0, y: 0, z: -10} + m_Target: {x: 2.5263796, y: -0.22082889, z: -0.04392109} speed: 2 - m_Value: {x: 0, y: 0, z: -10} + m_Value: {x: 2.5263796, y: -0.22082889, z: -0.04392109} m_RenderMode: 2 m_CameraMode: drawMode: 2 @@ -689,15 +689,15 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 22 + m_Target: 8.891603 speed: 2 - m_Value: 22 + m_Value: 8.891603 m_Ortho: m_Target: 1 speed: 2 m_Value: 1 m_ShowGlobalGrid: 1 - m_LastSceneViewRotation: {x: 0.21178654, y: -0.62391406, z: 0.18097031, w: 0.7301558} + m_LastSceneViewRotation: {x: 0.2539892, y: -0.4392016, z: 0.13097216, w: 0.8517263} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -731,17 +731,17 @@ MonoBehaviour: m_MaximizeOnPlay: 0 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 0000000000000000000000000b000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 0000000000000000000000000d000000000000000000000000000000000000000000000000000000 m_TargetDisplay: 0 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -720 - m_HBaseRangeMax: 720 - m_VBaseRangeMin: -1480 - m_VBaseRangeMax: 1480 + m_HBaseRangeMin: -160 + m_HBaseRangeMax: 160 + m_VBaseRangeMin: -284.5 + m_VBaseRangeMax: 284.5 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -761,7 +761,7 @@ MonoBehaviour: y: 17 width: 524 height: 569 - m_Scale: {x: 0.19222973, y: 0.19222973} + m_Scale: {x: 1, y: 1} m_Translation: {x: 262, y: 284.5} m_MarginLeft: 0 m_MarginRight: 0 @@ -769,12 +769,12 @@ MonoBehaviour: m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1362.9525 - y: -1480 - width: 2725.905 - height: 2960 + x: -262 + y: -284.5 + width: 524 + height: 569 m_MinimalGUI: 1 - m_defaultScale: 0.19222973 + m_defaultScale: 1 m_TargetTexture: {fileID: 0} m_CurrentColorSpace: 0 m_LastWindowPixelSize: {x: 524, y: 586} diff --git a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll index ce35ad3..518b5a0 100644 Binary files a/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll and b/Prototype/Library/ScriptAssemblies/Assembly-CSharp.dll differ diff --git a/Prototype/Library/assetDatabase3 b/Prototype/Library/assetDatabase3 index 8a814d2..cebd5fe 100644 Binary files a/Prototype/Library/assetDatabase3 and b/Prototype/Library/assetDatabase3 differ diff --git a/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40 b/Prototype/Library/metadata/51/51bc2725b809f5d45b54c658b92d88f4 similarity index 93% rename from Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40 rename to Prototype/Library/metadata/51/51bc2725b809f5d45b54c658b92d88f4 index b9b847d..624dcf3 100644 Binary files a/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40 and b/Prototype/Library/metadata/51/51bc2725b809f5d45b54c658b92d88f4 differ diff --git a/Prototype/Library/metadata/51/51bc2725b809f5d45b54c658b92d88f4.info b/Prototype/Library/metadata/51/51bc2725b809f5d45b54c658b92d88f4.info new file mode 100644 index 0000000..4928a95 Binary files /dev/null and b/Prototype/Library/metadata/51/51bc2725b809f5d45b54c658b92d88f4.info differ diff --git a/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info b/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info deleted file mode 100644 index fe6ac35..0000000 Binary files a/Prototype/Library/metadata/68/686e065bf45f45b45b88594546f9ab40.info and /dev/null differ diff --git a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 index c823459..b4d8266 100644 Binary files a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 and b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514 differ diff --git a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514.info b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514.info index f2cb88a..f4fff68 100644 Binary files a/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514.info and b/Prototype/Library/metadata/6e/6e92c96e95066574aa3130ef9cde1514.info differ diff --git a/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d b/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d index 4a63418..7c6377f 100644 Binary files a/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d and b/Prototype/Library/metadata/ac/ace693eafc86fec44abd91b905dcbb1d differ diff --git a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c index ca7e6ce..06e2630 100644 Binary files a/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c and b/Prototype/Library/metadata/fa/fadd07783bf438e41bd40dc68e79337c differ diff --git a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log index 050c88f..2f05d04 100644 --- a/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log +++ b/Prototype/Library/shadercompiler-UnityShaderCompiler.exe0.log @@ -3,3 +3,18 @@ Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler +Cmd: initializeCompiler diff --git a/Prototype/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache b/Prototype/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache index 3ad790c..85d5429 100644 --- a/Prototype/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache +++ b/Prototype/obj/Debug/Assembly-CSharp.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -9d4611d48189af1ce8a6e5f7d15dbca1091dd2b5 +2c0885ab0e107d53f31e91c3b4291ebbbe7df5c6 diff --git a/Prototype/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Prototype/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index f47797b..3cffb45 100644 Binary files a/Prototype/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Prototype/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ