Commit 59da1156 authored by mmaluschnig's avatar mmaluschnig
Browse files

added more characters to the scene/prefabs and made a camera script that follows the player.

parent a6f26075
......@@ -36,7 +36,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1993203501856666}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -2.83289, y: 0.38500023, z: 0}
m_LocalPosition: {x: -2.83289, y: 0, z: 0.20703125}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
......@@ -65,7 +65,7 @@ BoxCollider2D:
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.19, y: 2.57}
m_Size: {x: 3.2, y: 2.57}
m_EdgeRadius: 0
--- !u!114 &114803991258325674
MonoBehaviour:
......@@ -78,7 +78,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 9c41dca42caf14e17b64ff95fd032786, type: 3}
m_Name:
m_EditorClassIdentifier:
groundLevel: -4
--- !u!212 &212154887090743764
SpriteRenderer:
m_ObjectHideFlags: 1
......
%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: 1211303350286300}
m_IsPrefabAsset: 1
--- !u!1 &1211303350286300
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4057871787717216}
- component: {fileID: 212045607179192504}
- component: {fileID: 61431777841953846}
- component: {fileID: 114765374639407944}
m_Layer: 0
m_Name: SilasUnspeakable
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4057871787717216
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1211303350286300}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15.25, y: 0, z: 0.20703125}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &61431777841953846
BoxCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1211303350286300}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.11, y: -0.24}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 2.56, y: 2.56}
newSize: {x: 2.56, y: 2.56}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.2, y: 2.11}
m_EdgeRadius: 0
--- !u!114 &114765374639407944
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1211303350286300}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9c41dca42caf14e17b64ff95fd032786, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!212 &212045607179192504
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1211303350286300}
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: 5b1cdd571c6653d4d95e3e55c00f3601, 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.56, y: 2.56}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
fileFormatVersion: 2
guid: a71e7603ca1b4481291e1bfd11bf57d6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
%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: 1890476011182328}
m_IsPrefabAsset: 1
--- !u!1 &1890476011182328
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 6
m_Component:
- component: {fileID: 4662323854503996}
- component: {fileID: 212754495466874224}
- component: {fileID: 61934643173198130}
- component: {fileID: 114900999839646092}
m_Layer: 0
m_Name: Simon
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4662323854503996
Transform:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1890476011182328}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 21.674778, y: -0.1269083, z: 0}
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &61934643173198130
BoxCollider2D:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1890476011182328}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0.06, y: -0.08}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 1.29, y: 1.8}
newSize: {x: 1.29, y: 1.8}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.2, y: 1.56}
m_EdgeRadius: 0
--- !u!114 &114900999839646092
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1890476011182328}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9c41dca42caf14e17b64ff95fd032786, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!212 &212754495466874224
SpriteRenderer:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1890476011182328}
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: 3ae1b490507d79e4ca407331d7098f81, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 1.29, y: 1.8}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
fileFormatVersion: 2
guid: c26ff785dae05414ab438c90c1da3022
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -228,6 +228,7 @@ GameObject:
- component: {fileID: 519420032}
- component: {fileID: 519420031}
- component: {fileID: 519420029}
- component: {fileID: 519420030}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
......@@ -242,6 +243,17 @@ AudioListener:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 519420028}
m_Enabled: 1
--- !u!114 &519420030
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 519420028}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 383e820d962834fc6a409223e262ba95, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!20 &519420031
Camera:
m_ObjectHideFlags: 0
......@@ -295,81 +307,53 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &565341451
GameObject:
--- !u!1001 &533984257
Prefab:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 565341452}
- component: {fileID: 565341453}
m_Layer: 0
m_Name: mime-1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &565341452
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1936604887}
m_Modifications:
- target: {fileID: 4057871787717216, guid: a71e7603ca1b4481291e1bfd11bf57d6, type: 2}
propertyPath: m_LocalPosition.x
value: 15.25
objectReference: {fileID: 0}
- target: {fileID: 4057871787717216, guid: a71e7603ca1b4481291e1bfd11bf57d6, type: 2}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4057871787717216, guid: a71e7603ca1b4481291e1bfd11bf57d6, type: 2}
propertyPath: m_LocalPosition.z
value: 0.20703125
objectReference: {fileID: 0}
- target: {fileID: 4057871787717216, guid: a71e7603ca1b4481291e1bfd11bf57d6, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4057871787717216, guid: a71e7603ca1b4481291e1bfd11bf57d6, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4057871787717216, guid: a71e7603ca1b4481291e1bfd11bf57d6, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4057871787717216, guid: a71e7603ca1b4481291e1bfd11bf57d6, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4057871787717216, guid: a71e7603ca1b4481291e1bfd11bf57d6, type: 2}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a71e7603ca1b4481291e1bfd11bf57d6, type: 2}
m_IsPrefabAsset: 0
--- !u!4 &565341452 stripped
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 565341451}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15.25, y: 0, z: 0.20703125}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1936604887}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &565341453
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 565341451}
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: 5b1cdd571c6653d4d95e3e55c00f3601, 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.56, y: 2.56}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
m_CorrespondingSourceObject: {fileID: 4057871787717216, guid: a71e7603ca1b4481291e1bfd11bf57d6,
type: 2}
m_PrefabInternal: {fileID: 533984257}
--- !u!1001 &716891759
Prefab:
m_ObjectHideFlags: 0
......@@ -414,6 +398,16 @@ Prefab:
propertyPath: groundLevel
value: -4
objectReference: {fileID: 0}
- target: {fileID: 114510536981271840, guid: 72a0d040ea21c4eebab30d68d3311671,
type: 2}
propertyPath: walkSpeed
value: 4
objectReference: {fileID: 0}
- target: {fileID: 114510536981271840, guid: 72a0d040ea21c4eebab30d68d3311671,
type: 2}
propertyPath: sprintSpeed
value: 8
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 72a0d040ea21c4eebab30d68d3311671, type: 2}
m_IsPrefabAsset: 0
......@@ -522,6 +516,48 @@ SpriteRenderer:
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1182994687
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1936604887}
m_Modifications:
- target: {fileID: 4662323854503996, guid: c26ff785dae05414ab438c90c1da3022, type: 2}
propertyPath: m_LocalPosition.x
value: 21.674778
objectReference: {fileID: 0}
- target: {fileID: 4662323854503996, guid: c26ff785dae05414ab438c90c1da3022, type: 2}
propertyPath: m_LocalPosition.y
value: -0.1269083
objectReference: {fileID: 0}
- target: {fileID: 4662323854503996, guid: c26ff785dae05414ab438c90c1da3022, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4662323854503996, guid: c26ff785dae05414ab438c90c1da3022, type: 2}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4662323854503996, guid: c26ff785dae05414ab438c90c1da3022, type: 2}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4662323854503996, guid: c26ff785dae05414ab438c90c1da3022, type: 2}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4662323854503996, guid: c26ff785dae05414ab438c90c1da3022, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4662323854503996, guid: c26ff785dae05414ab438c90c1da3022, type: 2}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: c26ff785dae05414ab438c90c1da3022, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &1193997514
GameObject:
m_ObjectHideFlags: 0
......@@ -636,11 +672,6 @@ Prefab:
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114803991258325674, guid: 49c8478baca8d47be993db0c6427da2e,
type: 2}
propertyPath: groundLevel
value: -4
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 49c8478baca8d47be993db0c6427da2e, type: 2}
m_IsPrefabAsset: 0
......@@ -898,6 +929,7 @@ Transform:
m_Children:
- {fileID: 2051215885}
- {fileID: 565341452}
- {fileID: 2059277723}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -906,3 +938,8 @@ Transform:
m_CorrespondingSourceObject: {fileID: 4490612100453362, guid: 49c8478baca8d47be993db0c6427da2e,
type: 2}
m_PrefabInternal: {fileID: 1385975288}
--- !u!4 &2059277723 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4662323854503996, guid: c26ff785dae05414ab438c90c1da3022,
type: 2}
m_PrefabInternal: {fileID: 1182994687}
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class CameraFollow : MonoBehaviour {
private GameObject player;
// Use this for initialization
void Start () {
player = GameObject.FindWithTag("Player");
}
// Update is called once per frame
void Update () {
Vector3 newPos = Camera.main.transform.position;
newPos.x = player.transform.position.x;
Camera.main.transform.position = newPos;
}
}
fileFormatVersion: 2
guid: 383e820d962834fc6a409223e262ba95
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant: