Commit 08c31df8 authored by mmaluschnig's avatar mmaluschnig
Browse files

updated beardmaster scene

parent 557bce23
...@@ -145,7 +145,7 @@ RectTransform: ...@@ -145,7 +145,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: -16.1}
m_SizeDelta: {x: 500, y: 100} m_SizeDelta: {x: 500, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &187337961 --- !u!114 &187337961
...@@ -250,6 +250,75 @@ Transform: ...@@ -250,6 +250,75 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 2 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &493353810
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 493353811}
- component: {fileID: 493353813}
- component: {fileID: 493353812}
m_Layer: 5
m_Name: Panel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &493353811
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 493353810}
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: 2
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: 0, y: 164.3}
m_SizeDelta: {x: 500, y: 30.421204}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &493353812
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 493353810}
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: 0.6901961, g: 0.015686275, b: 0, a: 0.6784314}
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: 10907, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
--- !u!222 &493353813
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 493353810}
m_CullTransparentMesh: 0
--- !u!1 &523460683 --- !u!1 &523460683
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -355,7 +424,7 @@ RectTransform: ...@@ -355,7 +424,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1517413808} - {fileID: 1517413808}
m_Father: {fileID: 896807685} m_Father: {fileID: 896807685}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -518,6 +587,81 @@ CanvasRenderer: ...@@ -518,6 +587,81 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 629014689} m_GameObject: {fileID: 629014689}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &714143539
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 714143540}
- component: {fileID: 714143542}
- component: {fileID: 714143541}
m_Layer: 5
m_Name: Subtext
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &714143540
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 714143539}
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: 2144649529}
m_RootOrder: 1
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: 0, y: 45.399994}
m_SizeDelta: {x: 500, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &714143541
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 714143539}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.8901961, b: 0.21176471, 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_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 21
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Congratulations! You have become the '
--- !u!222 &714143542
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 714143539}
m_CullTransparentMesh: 0
--- !u!1 &749145662 --- !u!1 &749145662
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -543,7 +687,7 @@ AudioSource: ...@@ -543,7 +687,7 @@ AudioSource:
m_Enabled: 1 m_Enabled: 1
serializedVersion: 4 serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0} OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 8300000, guid: 169b811160cd14a2abc41d98e46986f4, type: 3} m_audioClip: {fileID: 8300000, guid: 289d382b3061449ed9d1c4925bcd7231, type: 3}
m_PlayOnAwake: 1 m_PlayOnAwake: 1
m_Volume: 1 m_Volume: 1
m_Pitch: 1 m_Pitch: 1
...@@ -741,6 +885,7 @@ RectTransform: ...@@ -741,6 +885,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 629014690} - {fileID: 629014690}
- {fileID: 2144649529} - {fileID: 2144649529}
- {fileID: 493353811}
- {fileID: 1187243199} - {fileID: 1187243199}
- {fileID: 1245358143} - {fileID: 1245358143}
- {fileID: 530105918} - {fileID: 530105918}
...@@ -784,7 +929,7 @@ RectTransform: ...@@ -784,7 +929,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 523460684} - {fileID: 523460684}
m_Father: {fileID: 896807685} m_Father: {fileID: 896807685}
m_RootOrder: 2 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -907,7 +1052,7 @@ RectTransform: ...@@ -907,7 +1052,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1581411526} - {fileID: 1581411526}
m_Father: {fileID: 896807685} m_Father: {fileID: 896807685}
m_RootOrder: 3 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
...@@ -1325,11 +1470,11 @@ RectTransform: ...@@ -1325,11 +1470,11 @@ RectTransform:
m_LocalScale: {x: -1, y: 0.9999999, z: 0.9999999} m_LocalScale: {x: -1, y: 0.9999999, z: 0.9999999}
m_Children: [] m_Children: []
m_Father: {fileID: 896807685} m_Father: {fileID: 896807685}
m_RootOrder: 6 m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5} m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5} m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: -200, y: -54.600006} m_AnchoredPosition: {x: -200, y: -77.40001}
m_SizeDelta: {x: 100, y: 250} m_SizeDelta: {x: 100, y: 250}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1657391121 --- !u!114 &1657391121
...@@ -1413,11 +1558,11 @@ RectTransform: ...@@ -1413,11 +1558,11 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 896807685} m_Father: {fileID: 896807685}
m_RootOrder: 5 m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5} m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5}
m_AnchoredPosition: {x: 199.99997, y: -54.600014} m_AnchoredPosition: {x: 199.99997, y: -77.4}
m_SizeDelta: {x: 100, y: 250} m_SizeDelta: {x: 100, y: 250}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1705314999 --- !u!114 &1705314999
...@@ -1500,13 +1645,14 @@ RectTransform: ...@@ -1500,13 +1645,14 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 187337960} - {fileID: 187337960}
- {fileID: 714143540}
m_Father: {fileID: 896807685} m_Father: {fileID: 896807685}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 125.6} m_AnchoredPosition: {x: 0, y: 121.6}
m_SizeDelta: {x: 500, y: 100} m_SizeDelta: {x: 500, y: 125}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &2144649530 --- !u!114 &2144649530
MonoBehaviour: MonoBehaviour:
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
using UnityEngine.SceneManagement;
public class CharacterInteractions : MonoBehaviour { public class CharacterInteractions : MonoBehaviour {
//Character Speech UI //Character Speech UI
...@@ -120,7 +121,6 @@ public class CharacterInteractions : MonoBehaviour { ...@@ -120,7 +121,6 @@ public class CharacterInteractions : MonoBehaviour {
{ {
ButtonPress(4); ButtonPress(4);
} }
} }
} }
} }
...@@ -226,7 +226,10 @@ public class CharacterInteractions : MonoBehaviour { ...@@ -226,7 +226,10 @@ public class CharacterInteractions : MonoBehaviour {
} }
} }
public void ButtonPress(int buttonNum) { public void ButtonPress(int buttonNum) {
if (interacting && buttonNum <= 3) { if(GameManager.ConversationStage == 4 && characterScript.getName() == "Ahava" && GameManager.speechState == 1 && !GameManager.hasCompletedTheGame){
SceneManager.LoadScene("BeardMenu");
GameManager.hasCompletedTheGame = true;
}else if (interacting && buttonNum <= 3) {
converse(); converse();
} }
} }
......
...@@ -20,6 +20,8 @@ public class DaytimeManager : MonoBehaviour { ...@@ -20,6 +20,8 @@ public class DaytimeManager : MonoBehaviour {
+ ((GameManager.JohnLevel-1) * 0.5f) + ((GameManager.JohnLevel-1) * 0.5f)
+ ((GameManager.SilasLevel-1) * 0.5f) + ((GameManager.SilasLevel-1) * 0.5f)
+ ((GameManager.SimonLevel-1)*0.5f); + ((GameManager.SimonLevel-1)*0.5f);
if (newLevel > 4) newLevel = 4;
float diffinLevels = newLevel - GameManager.AhavaLevel; float diffinLevels = newLevel - GameManager.AhavaLevel;
print("diff" + diffinLevels); print("diff" + diffinLevels);
print("start" + GameManager.AhavaLevel % 1); print("start" + GameManager.AhavaLevel % 1);
......
...@@ -38,6 +38,9 @@ EditorBuildSettings: ...@@ -38,6 +38,9 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Scenes/Trapeze.unity path: Assets/Scenes/Trapeze.unity
guid: 08dbe011b21ecdc438648fe247a71cc7 guid: 08dbe011b21ecdc438648fe247a71cc7
- enabled: 1
path: Assets/Scenes/BeardMenu.unity
guid: f33ab7a5d2bf1437899c3ce6e056a405
- enabled: 0 - enabled: 0
path: Assets/Scenes/Particle Tests.unity path: Assets/Scenes/Particle Tests.unity
guid: b1b2192df7f069a4aa1eea4b95d464cd guid: b1b2192df7f069a4aa1eea4b95d464cd
......
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