added beard menu and fixed some tutorial errors

3f22b431 · mmaluschnig · 7aca733d · 3f22b431 · 3f22b431 · 3f22b431
Commit 3f22b431 authored Feb 14, 2019 by mmaluschnig
--- a/RingMaster/RingMaster/Assets/Scenes/BeardMenu.unity
+++ b/RingMaster/RingMaster/Assets/Scenes/BeardMenu.unity
@@ -169,7 +169,7 @@ MonoBehaviour:
      Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
  m_FontData:
    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 89
+    m_FontSize: 86
    m_FontStyle: 0
    m_BestFit: 0
    m_MinSize: 10
@@ -180,7 +180,7 @@ MonoBehaviour:
    m_HorizontalOverflow: 0
    m_VerticalOverflow: 0
    m_LineSpacing: 1
-  m_Text: RingMaster
+  m_Text: BeardMaster
 --- !u!222 &187337962
 CanvasRenderer:
  m_ObjectHideFlags: 0
@@ -744,6 +744,8 @@ RectTransform:
  - {fileID: 1187243199}
  - {fileID: 1245358143}
  - {fileID: 530105918}
+  - {fileID: 1705314998}
+  - {fileID: 1657391120}
  m_Father: {fileID: 0}
  m_RootOrder: 1
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1294,6 +1296,144 @@ CanvasRenderer:
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 1581411525}
  m_CullTransparentMesh: 0
+--- !u!1 &1657391119
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1657391120}
+  - component: {fileID: 1657391122}
+  - component: {fileID: 1657391121}
+  m_Layer: 5
+  m_Name: Player
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1657391120
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1657391119}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 0.9999999}
+  m_Children: []
+  m_Father: {fileID: 896807685}
+  m_RootOrder: 6
+  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: -200, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1657391121
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1657391119}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &1657391122
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1657391119}
+  m_CullTransparentMesh: 0
+--- !u!1 &1705314997
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1705314998}
+  - component: {fileID: 1705315000}
+  - component: {fileID: 1705314999}
+  m_Layer: 5
+  m_Name: Ahava
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1705314998
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1705314997}
+  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: 896807685}
+  m_RootOrder: 5
+  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: 400, y: 0}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1705314999
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1705314997}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, 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_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+--- !u!222 &1705315000
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 1705314997}
+  m_CullTransparentMesh: 0
 --- !u!1 &2144649528
 GameObject:
  m_ObjectHideFlags: 0

--- a/RingMaster/RingMaster/Assets/Scenes/MimeMimeTutorial.unity
+++ b/RingMaster/RingMaster/Assets/Scenes/MimeMimeTutorial.unity
@@ -347,13 +347,16 @@ MonoBehaviour:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInternal: {fileID: 0}
  m_GameObject: {fileID: 89139954}
-  m_Enabled: 1
+  m_Enabled: 0
  m_EditorHideFlags: 0
  m_Script: {fileID: 11500000, guid: 26745d9592487994d8b2f3dd21daa035, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  score: {fileID: 1270994740}
  combo: {fileID: 1828139996}
+  multi: {fileID: 0}
+  exitPanel: {fileID: 0}
+  exitText: {fileID: 0}
 --- !u!114 &89139959
 MonoBehaviour:
  m_ObjectHideFlags: 0
@@ -668,7 +671,7 @@ GameObject:
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &333498656
 RectTransform:
  m_ObjectHideFlags: 0
@@ -2019,7 +2022,7 @@ RectTransform:
  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: 51.82666, y: 73}
+  m_AnchoredPosition: {x: -73.5, y: 99.4}
  m_SizeDelta: {x: 653, y: 173.57}
  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1109535831

--- a/RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs
+++ b/RingMaster/RingMaster/Assets/Scripts/DaytimeScripts/CharacterSpeech/SilasSpeech.cs
@@ -274,8 +274,11 @@ public class SilasSpeech : MonoBehaviour, Character {
        conversation.Enqueue("Hit it now!");
        responseQueue.Enqueue(new string[] { "Okay" });

-        conversation.Enqueue("Nice job!");
-        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("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!");
        responseQueue.Enqueue(new string[] { "Okay" });

--- a/RingMaster/RingMaster/Assets/Scripts/MimeScripts/MimeMimeTutorial.cs
+++ b/RingMaster/RingMaster/Assets/Scripts/MimeScripts/MimeMimeTutorial.cs
@@ -97,7 +97,7 @@ public class MimeMimeTutorial : MonoBehaviour
        if (state == 4)
        {
            canProgress = false;
-            tutorialText.text = "Test out those dancing shoes";
+            tutorialText.text = "(Q)(W)(E)(R) To dance";
            GameManager.TutorialState = 1;
        }
        else if (state == 5)