diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj
index 1efc439..3df77dd 100644
--- a/Assembly-CSharp.csproj
+++ b/Assembly-CSharp.csproj
@@ -60,7 +60,6 @@
-
@@ -125,6 +124,7 @@
+
diff --git a/Assets/Audio/Music/Opening.wav b/Assets/Audio/Music/Opening.wav
index 7fe797f..61dea0d 100644
Binary files a/Assets/Audio/Music/Opening.wav and b/Assets/Audio/Music/Opening.wav differ
diff --git a/Assets/Prefabs/Full Camera System.prefab b/Assets/Prefabs/Full Camera System.prefab
index 09606d9..8acd2b3 100644
--- a/Assets/Prefabs/Full Camera System.prefab
+++ b/Assets/Prefabs/Full Camera System.prefab
@@ -1203,6 +1203,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 5423613212279373759}
+ - target: {fileID: 484696265992457979, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
+ value: SendLiveCamera1
+ objectReference: {fileID: 0}
- target: {fileID: 772274709971733387, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
type: 3}
propertyPath: m_AnchorMax.y
@@ -1228,6 +1233,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 5423613212279373759}
+ - target: {fileID: 940214906294439661, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
+ value: SendLiveCamera3
+ objectReference: {fileID: 0}
- target: {fileID: 1046464953652946183, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
type: 3}
propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Target
@@ -1349,6 +1359,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 5423613212279373759}
+ - target: {fileID: 3365231972568808015, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
+ value: SendLiveCamera2
+ objectReference: {fileID: 0}
- target: {fileID: 3600653119450848535, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
type: 3}
propertyPath: m_AnchorMax.x
@@ -1484,6 +1499,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 5423613212279373759}
+ - target: {fileID: 5613319611341901679, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
+ value: SendLiveCamera5
+ objectReference: {fileID: 0}
- target: {fileID: 5674189037791389165, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
type: 3}
propertyPath: m_AnchorMax.y
@@ -1649,6 +1669,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 5423613212279373759}
+ - target: {fileID: 8210675228578444777, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
+ value: SendLiveCamera6
+ objectReference: {fileID: 0}
- target: {fileID: 8490207366568774969, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
type: 3}
propertyPath: m_AnchorMax.y
@@ -1694,6 +1719,11 @@ PrefabInstance:
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 5423613212279373759}
+ - target: {fileID: 8579757265068358757, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
+ type: 3}
+ propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument
+ value: SendLiveCamera4
+ objectReference: {fileID: 0}
- target: {fileID: 8735248757666063835, guid: d9c86bf2ae995824c8d5c5b8311de1a0,
type: 3}
propertyPath: m_AnchorMax.x
diff --git a/Assets/Prefabs/Modem.prefab b/Assets/Prefabs/Modem.prefab
index f54f66f..2a16f56 100644
--- a/Assets/Prefabs/Modem.prefab
+++ b/Assets/Prefabs/Modem.prefab
@@ -134,6 +134,7 @@ MonoBehaviour:
SerializationNodes: []
_udonSharpBackingUdonBehaviour: {fileID: 932720169245821887}
_ModemActivationObject: {fileID: 497488136702045868}
+ _ModemTeleportEffect: {fileID: 5032756485913580084}
_ModemDestination: {fileID: 0}
_AudioManager: {fileID: 0}
_ModemAnimator: {fileID: 0}
@@ -175,17 +176,17 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
type: 3}
propertyPath: m_LocalScale.x
- value: 1.35
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
type: 3}
propertyPath: m_LocalScale.y
- value: 1.35
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
type: 3}
propertyPath: m_LocalScale.z
- value: 1
+ value: 0.005
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
type: 3}
@@ -195,12 +196,12 @@ PrefabInstance:
- target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
type: 3}
propertyPath: m_LocalPosition.y
- value: 2.5
+ value: 0.024
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
type: 3}
propertyPath: m_LocalPosition.z
- value: -0
+ value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
type: 3}
@@ -257,6 +258,12 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 21f939804f0f9c742b2f0205797b740b, type: 3}
+--- !u!1 &5032756485913580084 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 21f939804f0f9c742b2f0205797b740b,
+ type: 3}
+ m_PrefabInstance: {fileID: 5266564533062807397}
+ m_PrefabAsset: {fileID: 0}
--- !u!4 &5664439777900644494 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b,
diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity
index 12f961f..770e495 100644
--- a/Assets/Scenes/witwics.unity
+++ b/Assets/Scenes/witwics.unity
@@ -18177,7 +18177,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 1
+ m_IsActive: 0
--- !u!224 &435937998
RectTransform:
m_ObjectHideFlags: 0
@@ -18802,7 +18802,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
- m_StringArgument: SwitchToCamera3
+ m_StringArgument: Camera3_Switch
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &449385711
@@ -22285,7 +22285,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
- m_StringArgument: SwitchToCamera1
+ m_StringArgument: Camera1_Switch
m_BoolArgument: 0
m_CallState: 2
--- !u!1 &560691080 stripped
@@ -26762,6 +26762,11 @@ PrefabInstance:
value:
objectReference: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7,
type: 3}
+ - target: {fileID: 5032756485913580084, guid: 597de72e4385c0d498ba1475ac5ef4f7,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7,
type: 3}
propertyPath: m_LocalPosition.x
@@ -26990,7 +26995,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
- m_StringArgument: SwitchToCamera2
+ m_StringArgument: Camera2_Switch
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &717190865
@@ -29605,7 +29610,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
- m_StringArgument: SwitchToCamera5
+ m_StringArgument: Camera5_Switch
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &796654660
@@ -34233,6 +34238,8 @@ GameObject:
- component: {fileID: 967689115}
- component: {fileID: 967689114}
- component: {fileID: 967689116}
+ - component: {fileID: 967689119}
+ - component: {fileID: 967689118}
m_Layer: 22
m_Name: Host Panel
m_TagString: Untagged
@@ -34248,7 +34255,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 967689107}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: 0}
+ m_LocalPosition: {x: 0, y: 0, z: -0}
m_LocalScale: {x: 0.0004, y: 0.0004, z: 0.0004}
m_ConstrainProportionsScale: 0
m_Children:
@@ -34259,7 +34266,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
- m_AnchoredPosition: {x: 0.2665, y: 0}
+ m_AnchoredPosition: {x: 0.2725, y: 0}
m_SizeDelta: {x: 640, y: 360}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &967689109
@@ -34433,6 +34440,7 @@ MonoBehaviour:
- {fileID: 4438766482650780795}
- {fileID: 1993364535}
- {fileID: 1589630268}
+ _CameraConsole: {fileID: 674142366}
--- !u!222 &967689116
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -34471,6 +34479,54 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
+--- !u!54 &967689118
+Rigidbody:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 967689107}
+ serializedVersion: 4
+ m_Mass: 1
+ m_Drag: 0
+ m_AngularDrag: 0.05
+ m_CenterOfMass: {x: 0, y: 0, z: 0}
+ m_InertiaTensor: {x: 1, y: 1, z: 1}
+ m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_ImplicitCom: 1
+ m_ImplicitTensor: 1
+ m_UseGravity: 0
+ m_IsKinematic: 1
+ m_Interpolate: 0
+ m_Constraints: 0
+ m_CollisionDetection: 0
+--- !u!65 &967689119
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 967689107}
+ m_Material: {fileID: 0}
+ m_IncludeLayers:
+ serializedVersion: 2
+ m_Bits: 0
+ m_ExcludeLayers:
+ serializedVersion: 2
+ m_Bits: 4294967295
+ m_LayerOverridePriority: 0
+ m_IsTrigger: 0
+ m_ProvidesContacts: 0
+ m_Enabled: 1
+ serializedVersion: 3
+ m_Size: {x: 640, y: 360, z: 5}
+ m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &967695969 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 9047229299218861105, guid: be33bc7f6c414e6409becfa348b9310d,
@@ -34622,7 +34678,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 974801522}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: 0, y: 0, z: -0.1001358}
+ m_LocalPosition: {x: 0, y: 0, z: -1}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -47002,7 +47058,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
- m_IsActive: 0
+ m_IsActive: 1
--- !u!224 &1333952428
RectTransform:
m_ObjectHideFlags: 0
@@ -50596,7 +50652,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
- m_StringArgument: SwitchToCamera6
+ m_StringArgument: Camera6_Switch
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &1451018079
@@ -75909,7 +75965,7 @@ MonoBehaviour:
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
- m_StringArgument: SwitchToCamera4
+ m_StringArgument: Camera4_Switch
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &2071042740
@@ -78941,11 +78997,6 @@ PrefabInstance:
value:
objectReference: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7,
type: 3}
- - target: {fileID: 497488136702045868, guid: 597de72e4385c0d498ba1475ac5ef4f7,
- type: 3}
- propertyPath: m_IsActive
- value: 0
- objectReference: {fileID: 0}
- target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7,
type: 3}
propertyPath: _AudioManager
@@ -83789,64 +83840,58 @@ MonoBehaviour:
useAssignedLayers: 0
DynamicPrefabs: []
DynamicMaterials:
- - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
- - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
- - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2}
- - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2}
- - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
- - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
- - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
- - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2}
- - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2}
- - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
- - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2}
- - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
+ - {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2}
+ - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
+ - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
+ - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
+ - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
- {fileID: 2100000, guid: 012e77fb6a6d69548802da3b41814618, type: 2}
- {fileID: 2100000, guid: 4d875a76d6e247742b8d3d66214b2c2d, type: 2}
+ - {fileID: 2100000, guid: 12e96dbe16f21704485645506bfc235a, type: 2}
- {fileID: 2100000, guid: 8db36ece14c543d47be04e1d0cde1a1f, type: 2}
- {fileID: 2100000, guid: 77485a45419b5da498cc74acff31c49a, type: 2}
- {fileID: 2100000, guid: d2b3854a83244764192826cd7eadc955, type: 2}
- {fileID: 2100000, guid: 8de5e47a4e3831b40b59595ad3e2e267, type: 2}
- {fileID: 2100000, guid: d23dd47c26278f94ea3bc15c730f59ed, type: 2}
- {fileID: 2100000, guid: 77cb94791cc41a5498279122022730b0, type: 2}
+ - {fileID: 2100000, guid: 98b5c6e030fc83d48bbba9e927a456d4, type: 2}
+ - {fileID: 2100000, guid: c0998459c7ac0e94d825035839d01ac9, type: 2}
- {fileID: 2100000, guid: fa8f228d6d5f77d479bf970e355f4bc3, type: 2}
- {fileID: 2100000, guid: 90a6fdf8f72a7a84d83dcb448e0f749e, type: 2}
- {fileID: 2100000, guid: 6075d345a5007be4abb1a4485d1ebb5f, type: 2}
- {fileID: 2100000, guid: d7188495ea0838346af40c820ec9ffc8, type: 2}
- {fileID: 2100000, guid: 79cdc811085b366438fb60b12a3642ba, type: 2}
- - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2}
+ - {fileID: 2100000, guid: ffd504a9168a01c459170bb8f2fcea1c, type: 2}
+ - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2}
- {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2}
- {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2}
- - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
+ - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2}
+ - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2}
- {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2}
- - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
- - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
- - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
- - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
- - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2}
- - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2}
- - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2}
- - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2}
+ - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2}
- {fileID: 2100000, guid: 4de84333504452948874f4422dec7b56, type: 2}
- {fileID: 2100000, guid: 97a375a2664a65f44a74b8e0711591fb, type: 2}
- {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2}
+ - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2}
- {fileID: 2100000, guid: 20b7b61cb65ead644a4959264fc90833, type: 2}
- {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2}
- {fileID: 2100000, guid: ea08301eace4f164bb3aae930413a978, type: 2}
- {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2}
- - {fileID: 2100000, guid: 49170bf20870c7c45873b3c1966d86af, type: 2}
+ - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2}
- {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2}
- {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2}
- {fileID: 2100000, guid: cc8e36941dd3f2c42a157650e05b9242, type: 2}
- - {fileID: 2100000, guid: 82bace4c334919c4f92e87905c39fdf8, type: 2}
- - {fileID: 2100000, guid: 220d5a1f1701e674794a1083cc2f0bac, type: 2}
- - {fileID: 2100000, guid: c4382cc6d54262b46913ae6fe8a3740e, type: 2}
- - {fileID: 2100000, guid: d811246c848733b4c8310b4dec5a5fdf, type: 2}
- - {fileID: 2100000, guid: 50e427994e5b0224f966b200c577b78b, type: 2}
- - {fileID: 2100000, guid: f025bfafc9ecec74aa3aab468ef837d7, type: 2}
+ - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2}
+ - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2}
+ - {fileID: 2100000, guid: dba163de40c568b48ae2ffa7c83c66b9, type: 2}
+ - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2}
+ - {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2}
+ - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
+ - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2}
+ - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2}
+ - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2}
+ - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2}
+ - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2}
- {fileID: 2100000, guid: cf9efbb6277ea2d4aa7d30bc9073915e, type: 2}
LightMapsNear: []
LightMapsFar: []
diff --git a/Assets/UdonSharp/Modem/Modem.asset b/Assets/UdonSharp/Modem/Modem.asset
index eb71efb..f5c44b8 100644
--- a/Assets/UdonSharp/Modem/Modem.asset
+++ b/Assets/UdonSharp/Modem/Modem.asset
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
- Data: 8
+ Data: 9
- Name:
Entry: 7
Data:
@@ -236,16 +236,70 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _ModemDestination
+ Data: _ModemTeleportEffect
- Name: $v
Entry: 7
Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _ModemTeleportEffect
+ - Name: k__BackingField
+ Entry: 9
+ Data: 12
+ - Name: k__BackingField
+ Entry: 9
+ Data: 12
+ - Name: k__BackingField
+ Entry: 7
+ Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+ - Name:
+ Entry: 6
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 5
+ Data: true
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data:
+ - Name: $k
+ Entry: 1
+ Data: _ModemDestination
+ - Name: $v
+ Entry: 7
+ Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _ModemDestination
- Name: k__BackingField
Entry: 7
- Data: 16|System.RuntimeType, mscorlib
+ Data: 19|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: Modem, Assembly-CSharp
@@ -254,7 +308,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 7
- Data: 17|System.RuntimeType, mscorlib
+ Data: 20|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: VRC.Udon.UdonBehaviour, VRC.Udon
@@ -275,13 +329,13 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
- Data: 18|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 19|UnityEngine.SerializeField, UnityEngine.CoreModule
+ Data: 22|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -305,13 +359,13 @@ MonoBehaviour:
Data: _AudioManager
- Name: $v
Entry: 7
- Data: 20|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 23|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _AudioManager
- Name: k__BackingField
Entry: 7
- Data: 21|System.RuntimeType, mscorlib
+ Data: 24|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: AudioManager, Assembly-CSharp
@@ -320,7 +374,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 17
+ Data: 20
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -335,13 +389,13 @@ MonoBehaviour:
Data: true
- Name: _fieldAttributes
Entry: 7
- Data: 22|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 2
- Name:
Entry: 7
- Data: 23|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
+ Data: 26|UnityEngine.SpaceAttribute, UnityEngine.CoreModule
- Name: height
Entry: 4
Data: 8
@@ -350,7 +404,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 7
- Data: 24|UnityEngine.SerializeField, UnityEngine.CoreModule
+ Data: 27|UnityEngine.SerializeField, UnityEngine.CoreModule
- Name:
Entry: 8
Data:
@@ -374,13 +428,13 @@ MonoBehaviour:
Data: _ModemAnimator
- Name: $v
Entry: 7
- Data: 25|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ Data: 28|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _ModemAnimator
- Name: k__BackingField
Entry: 7
- Data: 26|System.RuntimeType, mscorlib
+ Data: 29|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Animator, UnityEngine.AnimationModule
@@ -389,61 +443,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 26
- - Name: k__BackingField
- Entry: 7
- Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
- - Name:
- Entry: 6
- Data:
- - Name:
- Entry: 8
- Data:
- - Name: k__BackingField
- Entry: 5
- Data: true
- - Name: _fieldAttributes
- Entry: 7
- Data: 27|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- - Name:
- Entry: 12
- Data: 1
- - Name:
- Entry: 7
- Data: 28|UnityEngine.SerializeField, UnityEngine.CoreModule
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 13
- Data:
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 8
- Data:
- - Name:
- Entry: 7
- Data:
- - Name: $k
- Entry: 1
- Data: _ModemDestinationAnimator
- - Name: $v
- Entry: 7
- Data: 29|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- - Name: k__BackingField
- Entry: 1
- Data: _ModemDestinationAnimator
- - Name: k__BackingField
- Entry: 9
- Data: 26
- - Name: k__BackingField
- Entry: 9
- Data: 26
+ Data: 29
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -485,16 +485,70 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _EnteredPlayers
+ Data: _ModemDestinationAnimator
- Name: $v
Entry: 7
Data: 32|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _ModemDestinationAnimator
+ - Name: k__BackingField
+ Entry: 9
+ Data: 29
+ - Name: k__BackingField
+ Entry: 9
+ Data: 29
+ - Name: k__BackingField
+ Entry: 7
+ Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+ - Name:
+ Entry: 6
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 5
+ Data: true
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 33|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 34|UnityEngine.SerializeField, UnityEngine.CoreModule
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data:
+ - Name: $k
+ Entry: 1
+ Data: _EnteredPlayers
+ - Name: $v
+ Entry: 7
+ Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
Data: _EnteredPlayers
- Name: k__BackingField
Entry: 7
- Data: 33|System.RuntimeType, mscorlib
+ Data: 36|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: System.String[], mscorlib
@@ -503,7 +557,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 33
+ Data: 36
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -518,13 +572,13 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 34|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 37|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 1
- Name:
Entry: 7
- Data: 35|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
+ Data: 38|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime
- Name:
Entry: 8
Data:
diff --git a/Assets/UdonSharp/Modem/Modem.cs b/Assets/UdonSharp/Modem/Modem.cs
index 4f9bb30..104ee35 100644
--- a/Assets/UdonSharp/Modem/Modem.cs
+++ b/Assets/UdonSharp/Modem/Modem.cs
@@ -14,6 +14,7 @@ public class Modem : UdonSharpBehaviour
[UdonSynced, FieldChangeCallback(nameof(BeginTeleport))] private bool _BeginTeleport = false;
[SerializeField] private GameObject _ModemActivationObject;
+ [SerializeField] private GameObject _ModemTeleportEffect;
[SerializeField] private Modem _ModemDestination;
[Space]
@@ -29,31 +30,39 @@ public class Modem : UdonSharpBehaviour
public override void OnPlayerTriggerEnter(VRCPlayerApi Player)
{
- for (int i = 0; i < MAX_PLAYERS_IN_MODEM; i++)
+ if (Player.IsOwner(gameObject))
{
- if (_EnteredPlayers[i] == null)
+ for (int i = 0; i < MAX_PLAYERS_IN_MODEM; i++)
{
- _EnteredPlayers[i] = Player.displayName;
- break;
+ if (_EnteredPlayers[i] == null)
+ {
+ _EnteredPlayers[i] = Player.displayName;
+ break;
+ }
}
+
+ RequestSerialization();
}
- RequestSerialization();
base.OnPlayerTriggerEnter(Player);
}
public override void OnPlayerTriggerExit(VRCPlayerApi Player)
{
- for (int i = 0; i < MAX_PLAYERS_IN_MODEM; i++)
+ if (Player.IsOwner(gameObject))
{
- if (_EnteredPlayers[i] == Player.displayName)
+ for (int i = 0; i < MAX_PLAYERS_IN_MODEM; i++)
{
- _EnteredPlayers[i] = null;
- break;
+ if (_EnteredPlayers[i] == Player.displayName)
+ {
+ _EnteredPlayers[i] = null;
+ break;
+ }
}
+
+ RequestSerialization();
}
- RequestSerialization();
base.OnPlayerTriggerExit(Player);
}
@@ -136,6 +145,7 @@ public class Modem : UdonSharpBehaviour
{
_ActivateModem = value;
_ModemActivationObject.SetActive(_ActivateModem);
+ _ModemTeleportEffect.SetActive(_ActivateModem);
}
get => _ActivateModem;
}
diff --git a/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset b/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset
index af79b1e..46790a4 100644
--- a/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset
+++ b/Assets/UdonSharp/Player Permissions/HostPanelInterface.asset
@@ -44,7 +44,7 @@ MonoBehaviour:
Data:
- Name:
Entry: 12
- Data: 19
+ Data: 20
- Name:
Entry: 7
Data:
@@ -1106,16 +1106,76 @@ MonoBehaviour:
Data:
- Name: $k
Entry: 1
- Data: _SelectedTabColour
+ Data: _CameraConsole
- Name: $v
Entry: 7
Data: 68|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
- Name: k__BackingField
Entry: 1
- Data: _SelectedTabColour
+ Data: _CameraConsole
- Name: k__BackingField
Entry: 7
Data: 69|System.RuntimeType, mscorlib
+ - Name:
+ Entry: 1
+ Data: CameraSystem.CameraSystem_Console, Assembly-CSharp
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 9
+ Data: 4
+ - Name: k__BackingField
+ Entry: 7
+ Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
+ - Name:
+ Entry: 6
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name: k__BackingField
+ Entry: 5
+ Data: true
+ - Name: _fieldAttributes
+ Entry: 7
+ Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ - Name:
+ Entry: 12
+ Data: 1
+ - Name:
+ Entry: 7
+ Data: 71|UnityEngine.SerializeField, UnityEngine.CoreModule
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 13
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 8
+ Data:
+ - Name:
+ Entry: 7
+ Data:
+ - Name: $k
+ Entry: 1
+ Data: _SelectedTabColour
+ - Name: $v
+ Entry: 7
+ Data: 72|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor
+ - Name: k__BackingField
+ Entry: 1
+ Data: _SelectedTabColour
+ - Name: k__BackingField
+ Entry: 7
+ Data: 73|System.RuntimeType, mscorlib
- Name:
Entry: 1
Data: UnityEngine.Color, UnityEngine.CoreModule
@@ -1124,7 +1184,7 @@ MonoBehaviour:
Data:
- Name: k__BackingField
Entry: 9
- Data: 69
+ Data: 73
- Name: k__BackingField
Entry: 7
Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib
@@ -1139,7 +1199,7 @@ MonoBehaviour:
Data: false
- Name: _fieldAttributes
Entry: 7
- Data: 70|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
+ Data: 74|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib
- Name:
Entry: 12
Data: 0
diff --git a/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs b/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs
index ed2e802..73e754b 100644
--- a/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs
+++ b/Assets/UdonSharp/Player Permissions/HostPanelInterface.cs
@@ -1,4 +1,5 @@
+using CameraSystem;
using TMPro;
using UdonSharp;
using UnityEngine;
@@ -43,6 +44,7 @@ public class HostPanelInterface : UdonSharpBehaviour
[SerializeField] private CaseManager _CaseManager;
[SerializeField] private PlayerPodium[] _PlayerPodiums;
+ [SerializeField] private CameraSystem_Console _CameraConsole;
private readonly Color _SelectedTabColour = new Color(0.0f, 0.5f, 0.0f);
@@ -221,31 +223,31 @@ public class HostPanelInterface : UdonSharpBehaviour
public void Camera1_Switch()
{
- Debug.Log("Camera 1 should go live here.");
+ _CameraConsole.SendLiveCamera1();
}
public void Camera2_Switch()
{
- Debug.Log("Camera 2 should go live here.");
+ _CameraConsole.SendLiveCamera2();
}
public void Camera3_Switch()
{
- Debug.Log("Camera 3 should go live here.");
+ _CameraConsole.SendLiveCamera3();
}
public void Camera4_Switch()
{
- Debug.Log("Camera 4 should go live here.");
+ _CameraConsole.SendLiveCamera4();
}
public void Camera5_Switch()
{
- Debug.Log("Camera 5 should go live here.");
+ _CameraConsole.SendLiveCamera5();
}
public void Camera6_Switch()
{
- Debug.Log("Camera 6 should go live here.");
+ _CameraConsole.SendLiveCamera6();
}
}
diff --git a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset
index b946757..036a370 100644
--- a/Assets/UdonSharp/UtilityScripts/BoneFollower.asset
+++ b/Assets/UdonSharp/UtilityScripts/BoneFollower.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: BoneFollower
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: ccbda9bf23e2f714c9226283c77a92e5,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 52ecc8a73071e8e40928c3609699fcf4,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset
index b35639e..13d78db 100644
--- a/Assets/UdonSharp/UtilityScripts/InteractToggle.asset
+++ b/Assets/UdonSharp/UtilityScripts/InteractToggle.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: InteractToggle
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: 405e38d3dfb2f514daeed0e28fbb4864,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 873dfce61b1514e429c92e0d2fded7de,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
index 1def3de..d89a1a4 100644
--- a/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
+++ b/Assets/UdonSharp/UtilityScripts/PlayerModSetter.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: PlayerModSetter
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: f938e6c4ff027a74da405a1f9353fd2b,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: e81558796a212ab4d88e305e2010f24b,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
index 8101274..ea98aa4 100644
--- a/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
+++ b/Assets/UdonSharp/UtilityScripts/Synced/GlobalToggleObject.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: GlobalToggleObject
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: c49c9265a3ef24642a6a4465d0a78872,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 2fe8ced6184000f49bca526cd2c5891c,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
index 901d05e..b4b3ede 100644
--- a/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
+++ b/Assets/UdonSharp/UtilityScripts/Synced/MasterToggleObject.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: MasterToggleObject
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: 04024a76ab1924042ba521e11cb76d91,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: a2d01d9f36ac6df49831be249e48ecc4,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
index da92932..c624599 100644
--- a/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
+++ b/Assets/UdonSharp/UtilityScripts/TrackingDataFollower.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: TrackingDataFollower
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: 17f8fbbe6cc186d4f8dbb057b01a4ec2,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 1b89d4552983c0448a7389decec3b555,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
index ee4621f..5226f4f 100644
--- a/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
+++ b/Assets/UdonSharp/UtilityScripts/WorldAudioSettings.asset
@@ -12,7 +12,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3}
m_Name: WorldAudioSettings
m_EditorClassIdentifier:
- serializedUdonProgramAsset: {fileID: 11400000, guid: 128d924a3066b7546b2d1c73e61006ab,
+ serializedUdonProgramAsset: {fileID: 11400000, guid: 994b559b0f158b4499f8937980ed8694,
type: 2}
udonAssembly:
assemblyError:
diff --git a/Assets/VRChatCameraSystem b/Assets/VRChatCameraSystem
index e58de1e..745f7c6 160000
--- a/Assets/VRChatCameraSystem
+++ b/Assets/VRChatCameraSystem
@@ -1 +1 @@
-Subproject commit e58de1e57854835a64edcfa4a0ff180a250d0845
+Subproject commit 745f7c62d3ba11153aed2bd6a0ec43789a10e773
diff --git a/Raw Files/Music/Opening.aup3 b/Raw Files/Music/Opening.aup3
index 1bc6758..d16137d 100644
Binary files a/Raw Files/Music/Opening.aup3 and b/Raw Files/Music/Opening.aup3 differ
diff --git a/witwics.sln b/witwics.sln
index 5ce5cd5..a61877a 100644
--- a/witwics.sln
+++ b/witwics.sln
@@ -5,8 +5,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.ClientSim", "VRC.Client
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vrchat.jordo.easyquestswitch", "vrchat.jordo.easyquestswitch.csproj", "{24AABBF3-C935-A9B5-2807-501AFC381210}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{7118B098-639E-4AE7-166D-ACE8F0BEB311}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.Udon.Serialization.OdinSerializer", "VRC.Udon.Serialization.OdinSerializer.csproj", "{C4865AD8-5708-4E51-79C2-E64911B4DB43}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UdonSharp.Editor", "UdonSharp.Editor.csproj", "{DFC90E0B-36B0-292E-7E42-CFA532E2309E}"
@@ -27,6 +25,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.ClientSim.Editor", "VRC
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.SDK3", "VRC.SDK3.csproj", "{08FEB8F6-AD22-0DF5-5232-7DE088616AF5}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{7118B098-639E-4AE7-166D-ACE8F0BEB311}"
+EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.SDK3.Editor", "VRC.SDK3.Editor.csproj", "{5C71143D-D27E-C806-9E25-D4639A6DED1D}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.DOTween", "UniTask.DOTween.csproj", "{195A71ED-9F29-D8F1-1F89-9EC9ABA5866C}"
@@ -73,10 +73,6 @@ Global
{24AABBF3-C935-A9B5-2807-501AFC381210}.Debug|Any CPU.Build.0 = Debug|Any CPU
{24AABBF3-C935-A9B5-2807-501AFC381210}.Release|Any CPU.ActiveCfg = Release|Any CPU
{24AABBF3-C935-A9B5-2807-501AFC381210}.Release|Any CPU.Build.0 = Release|Any CPU
- {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Release|Any CPU.Build.0 = Release|Any CPU
{C4865AD8-5708-4E51-79C2-E64911B4DB43}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{C4865AD8-5708-4E51-79C2-E64911B4DB43}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C4865AD8-5708-4E51-79C2-E64911B4DB43}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -117,6 +113,10 @@ Global
{08FEB8F6-AD22-0DF5-5232-7DE088616AF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
{08FEB8F6-AD22-0DF5-5232-7DE088616AF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{08FEB8F6-AD22-0DF5-5232-7DE088616AF5}.Release|Any CPU.Build.0 = Release|Any CPU
+ {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {7118B098-639E-4AE7-166D-ACE8F0BEB311}.Release|Any CPU.Build.0 = Release|Any CPU
{5C71143D-D27E-C806-9E25-D4639A6DED1D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{5C71143D-D27E-C806-9E25-D4639A6DED1D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{5C71143D-D27E-C806-9E25-D4639A6DED1D}.Release|Any CPU.ActiveCfg = Release|Any CPU