Commit 079823f7 authored by radow's avatar radow

Milestone: Final 001

parent 3b9f3c49
......@@ -41,7 +41,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 7cc077baca6640b4fb6abe42a409dc30, type: 3}
m_Texture: {fileID: 2800000, guid: ebed43bd354eaef4995ed164111f5009, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
......
fileFormatVersion: 2
guid: 7cc077baca6640b4fb6abe42a409dc30
guid: 9d8cc84379527db44864d81a13f0dbee
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
......
This diff is collapsed.
......@@ -207,7 +207,7 @@ public class Endcutscene : MonoBehaviour
leftfadein = false;
leftfadeout = true;
rightfadein = true;
Right.text = "2D Art\nthe Lama\nthe Duck";
Right.text = "2D Art\nthe Lama\nente";
Invoke("NextStage", 5f);
}
if (i == 7)
......@@ -225,7 +225,7 @@ public class Endcutscene : MonoBehaviour
leftfadeout = true;
rightfadein = true;
rightfadeout = false;
Right.text = "Narrative Design\nthe Lama\nthe Duck\nthe Cat";
Right.text = "Narrative Design\nthe Lama\nente\nShort Katz";
Invoke("NextStage", 5f);
}
if (i == 9)
......@@ -234,7 +234,7 @@ public class Endcutscene : MonoBehaviour
leftfadeout = false;
rightfadein = false;
rightfadeout = true;
Left.text = "QA\nthe Penguin";
Left.text = "Soundtrack\nSergej";
Invoke("NextStage", 5f);
}
if (i == 10)
......
......@@ -7,6 +7,7 @@ public class IngameMenu : MonoBehaviour
{
public TextMeshProUGUI Item_Name;
public TextMeshProUGUI Item_Description;
AudioSource auds;
public List<IngameMenuContainer> Containers = new List<IngameMenuContainer>();
enum State {INACTIVE, TRANSIT, ACTIVE, NONE };
......@@ -17,6 +18,7 @@ public class IngameMenu : MonoBehaviour
void Start()
{
instance = this;
auds = GetComponent<AudioSource>();
}
// Update is called once per frame
......@@ -46,6 +48,7 @@ public class IngameMenu : MonoBehaviour
InputManager.instance.TogglePlayMode();
c.Close();
}
auds.Play();
}
else if (myState == State.INACTIVE && InputManager.instance.Mode == InputManager.InputMode.PLAY)
{
......@@ -55,7 +58,7 @@ public class IngameMenu : MonoBehaviour
c.Open();
}
if (InventoryLogic.instance.SelectedSlot != null) InventoryLogic.instance.SelectedSlot.Select();
auds.Play();
}
}
if(Input.GetKeyDown(KeyCode.Escape) && myState == State.INACTIVE && InputManager.instance.Mode == InputManager.InputMode.PLAY)
......
......@@ -7,6 +7,7 @@ public class InventoryLogic : MonoBehaviour
{
public List<InventoryTile> Slots = new List<InventoryTile>();
public InventoryTile SelectedSlot;
public AudioSource auds;
public static InventoryLogic instance;
private void Start()
......@@ -24,6 +25,7 @@ public class InventoryLogic : MonoBehaviour
Debug.Log(s + "is free");
s.Add(NewItem);
auds.Play();
break;
}
}
......
......@@ -109,7 +109,7 @@ public class QuestManager : MonoBehaviour
fixedlaptop = true;
PublicEnums.SetDialogFlag(PublicEnums.DialogFlag.LaptopFixed_in_inventory, true);
PublicEnums.SetDialogFlag(PublicEnums.DialogFlag.Laptop_in_inventory, false);
laptop.Description = "note: Wonderful idea!We might stop in Copenhagen soon, right? A friend of mine does a people‘s kitchen there every Wednesday.Let‘s sneak out for a night!";
laptop.Description = "note: Wonderful idea! We might stop in Copenhagen soon, right? A friend of mine does a people‘s kitchen there every Wednesday. Let‘s sneak out for a night!";
InventoryLogic.instance.TryRemoveItem(laptop.ItemName);
InventoryLogic.instance.AddItem(laptop);
}
......@@ -191,11 +191,11 @@ public class QuestManager : MonoBehaviour
{
twig++;
if (twig == twigStag.ironQ) twigQuest.Description = "Twig has asked you to retrieve the soldering iron. It should be somewhere in the hull.";
if (twig == twigStag.DuckQ) twigQuest.Description = "Twig is looking for something to hold the antenna cable together... what could they have meant?";
if (twig == twigStag.DuckQ) twigQuest.Description = "Twig is looking for something to hold the antenna cable together... what could he have meant?";
if (twig == twigStag.interviewrdy) twigQuest.Description = "Twig is waiting for you to interview him.";
if (twig == twigStag.done)
{
twigQuest.Description = "You have succesfully collected Twigs interview for the broadcast. And they already found a topic for the next episode.";
twigQuest.Description = "You have succesfully collected Twigs interview for the broadcast. And he already found a topic for the next episode.";
twigQuestcheckmark.SetActive(true);
};
}
......
......@@ -28,4 +28,11 @@ public class Tutorial : MonoBehaviour
Tutorialmessage.text = "";
}
public void Broadcastry()
{
Tutorialmessage.text = "Everything is ready. \n" +
"you can Start the podcast below deck. ";
Invoke("Endsticekrmessage", 10);
}
}
This source diff could not be displayed because it is stored in LFS. You can view the blob instead.
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