Commit 9d9a2f13 authored by mmaluschnig's avatar mmaluschnig
Browse files

prep for beta

parent a38c49ec
<Properties StartupConfiguration="{67A4F128-F6AC-CD88-DA35-F29416A0792A}|">
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="Unity.Editor" />
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/TrapezeScripts/FollowPlayerx.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs">
<Files>
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/AhavaSpeech.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/TrapezeScripts/TrapezeCameraFollow.cs" Line="37" Column="3" />
<File FileName="Assets/Scripts/TrapezeScripts/TrapezePerson.cs" Line="108" Column="55" />
<File FileName="Assets/Scripts/TrapezeScripts/TrapezePerson.cs" Line="108" Column="31" />
<File FileName="Assets/Scripts/TrapezeScripts/FollowPlayerx.cs" Line="24" Column="16" />
<File FileName="Assets/Scripts/GameManager.cs" Line="23" Column="45" />
<File FileName="Assets/Scripts/MimeScripts/MimeMimeTutorial.cs" Line="125" Column="47" />
<File FileName="Assets/Scripts/MenuScripts/PerformanceMenu.cs" Line="10" Column="9" />
<File FileName="Assets/Scripts/PieScripts/PieTutorial.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/MimeScripts/TriggerManager.cs" Line="143" Column="32" />
<File FileName="Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs" Line="28" Column="49" />
</Files>
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
......
......@@ -219,7 +219,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &89139956
MonoBehaviour:
......@@ -611,7 +611,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &300922560
GameObject:
......@@ -643,7 +643,7 @@ Transform:
- {fileID: 1026491903}
- {fileID: 1124755066}
m_Father: {fileID: 0}
m_RootOrder: 4
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &333498655
GameObject:
......@@ -905,7 +905,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 6
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &427026051
GameObject:
......@@ -1672,7 +1672,7 @@ Transform:
- {fileID: 1746446292}
- {fileID: 1795598301}
m_Father: {fileID: 0}
m_RootOrder: 2
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &896785006
GameObject:
......@@ -1825,7 +1825,7 @@ Transform:
- {fileID: 442090784}
- {fileID: 1758523279}
m_Father: {fileID: 0}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1026491902
GameObject:
......@@ -1888,8 +1888,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 897e2fb1e2ae25d42882f7c0542e749d, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
......@@ -1963,8 +1963,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 897e2fb1e2ae25d42882f7c0542e749d, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
......@@ -2110,8 +2110,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 897e2fb1e2ae25d42882f7c0542e749d, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
......@@ -2346,7 +2346,7 @@ RectTransform:
m_Children:
- {fileID: 553534734}
m_Father: {fileID: 0}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
......@@ -2402,9 +2402,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 5b1cdd571c6653d4d95e3e55c00f3601, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
......@@ -2428,7 +2428,7 @@ Transform:
m_Children:
- {fileID: 1251441223}
m_Father: {fileID: 0}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1243567178
MonoBehaviour:
......@@ -2603,6 +2603,81 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1270994738}
m_CullTransparentMesh: 0
--- !u!1 &1333157121
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1333157123}
- component: {fileID: 1333157122}
m_Layer: 0
m_Name: Tent Interior
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!212 &1333157122
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1333157121}
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: -1106870113
m_SortingLayer: 1
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 41f3d43bfd9f41d46b7052d0f22e9f8a, 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, y: 5}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!4 &1333157123
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1333157121}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.66, y: 0, z: 10}
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1340733052
GameObject:
m_ObjectHideFlags: 0
......@@ -2736,8 +2811,8 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: 897e2fb1e2ae25d42882f7c0542e749d, type: 3}
m_Color: {r: 0, g: 0, b: 0, a: 1}
......@@ -2921,9 +2996,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 5d66dace2fd8349cf85e3eb8c79129dc, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
......@@ -2946,7 +3021,7 @@ Transform:
m_LocalScale: {x: 3, y: 20, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1517433076
GameObject:
......@@ -3098,7 +3173,7 @@ Canvas:
m_SortingBucketNormalizedSize: 0
m_AdditionalShaderChannelsFlag: 0
m_SortingLayerID: -1020251125
m_SortingOrder: 0
m_SortingOrder: 1
m_TargetDisplay: 0
--- !u!224 &1542602636
RectTransform:
......@@ -3113,7 +3188,7 @@ RectTransform:
- {fileID: 333498656}
- {fileID: 1109535830}
m_Father: {fileID: 0}
m_RootOrder: 5
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
......@@ -3237,7 +3312,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 4682724213509072, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2}
propertyPath: m_RootOrder
value: 7
value: 8
objectReference: {fileID: 0}
- target: {fileID: 1602431506710890, guid: a6dd0ddad611645efbc5ef92c67041a7, type: 2}
propertyPath: m_IsActive
......@@ -3496,9 +3571,9 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 3fa214d604776462cb99a2d4f78a8f79, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
......@@ -3522,7 +3597,7 @@ Transform:
m_Children:
- {fileID: 858685293}
m_Father: {fileID: 0}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1814384667
GameObject:
......
......@@ -1916,7 +1916,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 0
m_SortingOrder: -10
m_Sprite: {fileID: 21300000, guid: 41f3d43bfd9f41d46b7052d0f22e9f8a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
......@@ -1935,7 +1935,7 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1222077192}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 10}
m_LocalScale: {x: 2, y: 2, z: 1}
m_Children: []
m_Father: {fileID: 0}
......@@ -2012,7 +2012,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1106870113
m_SortingLayer: 1
m_SortingOrder: 3
m_SortingOrder: 2
m_Sprite: {fileID: 21300000, guid: 20ccf9db820ab1649af046e2f63d34a0, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
......@@ -2760,7 +2760,7 @@ SpriteRenderer:
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 0
m_SortingOrder: 1
m_Sprite: {fileID: 21300000, guid: 3fa214d604776462cb99a2d4f78a8f79, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
......
......@@ -12,7 +12,7 @@ public class GameManager : MonoBehaviour {
public static string playerName = "goddamn";
public static bool FirstTimePie = true;
public static bool FirstTimeMime = false;
public static bool FirstTimeMime = true;
public static bool FirstTimeTrapeze = false;
public static bool SimonTutorial;
......
......@@ -120,6 +120,9 @@ public class MimeMimeTutorial : MonoBehaviour
}
else if (state == 14)
{
GameManager.FirstTimeMime = false;
GameManager.TutorialState = 0;
GameManager.SilasTutorial = false;
SceneManager.LoadScene("MimeMime");
}
SilasText.text = speech.converse();
......
......@@ -12,6 +12,8 @@ public class TriggerManager : MonoBehaviour
private Transform player;
private Transform mime;
private float playerposY;
private float mimeposY;
//explosion prefabs
public GameObject perfectHit;
......@@ -41,6 +43,9 @@ public class TriggerManager : MonoBehaviour
filter.SetLayerMask(LayerMask.GetMask("Key"));
player = GameObject.FindWithTag("Player").transform;
mime = GameObject.FindWithTag("Silas").transform;
playerposY = player.transform.position.y;
mimeposY = mime.transform.position.y;
}
// Update is called once per frame
......@@ -69,7 +74,7 @@ public class TriggerManager : MonoBehaviour
{
moveColliders((int)keys.up);
Vector3 newPos = player.transform.position;
newPos.y = -1;
newPos.y = playerposY +0.3f;
player.transform.position = newPos;
checkLowestKey();
}
......@@ -77,7 +82,7 @@ public class TriggerManager : MonoBehaviour
{
moveColliders((int)keys.down);
Vector3 newPos = player.transform.position;
newPos.y = -1.3f;
newPos.y = playerposY;
player.transform.position = newPos;
checkLowestKey();
}
......@@ -129,13 +134,13 @@ public class TriggerManager : MonoBehaviour
if (arrow == "Up")
{
Vector3 newPos = mime.transform.position;
newPos.y = -0.6f;
newPos.y = mimeposY + 0.3f;
mime.transform.position = newPos;
}
if (arrow == "Down")
{
Vector3 newPos = mime.transform.position;
newPos.y = -0.9f;
newPos.y = mimeposY;
mime.transform.position = newPos;
}
}
......
......@@ -23,6 +23,9 @@ EditorBuildSettings:
- enabled: 1
path: Assets/Scenes/MimeMime.unity
guid: 8e417c7bfe8c648709ecd48ed4750409
- enabled: 1
path: Assets/Scenes/MimeMimeTutorial.unity
guid: ffadb8f7d43b9bc4bbba7bfba7beb669
- enabled: 0
path: Assets/Scenes/Particle Tests.unity
guid: b1b2192df7f069a4aa1eea4b95d464cd
......
......@@ -44,8 +44,8 @@ PlayerSettings:
m_HolographicTrackingLossScreen: {fileID: 0}
defaultScreenWidth: 1024
defaultScreenHeight: 768
defaultScreenWidthWeb: 960
defaultScreenHeightWeb: 600
defaultScreenWidthWeb: 1280
defaultScreenHeightWeb: 720
m_StereoRenderingPath: 0
m_ActiveColorSpace: 0
m_MTRendering: 1
......
m_EditorVersion: 2018.2.11f1
m_EditorVersion: 2018.2.12f1
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment