diff --git a/Assets/Models/SCENE 4 MESH.fbx b/Assets/Models/SCENE 4 MESH.fbx new file mode 100644 index 0000000..394c8c5 --- /dev/null +++ b/Assets/Models/SCENE 4 MESH.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:05cb6eb99ffc42c9c64f5284584b4be4699c669033e336fe53c36ffe09124eef +size 3565180 diff --git a/Assets/Models/WALKABLE SCENE 2 CAMERA.fbx b/Assets/Models/WALKABLE SCENE 2 CAMERA.fbx new file mode 100644 index 0000000..d5a7a6d --- /dev/null +++ b/Assets/Models/WALKABLE SCENE 2 CAMERA.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6b8816df220a41bcf1f9f0fc6c4d2c2ddefbd08ef312d3239126d1cd7999341c +size 1250796 diff --git a/Assets/Models/WALKABLE SCENE 3 CAMERA.fbx b/Assets/Models/WALKABLE SCENE 3 CAMERA.fbx new file mode 100644 index 0000000..4331663 --- /dev/null +++ b/Assets/Models/WALKABLE SCENE 3 CAMERA.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c49a86ec4ab1b273f54c5e4990563151d1f662e8a6a769e5aa3006d309b24d2d +size 1025372 diff --git a/Assets/Models/WALKABLE SCENE1 CAMERA.fbx b/Assets/Models/WALKABLE SCENE1 CAMERA.fbx new file mode 100644 index 0000000..1908f86 --- /dev/null +++ b/Assets/Models/WALKABLE SCENE1 CAMERA.fbx @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:6bb5b844a93edf73d770d4d7d8e4fa8cae81c115baff137413bcf0f72e20c66e +size 229452 diff --git a/Assets/Pre-Renders/Materials/PRE-RENDER 1.mat b/Assets/Pre-Renders/Materials/PRE-RENDER 1.mat new file mode 100644 index 0000000..8825ad5 --- /dev/null +++ b/Assets/Pre-Renders/Materials/PRE-RENDER 1.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PRE-RENDER 1 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: ac71d4a8affa0ab4cab99c2e9191eaf7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Pre-Renders/Materials/PRE-RENDER 2.mat b/Assets/Pre-Renders/Materials/PRE-RENDER 2.mat new file mode 100644 index 0000000..99588a3 --- /dev/null +++ b/Assets/Pre-Renders/Materials/PRE-RENDER 2.mat @@ -0,0 +1,80 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PRE-RENDER 2 + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 58b5507b2b1387145928f9338a7355f7, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Pre-Renders/PRE-RENDER 1.png b/Assets/Pre-Renders/PRE-RENDER 1.png new file mode 100644 index 0000000..c74f950 --- /dev/null +++ b/Assets/Pre-Renders/PRE-RENDER 1.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b44f22788c8abd760eec4c20d65b0f6b2a3ff21c80d241c21f830ae60b6fb25f +size 2172681 diff --git a/Assets/Pre-Renders/PRE-RENDER 2.png b/Assets/Pre-Renders/PRE-RENDER 2.png new file mode 100644 index 0000000..eb5a306 --- /dev/null +++ b/Assets/Pre-Renders/PRE-RENDER 2.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1fbcc0b225fc97c70c811f50f0fdab51a4172b8034a098be771276d271b4147a +size 762038 diff --git a/Assets/Pre-Renders/PRE-RENDER 3.png b/Assets/Pre-Renders/PRE-RENDER 3.png new file mode 100644 index 0000000..cbf39f8 --- /dev/null +++ b/Assets/Pre-Renders/PRE-RENDER 3.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fa6ff3e0644ce4510a5d1ef3f5bccae82010e20bf3021c42862dafbe00ecea3d +size 755815 diff --git a/Assets/Pre-Renders/PRE-RENDER 4.png b/Assets/Pre-Renders/PRE-RENDER 4.png new file mode 100644 index 0000000..3b9d916 --- /dev/null +++ b/Assets/Pre-Renders/PRE-RENDER 4.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:de2e3d63f6716b0b737d1f89c0bd3c817c4fe1d348f4675a862e4f8483c0d35c +size 759642 diff --git a/Assets/Scenes/Animation/FadeIn.anim b/Assets/Scenes/Animation/FadeIn.anim index 2bc5006..dab97a9 100644 --- a/Assets/Scenes/Animation/FadeIn.anim +++ b/Assets/Scenes/Animation/FadeIn.anim @@ -21,7 +21,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 0 inSlope: 0 outSlope: 0 @@ -30,7 +30,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: 0 outSlope: 0 @@ -49,7 +49,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 0 inSlope: 0 outSlope: 0 @@ -58,7 +58,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: 0 outSlope: 0 @@ -77,7 +77,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 0 inSlope: 0 outSlope: 0 @@ -86,7 +86,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: 0 outSlope: 0 @@ -105,7 +105,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 1 inSlope: 0 outSlope: 0 @@ -114,7 +114,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: 0 outSlope: 0 @@ -133,7 +133,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 1 inSlope: Infinity outSlope: Infinity @@ -142,7 +142,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: Infinity outSlope: Infinity @@ -206,7 +206,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 4.5 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -226,7 +226,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 0 inSlope: 0 outSlope: 0 @@ -235,7 +235,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: 0 outSlope: 0 @@ -254,7 +254,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 0 inSlope: 0 outSlope: 0 @@ -263,7 +263,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: 0 outSlope: 0 @@ -282,7 +282,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 0 inSlope: 0 outSlope: 0 @@ -291,7 +291,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: 0 outSlope: 0 @@ -310,7 +310,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 1 inSlope: 0 outSlope: 0 @@ -319,7 +319,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: 0 outSlope: 0 @@ -338,7 +338,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0 + time: 3 value: 1 inSlope: Infinity outSlope: Infinity @@ -347,7 +347,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1 + time: 4.5 value: 0 inSlope: Infinity outSlope: Infinity diff --git a/Assets/Scenes/Animation/LevelChanger.controller b/Assets/Scenes/Animation/LevelChanger.controller index b33185a..b75d70f 100644 --- a/Assets/Scenes/Animation/LevelChanger.controller +++ b/Assets/Scenes/Animation/LevelChanger.controller @@ -87,8 +87,8 @@ AnimatorController: m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_DefaultBool: 1 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer diff --git a/Assets/Scenes/BaseScene.unity b/Assets/Scenes/BaseScene.unity index 88a7368..3dd853c 100644 --- a/Assets/Scenes/BaseScene.unity +++ b/Assets/Scenes/BaseScene.unity @@ -123,6 +123,175 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &4029457 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4029460} + - component: {fileID: 4029459} + - component: {fileID: 4029458} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &4029458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4029457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &4029459 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4029457} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &4029460 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4029457} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &60562919 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 60562923} + - component: {fileID: 60562922} + - component: {fileID: 60562921} + - component: {fileID: 60562920} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &60562920 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60562919} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &60562921 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60562919} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &60562922 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60562919} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 25 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &60562923 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 60562919} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1246213960} + m_Father: {fileID: 0} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &1238217887 GameObject: m_ObjectHideFlags: 0 @@ -264,6 +433,141 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1246213959 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1246213960} + - component: {fileID: 1246213962} + - component: {fileID: 1246213961} + m_Layer: 5 + m_Name: Test UI Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1246213960 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246213959} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 51} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 60562923} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -137, y: 35} + m_SizeDelta: {x: 264.5844, y: 38.3986} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1246213961 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246213959} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Sample UI Text + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1246213962 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1246213959} + m_CullTransparentMesh: 1 --- !u!1 &2001385625 GameObject: m_ObjectHideFlags: 0 @@ -351,7 +655,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2001385625} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalPosition: {x: 4680, y: 3740, z: 122} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -368,13 +672,13 @@ GameObject: m_Component: - component: {fileID: 7202193381699686675} - component: {fileID: 7370277068804976112} - m_Layer: 0 + m_Layer: 3 m_Name: Camera m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!1 &522754681833117607 GameObject: m_ObjectHideFlags: 0 @@ -385,7 +689,7 @@ GameObject: m_Component: - component: {fileID: 8776096139135766244} - component: {fileID: 2501286152784784112} - m_Layer: 0 + m_Layer: 3 m_Name: Light m_TagString: Untagged m_Icon: {fileID: 0} @@ -399,9 +703,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 919132147785118731} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 70, z: 50} - m_LocalScale: {x: 50, y: 50, z: 50} + m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} + m_LocalPosition: {x: 24, y: 25, z: -19.76} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 7202193381699686675} @@ -409,7 +713,7 @@ Transform: - {fileID: 5127251163467898061} m_Father: {fileID: 0} m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} --- !u!1 &919132147785118731 GameObject: m_ObjectHideFlags: 0 @@ -421,7 +725,7 @@ GameObject: - component: {fileID: 543450651723558577} - component: {fileID: 919132147785118733} - component: {fileID: 919132147785118732} - m_Layer: 0 + m_Layer: 3 m_Name: scampz manC m_TagString: Untagged m_Icon: {fileID: 0} @@ -440,7 +744,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 492ccac425c363548b6f9be7835cbc6a, type: 3} m_Name: m_EditorClassIdentifier: - Speed: 250 + Speed: 10 RotateSpeed: 0.5 --- !u!143 &919132147785118733 CharacterController: @@ -467,7 +771,7 @@ Light: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 522754681833117607} - m_Enabled: 1 + m_Enabled: 0 serializedVersion: 10 m_Type: 2 m_Shape: 0 @@ -533,7 +837,7 @@ GameObject: - component: {fileID: 5127251163467898061} - component: {fileID: 5185050467801451502} - component: {fileID: 8100320771571497255} - m_Layer: 0 + m_Layer: 3 m_Name: Sphere.001 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scenes/Pre-Render0.unity b/Assets/Scenes/Pre-Render0.unity index fddd35d..30b1e5a 100644 --- a/Assets/Scenes/Pre-Render0.unity +++ b/Assets/Scenes/Pre-Render0.unity @@ -353,7 +353,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a72a7a4e27e427e45b1902f730108ab3, type: 2} + - {fileID: 2100000, guid: 4074315a7fa348e41bbea6b15305eca1, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -391,14 +391,98 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 293610880} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 19.2, y: 10.8, z: 1} + m_LocalPosition: {x: 0, y: 1000, z: 500} + m_LocalScale: {x: 16, y: 9, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 963194228} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &360355835 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -1853094968961178454, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_ClearFlags + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1853094968961178454, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_CullingMask.m_Bits + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + propertyPath: m_Name + value: WALKABLE SCENE1 CAMERA + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21f660bb7fa5007419943359cec01a75, type: 3} +--- !u!1 &360355836 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -6499529959314878404, guid: 21f660bb7fa5007419943359cec01a75, type: 3} + m_PrefabInstance: {fileID: 360355835} + m_PrefabAsset: {fileID: 0} +--- !u!64 &360355837 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 360355836} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 4104380202958562290, guid: 21f660bb7fa5007419943359cec01a75, type: 3} --- !u!1 &610846507 GameObject: m_ObjectHideFlags: 0 @@ -439,7 +523,7 @@ Animator: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610846507} - m_Enabled: 1 + m_Enabled: 0 m_Avatar: {fileID: 0} m_Controller: {fileID: 9100000, guid: 8d2f6406cd97d604a8a3fca1f0e86380, type: 2} m_CullingMode: 0 @@ -459,13 +543,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610846507} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: -5000, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 21670248} - {fileID: 1709914077} - - {fileID: 2138461639} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -556,7 +639,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261} - m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalPosition: {x: -748.4, y: 3, z: -432.1} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -612,12 +695,12 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 1 - far clip plane: 500 + near clip plane: 0.3 + far clip plane: 50 field of view: 60 orthographic: 1 - orthographic size: 5.383329 - m_Depth: -1 + orthographic size: 4.469144 + m_Depth: 0 m_CullingMask: serializedVersion: 2 m_Bits: 4294967295 @@ -640,8 +723,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 963194225} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.002, y: 0, z: -470.9} - m_LocalScale: {x: 0.0010416666, y: 0.0018518517, z: 1} + m_LocalPosition: {x: 0.002, y: -0.005, z: -49.81} + m_LocalScale: {x: 0, y: 0, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 293610884} @@ -675,9 +758,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1709914076} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 50, z: 498} - m_LocalScale: {x: 100, y: 100, z: 50} + m_LocalRotation: {x: -0.0059860516, y: -0.8737048, z: 0.0107558, w: -0.4863009} + m_LocalPosition: {x: -112.73, y: 5010.06, z: 53.96} + m_LocalScale: {x: 10, y: 5, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 610846510} @@ -778,102 +861,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e6d9a426a8d6e57489b2cd44e9ee79e1, type: 3} m_Name: m_EditorClassIdentifier: - sceneIndex: 1 ---- !u!1 &2138461638 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2138461639} - - component: {fileID: 2138461642} - - component: {fileID: 2138461641} - - component: {fileID: 2138461640} - m_Layer: 0 - m_Name: Plane - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2138461639 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138461638} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 100, y: 1, z: 100} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 610846510} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!64 &2138461640 -MeshCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138461638} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &2138461641 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138461638} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, 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_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!33 &2138461642 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2138461638} - m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} + sceneIndex: 3 diff --git a/Assets/Scenes/Pre-Render1.unity b/Assets/Scenes/Pre-Render1.unity index a8d62a9..9f92428 100644 --- a/Assets/Scenes/Pre-Render1.unity +++ b/Assets/Scenes/Pre-Render1.unity @@ -176,7 +176,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: a1eeceea788583d4484cd9b42bf3009f, type: 2} + - {fileID: 2100000, guid: d88ff64264d15744ca41b41b81cbf1ae, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -214,7 +214,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 293610880} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1000, z: 0} m_LocalScale: {x: 19.2, y: 10.8, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -316,6 +316,98 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &944342765 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -2400510268148469814, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_LocalPosition.z + value: -6.5 + objectReference: {fileID: 0} + - target: {fileID: -819057052762295115, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_ClearFlags + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -819057052762295115, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_CullingMask.m_Bits + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_Name + value: WALKABLE SCENE 2 CAMERA + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c16f39aadd3cbb542b833107183e393b, type: 3} +--- !u!1 &944342766 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 8679066746748842256, guid: c16f39aadd3cbb542b833107183e393b, type: 3} + m_PrefabInstance: {fileID: 944342765} + m_PrefabAsset: {fileID: 0} +--- !u!64 &944342767 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 944342766} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 4 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: -6077721311988784785, guid: c16f39aadd3cbb542b833107183e393b, type: 3} --- !u!1 &963194225 GameObject: m_ObjectHideFlags: 0 @@ -717,7 +809,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4444024360144305550 Transform: m_ObjectHideFlags: 0 @@ -788,8 +880,8 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4444024360594741968} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 50, z: 498} - m_LocalScale: {x: 100, y: 100, z: 50} + m_LocalPosition: {x: 27.48, y: 17.16, z: -1016.86} + m_LocalScale: {x: 10, y: 2, z: 10} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4444024359546087970} @@ -827,7 +919,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e6d9a426a8d6e57489b2cd44e9ee79e1, type: 3} m_Name: m_EditorClassIdentifier: - sceneIndex: 2 + sceneIndex: 1 --- !u!65 &4444024360594741996 BoxCollider: m_ObjectHideFlags: 0 @@ -973,7 +1065,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &4444024360704145611 Transform: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Pre-Render3.unity b/Assets/Scenes/Pre-Render3.unity index 9a14546..9d0163b 100644 --- a/Assets/Scenes/Pre-Render3.unity +++ b/Assets/Scenes/Pre-Render3.unity @@ -214,7 +214,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 293610880} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1000, z: 0} m_LocalScale: {x: 19.2, y: 10.8, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scenes/Pre-Render4.unity b/Assets/Scenes/Pre-Render4.unity index 74833f3..cfb1249 100644 --- a/Assets/Scenes/Pre-Render4.unity +++ b/Assets/Scenes/Pre-Render4.unity @@ -214,7 +214,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 293610880} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1000, z: 0} m_LocalScale: {x: 19.2, y: 10.8, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scenes/Pre-Render5.unity b/Assets/Scenes/Pre-Render5.unity index 03d4040..f33c001 100644 --- a/Assets/Scenes/Pre-Render5.unity +++ b/Assets/Scenes/Pre-Render5.unity @@ -214,7 +214,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 293610880} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1000, z: 0} m_LocalScale: {x: 19.2, y: 10.8, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scenes/Pre-Render6.unity b/Assets/Scenes/Pre-Render6.unity index 47b5fb4..f77cd19 100644 --- a/Assets/Scenes/Pre-Render6.unity +++ b/Assets/Scenes/Pre-Render6.unity @@ -214,7 +214,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 293610880} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1000, z: 0} m_LocalScale: {x: 19.2, y: 10.8, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scenes/Pre-Render7.unity b/Assets/Scenes/Pre-Render7.unity index b2badd5..3c50691 100644 --- a/Assets/Scenes/Pre-Render7.unity +++ b/Assets/Scenes/Pre-Render7.unity @@ -214,7 +214,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 293610880} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 1000, z: 0} m_LocalScale: {x: 19.2, y: 10.8, z: 1} m_ConstrainProportionsScale: 0 m_Children: diff --git a/Assets/Scenes/TitleScreen.unity b/Assets/Scenes/TitleScreen.unity index e7adf59..7921b4e 100644 --- a/Assets/Scenes/TitleScreen.unity +++ b/Assets/Scenes/TitleScreen.unity @@ -666,7 +666,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1696198989} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -10} + m_LocalPosition: {x: 867, y: 184, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] diff --git a/Assets/Scripts/BaseSceneManager.cs b/Assets/Scripts/BaseSceneManager.cs index f673a2f..921099d 100644 --- a/Assets/Scripts/BaseSceneManager.cs +++ b/Assets/Scripts/BaseSceneManager.cs @@ -6,10 +6,9 @@ namespace Scampz.GameJam { public class BaseSceneManager : MonoBehaviour { - // Start is called before the first frame update void Start() { - GameManager.Instance.LoadScene(SceneNames.FirstPreRenderedScene, LoadSceneMode.Additive); + GameManager.Instance.LoadScene(SceneNames.SecondPreRenderedScene, LoadSceneMode.Additive); } } } diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 87f0fca..690090e 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -1,5 +1,4 @@ using System.Collections; -using Scampz.GameJam.Assets.Scripts; using UnityEngine; using UnityEngine.SceneManagement; diff --git a/Assets/Scripts/InputManager.cs b/Assets/Scripts/InputManager.cs new file mode 100644 index 0000000..3339bbd --- /dev/null +++ b/Assets/Scripts/InputManager.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +namespace Scampz.GameJam.Assets.Scripts +{ + public class InputManager : MonoBehaviour + { + public static InputManager Instance { get; private set; } + + private void Awake() + { + if (Instance == null) + Instance = this; + } + } +} diff --git a/Assets/Scripts/LevelChanger.cs b/Assets/Scripts/LevelChanger.cs index d8b18e7..1ed14c4 100644 --- a/Assets/Scripts/LevelChanger.cs +++ b/Assets/Scripts/LevelChanger.cs @@ -1,3 +1,4 @@ +using Scampz.GameJam.Assets.Scripts; using UnityEngine; namespace Scampz.GameJam @@ -14,6 +15,16 @@ namespace Scampz.GameJam animator.SetTrigger("FadeOut"); } + public void EnableControls() + { + //InputManager.Instance.enabled = true; + } + + public void DisableControls() + { + //InputManager.Instance.enabled = false; + } + private void Awake() { if (Singleton is not null && Singleton != this) diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..aa71cb4 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -8,7 +8,7 @@ TagManager: - Default - TransparentFX - Ignore Raycast - - + - SecondCamera - Water - UI -