Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Datastream, 3rd time is the charm #862

Open
wants to merge 5 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 12 additions & 126 deletions Assets/Scenes/PersistentScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -1338,6 +1338,7 @@ GameObject:
- component: {fileID: 728815264}
- component: {fileID: 728815265}
- component: {fileID: 728815267}
- component: {fileID: 728815268}
m_Layer: 0
m_Name: Integrations
m_TagString: Untagged
Expand Down Expand Up @@ -1384,6 +1385,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cb438f304d0d4064fb1de229c53becde, type: 3}
m_Name:
m_EditorClassIdentifier:
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 728815263}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 525ce11d5f9f48a48adee4bc7515712a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &782876828
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -3283,132 +3295,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1604709610}
m_CullTransparentMesh: 1
--- !u!1 &1617137644
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1617137651}
- component: {fileID: 1617137650}
- component: {fileID: 1617137649}
- component: {fileID: 1617137648}
- component: {fileID: 1617137647}
- component: {fileID: 1617137646}
- component: {fileID: 1617137645}
m_Layer: 0
m_Name: Lighting Master
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1617137645
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617137644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e549df73151ee6b48a2700b69f0e6be2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1617137646
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617137644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1d1faa5ee2902ba40bafec9aea861ebd, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1617137647
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617137644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3e0fb070e46d59947a7b18b7f97747e6, type: 3}
m_Name:
m_EditorClassIdentifier:
DimmerChannels:
RedChannels:
GreenChannels:
BlueChannels:
YellowChannels:
FogChannels:
StrobeChannels:
CueChangeChannel: 0
KeyframeChannel: 0
BeatlineChannel: 0
BonusEffectChannel: 0
PostProcessingChannel: 0
PerformerChannel: 0
DrumChannel: 0
GuitarChannel: 0
BassChannel: 0
KeysChannel: 0
--- !u!114 &1617137648
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617137644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2e6d233a733a6014891836deea6c0bc2, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1617137649
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617137644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d68c6b6734cabc468852f66a540c7b9, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &1617137650
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617137644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 525ce11d5f9f48a48adee4bc7515712a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &1617137651
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1617137644}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1171.9512, y: 283.89728, z: 1638.9523}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1665662509
GameObject:
m_ObjectHideFlags: 0
Expand Down
4 changes: 2 additions & 2 deletions Assets/Script/Gameplay/GameManager.Debug.cs
Original file line number Diff line number Diff line change
Expand Up @@ -443,8 +443,8 @@ private void VenueDebug()

// Explicit check instead of using ?, as nullable enum types are not specially
// formatted by ZString to avoid allocations (while non-nullable enums are)
if (MasterLightingController.CurrentLightingCue != null)
text.AppendFormat("Lighting event: {0}\n", MasterLightingController.CurrentLightingCue.Type);
if (MasterLightingController.MLCCurrentLightingCue != null)
text.AppendFormat("Lighting event: {0}\n", MasterLightingController.MLCCurrentLightingCue.Type);
else
text.Append("Lighting event: None\n");

Expand Down
Loading