Commit ea5885d4 authored by mmaluschnig's avatar mmaluschnig
Browse files

Merge branch 'simonthebear'

* simonthebear:
  Mime mime tutorial improved.
  take this, it's dangerous to go alone.

# Conflicts:
#	RingMaster/RingMaster/ProjectSettings/ProjectVersion.txt
parents ccec27f7 179be892
......@@ -24,7 +24,7 @@ GameObject:
- component: {fileID: 61342928451587054}
m_Layer: 8
m_Name: Q(Left)
m_TagString: Untagged
m_TagString: TutorialBlock
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
......
......@@ -169,10 +169,10 @@ MonoBehaviour:
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 29
m_FontSize: 27
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 0
m_AlignByGeometry: 0
......@@ -238,8 +238,14 @@ MonoBehaviour:
W: {fileID: 1420096474736596, guid: ddb405a62d214054baf706c375a9ed2e, type: 2}
E: {fileID: 1110090660017558, guid: c1bec4cfb8c9c7e48bc68b3cbea99fcd, type: 2}
R: {fileID: 1228962705143456, guid: 352590e9c786f6b41858f33bafff05a5, type: 2}
up: {fileID: 0}
down: {fileID: 0}
left: {fileID: 0}
right: {fileID: 0}
skip: 0
volumeFade: 0.2
qwer: 1
playSpeed: 1
--- !u!82 &89139957
AudioSource:
m_ObjectHideFlags: 0
......@@ -367,6 +373,7 @@ MonoBehaviour:
button: {fileID: 175737868}
spawner: {fileID: 89139956}
music: {fileID: 89139957}
tutorialText: {fileID: 1517433078}
--- !u!1 &154548823
GameObject:
m_ObjectHideFlags: 0
......@@ -508,7 +515,7 @@ MonoBehaviour:
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_DisabledTrigger: Disabled
m_Interactable: 1
m_Interactable: 0
m_TargetGraphic: {fileID: 175737869}
m_OnClick:
m_PersistentCalls:
......@@ -532,7 +539,7 @@ MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 175737866}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
......@@ -2277,6 +2284,11 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 1666ed9dc339e47e99646f5ec0ccd426, type: 3}
m_Name:
m_EditorClassIdentifier:
qwerToggle: {fileID: 0}
wsadToggle: {fileID: 0}
slow: {fileID: 0}
normal: {fileID: 0}
fast: {fileID: 0}
--- !u!114 &1241441966
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -3109,7 +3121,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Continue
m_Text: '(1)Continue
'
--- !u!222 &1517433079
......
......@@ -259,7 +259,7 @@ public class SilasSpeech : MonoBehaviour, Character {
conversation.Enqueue("but if it wasn't natural I'd know that anyone can use the Q W E or R keys to daaaaannceee.");
responseQueue.Enqueue(new string[] { "okay" });
conversation.Enqueue("WOW, your dancing is so good it made fireworks in those convenient looking boxes!");
conversation.Enqueue("WOW, your dancing is so good it lights up those convenient looking boxes!");
responseQueue.Enqueue(new string[] { "okay" });
conversation.Enqueue("How about I let you know what amazing moves I'm going to do? And you can copy me!");
......@@ -274,7 +274,10 @@ public class SilasSpeech : MonoBehaviour, Character {
conversation.Enqueue("Hit it now!");
responseQueue.Enqueue(new string[] { "okay" });
conversation.Enqueue("Nice job!");
conversation.Enqueue("Nice job! green fireworks represent a perfect hit, yellow fireworks represent an okay hit, and the angry red ball means you almost missed!");
responseQueue.Enqueue(new string[] { "okay" });
conversation.Enqueue("Nice job! green fireworks represent a perfect hit, yellow fireworks represent an okay hit, and the angry red ball means you almost missed!");
responseQueue.Enqueue(new string[] { "okay" });
conversation.Enqueue("let's try a few more of my definitely different moves!");
......
......@@ -15,7 +15,10 @@ public class MimeMimeTutorial : MonoBehaviour
public Button button;
public SpawnKeys spawner;
public AudioSource music;
public Text tutorialText;
private bool canProgress = false;
private bool freeze = false;
private int state;
private void Start()
......@@ -32,39 +35,49 @@ public class MimeMimeTutorial : MonoBehaviour
{
if ((Input.GetKeyDown(KeyCode.Q) || Input.GetKeyDown(KeyCode.W) || Input.GetKeyDown(KeyCode.E) || Input.GetKeyDown(KeyCode.R)) && GameManager.TutorialState == 1)
{
//player just danced
progress();
}
if (GameManager.TutorialState == 3 && GameManager.SilasNoteInPlace)
{
//practice note needs to be hit.
progress();
}
if (Input.GetKeyDown(KeyCode.Q) && GameManager.TutorialState == 4)
{
//practice note has been hit.
progress();
Time.timeScale = 1f;
music.Play();
GameManager.SilasNoteInPlace = false;
StartCoroutine(freezetime());
StartCoroutine(finish(0.6f));
}
if (Input.GetKeyDown(KeyCode.Alpha1))
{
ButtonPress();
}
if (freeze == true && GameObject.FindWithTag("TutorialBlock").transform.position.y <= -4f)
{
freeze = false;
GameObject.FindWithTag("TutorialBlock").transform.localPosition = new Vector3(GameObject.FindWithTag("TutorialBlock").transform.position.x, -4.000f, GameObject.FindWithTag("TutorialBlock").transform.position.z);
Time.timeScale = 0f;
progress();
music.Pause();
}
}
private IEnumerator freezetime()
{
yield return new WaitForSeconds(1f);
Time.timeScale = 0f;
progress();
music.Pause();
}
private IEnumerator finish()
private IEnumerator finish(float time)
{
yield return new WaitForSeconds(5f);
yield return new WaitForSeconds(time);
progress();
}
private IEnumerator noticePlayer()
{
yield return new WaitForSeconds(3);
yield return new WaitForSeconds(1);
canProgress = true;
dialogueBox.SetActive(true);
faceCam.gameObject.SetActive(true);
StopCoroutine(noticePlayer());
......@@ -72,8 +85,10 @@ public class MimeMimeTutorial : MonoBehaviour
public void ButtonPress()
{
progress();
if (canProgress == true)
{
progress();
}
}
void progress()
......@@ -81,44 +96,56 @@ public class MimeMimeTutorial : MonoBehaviour
state++;
if (state == 4)
{
button.gameObject.SetActive(false);
canProgress = false;
tutorialText.text = "Test out those dancing shoes";
GameManager.TutorialState = 1;
}
else if (state == 5)
{
canProgress = true;
tutorialText.text = "(1)Continue";
button.gameObject.SetActive(true);
GameManager.TutorialState = 2;
}
else if(state == 8)
{
canProgress = false;
button.gameObject.SetActive(false);
GameManager.TutorialState = 3;
spawner.startTutorial();
freeze = true;
GameManager.PlayerCanDance = false;
}
else if (state == 9)
{
canProgress = false;
button.gameObject.SetActive(false);
GameManager.PlayerCanDance = true;
GameManager.TutorialState = 4;
//practice note can now be hit.
}
else if (state == 11)
{
canProgress = true;
Time.timeScale = 0f;
music.Pause();
button.gameObject.SetActive(true);
}
else if (state == 12)
else if (state == 13)
{
canProgress = false;
button.gameObject.SetActive(false);
Time.timeScale = 1f;
music.Play();
StartCoroutine(finish());
StartCoroutine(finish(5f));
}
else if (state == 13)
else if (state == 14)
{
canProgress = true;
button.gameObject.SetActive(true);
music.volume = 0.05f;
}
else if (state == 14)
else if (state == 15)
{
GameManager.FirstTimeMime = false;
GameManager.TutorialState = 0;
......
......@@ -43,7 +43,6 @@ public class SpawnKeys : MonoBehaviour {
public void startTutorial()
{
songSet = true;
StartCoroutine(tutorialpause());
}
//plays the song after the first arrow reaches a barrier.
private IEnumerator playSong(AudioClip musicClip, float waitTime){
......
fileFormatVersion: 2
guid: 2f7bc27cac5338e41a43d43b1b80e536
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 8c73223e24aa6934db7fb89b7e5e42ea
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 3ad109e14fab4d04ebbb92bf43880fe3
TextureImporter:
fileIDToRecycleName: {}
externalObjects: {}
serializedVersion: 7
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 2a63e9bff5a01104a8f0475dd82939f3
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -35,6 +35,7 @@ TagManager:
- Slow
- Normal
- Fast
- TutorialBlock
layers:
- Default
- TransparentFX
......
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