Commit 82457554 authored by Ben Huber's avatar Ben Huber
Browse files

small fixes: euphoria trigger layer, music even if muted, missing monobehavior in repeat scene

parent 82efbfdd
......@@ -27334,7 +27334,7 @@ GameObject:
- component: {fileID: 3528460926628213651}
- component: {fileID: 7525144492411416365}
- component: {fileID: 6745747068963519829}
m_Layer: 0
m_Layer: 11
m_Name: trigger achievement
m_TagString: Untagged
m_Icon: {fileID: 0}
......@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.35872743, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
......@@ -147,52 +147,6 @@ GameObject:
m_CorrespondingSourceObject: {fileID: 3589828500587773887, guid: 2579dd242ed5cf944beea17648985355, type: 3}
m_PrefabInstance: {fileID: 3589828500557861222}
m_PrefabAsset: {fileID: 0}
--- !u!1 &93965614
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 93965616}
- component: {fileID: 93965615}
m_Layer: 0
m_Name: TextPrintManager
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &93965615
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 93965614}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3b1748e8e7ad57c48ba4b8980947d484, type: 3}
m_Name:
m_EditorClassIdentifier:
print: 1
doPrint: 0
nums: 0
--- !u!4 &93965616
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 93965614}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -18.74486, y: -42.780895, z: -88.36675}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &116279739
GameObject:
m_ObjectHideFlags: 0
......
......@@ -27,7 +27,11 @@ public class AudioTrigger : MonoBehaviour {
if(Narration.instance.Play(Menu.LangIsEnglish()?voiceLine_EN:voiceLine, Menu.LangIsEnglish() ? text_EN : text, textColor)) {
if (!repeatable) {
triggered[text] = true;
Debug.Log("I know "+triggered.Count+", read: " + triggered.Count(t => t.Value));
string s = "\n";
foreach (var t in triggered) {
s += t.Key +" - " + t.Value + '\n';
}
Debug.Log("I know "+triggered.Count+", heard: " + triggered.Count(t => t.Value) + s);
// check if this was the last.... dirty hack: assume fixed number of narration bits that can be found
if (triggered.Count == 12 && triggered.All(t => t.Value)) {
if (SteamManager.Initialized) {
......
......@@ -19,7 +19,7 @@ public class Music : MonoBehaviour
public AudioSource auds;
void PlayeMusic()
{
auds.volume = Menu.musicVolume;
auds.volume = Menu.muted ? 0f : Menu.musicVolume;
auds.Play();
}
......
......@@ -23,7 +23,7 @@ public class RoomManager : MonoBehaviour
public void ClearRooms(List<Room> roomsToKeep)
{
Debug.Log("Clearing rooms, keeping: " + roomsToKeep.Count);
// Debug.Log("Clearing rooms, keeping: " + roomsToKeep.Count);
foreach (Room r in roomList)
{
if (!roomsToKeep.Contains(r)) {
......
......@@ -20,19 +20,19 @@ public class RoomTrigger : MonoBehaviour
private void OnTriggerEnter(Collider other)
{
if (spawn) {
Debug.Log("unreleased by: " + gameObject.name);
// Debug.Log("unreleased by: " + gameObject.name);
room.SpawnNeighbour(prefabindex, roomIndex, ownIndexAtOtherRoom);
}
if (deSpawn)
{
Debug.Log("Despawning by: " + gameObject.name);
// Debug.Log("Despawning by: " + gameObject.name);
room.DeSpawnNeighbour((roomstoKeep != null) ? roomstoKeep : new List<int>());
}
}
private void OnTriggerExit(Collider other) {
if (spawn||true) {
Debug.Log("released by: " + gameObject.name);
// Debug.Log("released by: " + gameObject.name);
room.ReleaseNeighbours();
}
}
......
Supports Markdown
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