diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index ddbb2a5..afc9f9f 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -60,12 +60,14 @@ + + @@ -81,6 +83,7 @@ + @@ -103,9 +106,9 @@ - + @@ -122,6 +125,7 @@ + @@ -1276,14 +1280,6 @@ {446624C8-3288-B6CC-28D5-45D854E0E77D} VRC.SDKBase.Editor - - {B33C6706-7ABF-07B9-BDCA-1044C65D29E3} - com.mmmaellon.smartobjectsync - - - {5508B9D2-267C-A336-1C6C-13E7ACFA2DE1} - com.mmmaellon.smartobjectsync.editor - {A7641DC6-5B1A-DF26-7639-9A05F4D763BB} VRC.Udon diff --git a/Assets/Animations/Modem.meta b/Assets/Animations/Modem.meta new file mode 100644 index 0000000..79900c3 --- /dev/null +++ b/Assets/Animations/Modem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4443a370fcc7a3444ba920cbfdbd66a0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Modem/Modem.controller b/Assets/Animations/Modem/Modem.controller new file mode 100644 index 0000000..839da76 --- /dev/null +++ b/Assets/Animations/Modem/Modem.controller @@ -0,0 +1,159 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-8925084292288947180 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: No Teleport Effect + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 4222083283580864726} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 19bc68570ed9b5d4f84bdc4bb8401e12, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-5278040572371237678 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -8925084292288947180} + m_Position: {x: 30, y: 180, z: 0} + - serializedVersion: 1 + m_State: {fileID: 4779467486142282713} + m_Position: {x: 420, y: 180, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -8925084292288947180} +--- !u!1101 &-1549933926599434173 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Teleport + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 0} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 1 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Modem + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Teleport + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -5278040572371237678} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1101 &4222083283580864726 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Teleport + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 4779467486142282713} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &4779467486142282713 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Teleport Effect + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -1549933926599434173} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 47f040dd51c80c14cbf0b487756f2b1f, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Animations/Modem/Modem.controller.meta b/Assets/Animations/Modem/Modem.controller.meta new file mode 100644 index 0000000..8627ead --- /dev/null +++ b/Assets/Animations/Modem/Modem.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6f0d56fed95fa3f4b935cf7beb8172ed +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Modem/No Teleport Effect.anim b/Assets/Animations/Modem/No Teleport Effect.anim new file mode 100644 index 0000000..ba35179 --- /dev/null +++ b/Assets/Animations/Modem/No Teleport Effect.anim @@ -0,0 +1,104 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: No Teleport Effect + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SM_StaticEffect + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1930323159 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SM_StaticEffect + classID: 1 + script: {fileID: 0} + flags: 0 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Modem/No Teleport Effect.anim.meta b/Assets/Animations/Modem/No Teleport Effect.anim.meta new file mode 100644 index 0000000..dfa72c9 --- /dev/null +++ b/Assets/Animations/Modem/No Teleport Effect.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 19bc68570ed9b5d4f84bdc4bb8401e12 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/Modem/Teleport Effect.anim b/Assets/Animations/Modem/Teleport Effect.anim new file mode 100644 index 0000000..c0288f1 --- /dev/null +++ b/Assets/Animations/Modem/Teleport Effect.anim @@ -0,0 +1,415 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Teleport Effect + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1.5 + value: {x: 0, y: 2.5, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 4.1666665 + value: {x: 0, y: 2.5, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 5 + value: {x: 0, y: 0, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: SM_StaticEffect + m_ScaleCurves: + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 1.35, y: 1.35, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 1.5 + value: {x: 1.35, y: 1.35, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 2.3333333 + value: {x: 1.35, y: 1.35, z: 1} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: SM_StaticEffect + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SM_StaticEffect + classID: 1 + script: {fileID: 0} + flags: 0 + m_PPtrCurves: [] + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 1930323159 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1930323159 + attribute: 3 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 1930323159 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: [] + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 5 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 2.3333333 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.z + path: SM_StaticEffect + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1.5 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: SM_StaticEffect + classID: 1 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.1666665 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: SM_StaticEffect + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1.5 + value: 2.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.1666665 + value: 2.5 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: SM_StaticEffect + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 1.5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.1666665 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 5 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: SM_StaticEffect + classID: 4 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.35 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.x + path: SM_StaticEffect + classID: 4 + script: {fileID: 0} + flags: 8 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1.35 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalScale.y + path: SM_StaticEffect + classID: 4 + script: {fileID: 0} + flags: 8 + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Animations/Modem/Teleport Effect.anim.meta b/Assets/Animations/Modem/Teleport Effect.anim.meta new file mode 100644 index 0000000..cb0c199 --- /dev/null +++ b/Assets/Animations/Modem/Teleport Effect.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47f040dd51c80c14cbf0b487756f2b1f +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/M_LocationBoard_Crook.mat b/Assets/Materials/M_LocationBoard_Crook.mat index 4967b24..ee79737 100644 --- a/Assets/Materials/M_LocationBoard_Crook.mat +++ b/Assets/Materials/M_LocationBoard_Crook.mat @@ -46,7 +46,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: a9b59914da5ed7046b6ec6712d0782d9, type: 3} + m_Texture: {fileID: 2800000, guid: d99fce257e19ba94e9b1d9aea6dbe87f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: diff --git a/Assets/Materials/M_ScreenNoise.mat b/Assets/Materials/M_ScreenNoise.mat new file mode 100644 index 0000000..9887578 --- /dev/null +++ b/Assets/Materials/M_ScreenNoise.mat @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: M_ScreenNoise + m_Shader: {fileID: 4800000, guid: 06b4f64398d53f54c95a54946dd15cf0, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 1 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: cb072d3765e9cf443b3c71b63f2c4b9c, type: 3} + m_Scale: {x: 0.1, y: 0.1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Colour1: {r: 0, g: 0, b: 0.4509804, a: 1} + - _Colour2: {r: 0, g: 0.78431374, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Materials/M_ScreenNoise.mat.meta b/Assets/Materials/M_ScreenNoise.mat.meta new file mode 100644 index 0000000..5a9c6f3 --- /dev/null +++ b/Assets/Materials/M_ScreenNoise.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 483ceb65615010745bde1d5ff9fd9dd6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/LocationBoard.fbx.meta b/Assets/Models/LocationBoard.fbx.meta index dec145e..d407762 100644 --- a/Assets/Models/LocationBoard.fbx.meta +++ b/Assets/Models/LocationBoard.fbx.meta @@ -48,7 +48,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 0 + generateSecondaryUV: 1 useFileUnits: 1 keepQuads: 0 weldVertices: 1 diff --git a/Assets/Models/SM_AudienceBench.fbx.meta b/Assets/Models/SM_AudienceBench.fbx.meta index 3de55de..ccd42b5 100644 --- a/Assets/Models/SM_AudienceBench.fbx.meta +++ b/Assets/Models/SM_AudienceBench.fbx.meta @@ -48,7 +48,7 @@ ModelImporter: nodeNameCollisionStrategy: 1 fileIdsGeneration: 2 swapUVChannels: 0 - generateSecondaryUV: 0 + generateSecondaryUV: 1 useFileUnits: 1 keepQuads: 0 weldVertices: 1 diff --git a/Assets/Models/SM_DestinationCard.fbx b/Assets/Models/SM_DestinationCard.fbx new file mode 100644 index 0000000..b60a76f Binary files /dev/null and b/Assets/Models/SM_DestinationCard.fbx differ diff --git a/Assets/Models/SM_DestinationCard.fbx.meta b/Assets/Models/SM_DestinationCard.fbx.meta new file mode 100644 index 0000000..6a1f705 --- /dev/null +++ b/Assets/Models/SM_DestinationCard.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 85fb9450493e0894191f35f1bc4e8edf +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 1 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/SM_StaticEffect.fbx b/Assets/Models/SM_StaticEffect.fbx new file mode 100644 index 0000000..b3cb057 Binary files /dev/null and b/Assets/Models/SM_StaticEffect.fbx differ diff --git a/Assets/Models/SM_StaticEffect.fbx.meta b/Assets/Models/SM_StaticEffect.fbx.meta new file mode 100644 index 0000000..9bc4047 --- /dev/null +++ b/Assets/Models/SM_StaticEffect.fbx.meta @@ -0,0 +1,109 @@ +fileFormatVersion: 2 +guid: 21f939804f0f9c742b2f0205797b740b +ModelImporter: + serializedVersion: 22200 + internalIDToNameTable: [] + externalObjects: {} + materials: + materialImportMode: 0 + materialName: 0 + materialSearch: 1 + materialLocation: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + resampleCurves: 1 + optimizeGameObjects: 0 + removeConstantScaleCurves: 0 + motionNodeName: + rigImportErrors: + rigImportWarnings: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + importAnimatedCustomProperties: 0 + importConstraints: 0 + animationCompression: 1 + animationRotationError: 0.5 + animationPositionError: 0.5 + animationScaleError: 0.5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + extraUserProperties: [] + clipAnimations: [] + isReadable: 0 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + useSRGBMaterialColor: 1 + sortHierarchyByName: 1 + importPhysicalCameras: 1 + importVisibility: 1 + importBlendShapes: 1 + importCameras: 1 + importLights: 1 + nodeNameCollisionStrategy: 1 + fileIdsGeneration: 2 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + keepQuads: 0 + weldVertices: 1 + bakeAxisConversion: 0 + preserveHierarchy: 0 + skinWeightsMode: 0 + maxBonesPerVertex: 4 + minBoneWeight: 0.001 + optimizeBones: 1 + meshOptimizationFlags: -1 + indexFormat: 0 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVMarginMethod: 1 + secondaryUVMinLightmapResolution: 40 + secondaryUVMinObjectScale: 1 + secondaryUVPackMargin: 4 + useFileScale: 1 + strictVertexDataChecks: 0 + tangentSpace: + normalSmoothAngle: 60 + normalImportMode: 0 + tangentImportMode: 3 + normalCalculationMode: 4 + legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 + blendShapeNormalImportMode: 1 + normalSmoothingSource: 0 + referencedClips: [] + importAnimation: 0 + humanDescription: + serializedVersion: 3 + human: [] + skeleton: [] + armTwist: 0.5 + foreArmTwist: 0.5 + upperLegTwist: 0.5 + legTwist: 0.5 + armStretch: 0.05 + legStretch: 0.05 + feetSpacing: 0 + globalScale: 1 + rootMotionBoneName: + hasTranslationDoF: 0 + hasExtraRoot: 0 + skeletonHasParents: 1 + lastHumanDescriptionAvatarSource: {instanceID: 0} + autoGenerateAvatarMappingIfUnspecified: 1 + animationType: 0 + humanoidOversampling: 1 + avatarSetup: 0 + addHumanoidExtraRootOnlyWhenUsingAvatar: 1 + importBlendShapeDeformPercent: 1 + remapMaterialsIfMaterialImportModeIsNone: 0 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Arrival Display.prefab b/Assets/Prefabs/Arrival Display.prefab new file mode 100644 index 0000000..9c2f659 --- /dev/null +++ b/Assets/Prefabs/Arrival Display.prefab @@ -0,0 +1,337 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &963772615436927068 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4855767781649723641} + - component: {fileID: 322415831587147598} + - component: {fileID: 5599998666058814250} + m_Layer: 0 + m_Name: Arrival Display + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4855767781649723641 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963772615436927068} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 648767085292326919} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &322415831587147598 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963772615436927068} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9f77acae58a8be34380b96b47188d4eb, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 5599998666058814250} + _Display: {fileID: 8703330570973995998} +--- !u!114 &5599998666058814250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 963772615436927068} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 2 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: 95115165b180e8a4581dd4e0c769cf69, + type: 2} + programSource: {fileID: 11400000, guid: 4264a4018f41f2f48b9c813acc5aafa5, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1 &9068073662169853293 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7676618605733070073} + - component: {fileID: 3575829574452964246} + - component: {fileID: 5053525303828764236} + - component: {fileID: 8703330570973995998} + m_Layer: 0 + m_Name: Text Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7676618605733070073 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068073662169853293} + m_LocalRotation: {x: -0, y: 1, z: -0, w: 0} + m_LocalPosition: {x: 0, y: 0, z: 0.0022} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 648767085292326919} + 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: 0} + m_SizeDelta: {x: 2030, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &3575829574452964246 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068073662169853293} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 2 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!222 &5053525303828764236 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068073662169853293} + m_CullTransparentMesh: 1 +--- !u!114 &8703330570973995998 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9068073662169853293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: DESTINATION + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 9672859a94551274b9079efbf9adc4a9, type: 2} + m_sharedMaterial: {fileID: -1369706839575089024, guid: 9672859a94551274b9079efbf9adc4a9, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 183.8 + m_fontSizeBase: 200 + m_fontWeight: 400 + m_enableAutoSizing: 1 + m_fontSizeMin: 120 + m_fontSizeMax: 200 + m_fontStyle: 16 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 0 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &1047750225737676780 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 4855767781649723641} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalRotation.w + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalRotation.y + value: -1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 180 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 68d52ca36879f8942ab6e0fb16fe541d, type: 2} + - target: {fileID: -7511558181221131132, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - target: {fileID: 919132149155446097, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_Name + value: SM_DestinationCard + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + propertyPath: m_StaticEditorFlags + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7676618605733070073} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 85fb9450493e0894191f35f1bc4e8edf, type: 3} +--- !u!4 &648767085292326919 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 85fb9450493e0894191f35f1bc4e8edf, + type: 3} + m_PrefabInstance: {fileID: 1047750225737676780} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Arrival Display.prefab.meta b/Assets/Prefabs/Arrival Display.prefab.meta new file mode 100644 index 0000000..87b8fb5 --- /dev/null +++ b/Assets/Prefabs/Arrival Display.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d31a80d8d627ccf4dbe74f28d7061f7c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Modem Mesh Placeholder.prefab b/Assets/Prefabs/Modem Mesh Placeholder.prefab new file mode 100644 index 0000000..8726299 --- /dev/null +++ b/Assets/Prefabs/Modem Mesh Placeholder.prefab @@ -0,0 +1,499 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1452834383077282873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6076374122099362384} + - component: {fileID: 3955029494541919975} + - component: {fileID: 3041776563378948599} + m_Layer: 0 + m_Name: Cylinder (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6076374122099362384 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1452834383077282873} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 1.025, y: 1.25, z: 0} + m_LocalScale: {x: 0.05, y: 1.25, z: 0.05} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4638847030410775792} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3955029494541919975 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1452834383077282873} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3041776563378948599 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1452834383077282873} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &1976347368307821518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4096001041305542417} + - component: {fileID: 3031784556982299402} + - component: {fileID: 6158782860952282312} + m_Layer: 0 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4096001041305542417 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1976347368307821518} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 2.55, z: 0} + m_LocalScale: {x: 2.15, y: 0.1, z: 0.1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4638847030410775792} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3031784556982299402 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1976347368307821518} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6158782860952282312 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1976347368307821518} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &3092946832027331603 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3177169942437277169} + - component: {fileID: 3490082525318523426} + - component: {fileID: 2084866617575026933} + - component: {fileID: 5106543036713554855} + m_Layer: 0 + m_Name: Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3177169942437277169 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092946832027331603} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0.02, z: 0} + m_LocalScale: {x: 2, y: 0.02, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4638847030410775792} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3490082525318523426 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092946832027331603} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2084866617575026933 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092946832027331603} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5106543036713554855 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3092946832027331603} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &3760572785895755641 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2415289426493239577} + - component: {fileID: 8254883638233046849} + - component: {fileID: 4662361274817860566} + m_Layer: 0 + m_Name: Cylinder (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2415289426493239577 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3760572785895755641} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -1.025, y: 1.25, z: 0} + m_LocalScale: {x: 0.05, y: 1.25, z: 0.05} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4638847030410775792} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8254883638233046849 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3760572785895755641} + m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &4662361274817860566 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3760572785895755641} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!1 &7017984266545697803 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4875262171677288743} + - component: {fileID: 7286656832623552564} + - component: {fileID: 2759532894583255723} + - component: {fileID: 6018044962451068758} + m_Layer: 0 + m_Name: Plane + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4875262171677288743 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7017984266545697803} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0.38268322, z: -0, w: 0.9238797} + m_LocalPosition: {x: 0, y: 0.0025, z: 0.921} + m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 4638847030410775792} + m_LocalEulerAnglesHint: {x: 0, y: -45, z: 0} +--- !u!33 &7286656832623552564 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7017984266545697803} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &2759532894583255723 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7017984266545697803} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &6018044962451068758 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7017984266545697803} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &7769645860595262000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4638847030410775792} + m_Layer: 0 + m_Name: Modem Mesh Placeholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4638847030410775792 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7769645860595262000} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3177169942437277169} + - {fileID: 4875262171677288743} + - {fileID: 6076374122099362384} + - {fileID: 2415289426493239577} + - {fileID: 4096001041305542417} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/Modem Mesh Placeholder.prefab.meta b/Assets/Prefabs/Modem Mesh Placeholder.prefab.meta new file mode 100644 index 0000000..eac2b4d --- /dev/null +++ b/Assets/Prefabs/Modem Mesh Placeholder.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a0451c4a9ed345b4b8372def176b1b38 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Modem.prefab b/Assets/Prefabs/Modem.prefab new file mode 100644 index 0000000..7ee802f --- /dev/null +++ b/Assets/Prefabs/Modem.prefab @@ -0,0 +1,304 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2802413248237860970 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6538633228974114170} + - component: {fileID: 2498145779706936842} + - component: {fileID: 4718414904658311444} + - component: {fileID: 8446014020603136524} + - component: {fileID: 932720169245821887} + m_Layer: 0 + m_Name: Modem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6538633228974114170 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2802413248237860970} + serializedVersion: 2 + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 3200115956421457733} + - {fileID: 5664439777900644494} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &2498145779706936842 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2802413248237860970} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 6f0d56fed95fa3f4b935cf7beb8172ed, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!135 &4718414904658311444 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2802413248237860970} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!114 &8446014020603136524 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2802413248237860970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad9717a7d77e8e34bae7a424794f8bf1, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 932720169245821887} + _ModemDestination: {fileID: 0} + _AudioManager: {fileID: 0} +--- !u!114 &932720169245821887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2802413248237860970} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 45115577ef41a5b4ca741ed302693907, type: 3} + m_Name: + m_EditorClassIdentifier: + interactTextPlacement: {fileID: 0} + interactText: Use + interactTextGO: {fileID: 0} + proximity: 0.1 + SynchronizePosition: 0 + AllowCollisionOwnershipTransfer: 0 + Reliable: 0 + _syncMethod: 3 + serializedProgramAsset: {fileID: 11400000, guid: e356a03a21c162c4c97b99f8edcd67a6, + type: 2} + programSource: {fileID: 11400000, guid: d4456ead048bf24448ff90d3a49a7914, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1001 &5266564533062807397 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6538633228974114170} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalScale.x + value: 1.35 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalScale.y + value: 1.35 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalPosition.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalPosition.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 483ceb65615010745bde1d5ff9fd9dd6, type: 2} + - target: {fileID: 919132149155446097, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_Name + value: SM_StaticEffect + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 21f939804f0f9c742b2f0205797b740b, type: 3} +--- !u!4 &5664439777900644494 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 21f939804f0f9c742b2f0205797b740b, + type: 3} + m_PrefabInstance: {fileID: 5266564533062807397} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7784865898926308277 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 6538633228974114170} + m_Modifications: + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7769645860595262000, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + propertyPath: m_Name + value: Mesh Placeholder + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a0451c4a9ed345b4b8372def176b1b38, type: 3} +--- !u!4 &3200115956421457733 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4638847030410775792, guid: a0451c4a9ed345b4b8372def176b1b38, + type: 3} + m_PrefabInstance: {fileID: 7784865898926308277} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Modem.prefab.meta b/Assets/Prefabs/Modem.prefab.meta new file mode 100644 index 0000000..998a4a6 --- /dev/null +++ b/Assets/Prefabs/Modem.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 597de72e4385c0d498ba1475ac5ef4f7 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 20c3be8..2de1e57 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -7296,6 +7296,11 @@ PrefabInstance: value: objectReference: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 2291351857899888675, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2551822603199673179, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -10268,7 +10273,6 @@ MonoBehaviour: - {fileID: 4438766482650780795} - {fileID: 1993364535} - {fileID: 1589630268} - _ModemArrivalsTeleportLocation: {fileID: 0} --- !u!1 &272680940 stripped GameObject: m_CorrespondingSourceObject: {fileID: 6494273791062881839, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -17833,6 +17837,8 @@ MonoBehaviour: - {fileID: 1589630268} _VideoMusicClueSkateboard: {fileID: 4337638711874237563} _ACMECrimenetComputer: {fileID: 5448599223445625653} + _Modem: {fileID: 966631266} + _ArrivalDisplay: {fileID: 2013644315} _LightningRoundAnimator: {fileID: 806909628} --- !u!4 &515404447 Transform: @@ -22634,6 +22640,187 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1001 &709364349 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1451322102} + m_Modifications: + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _Target + value: + objectReference: {fileID: 0} + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _EventName + value: BeginTeleport + objectReference: {fileID: 0} + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _AudioManager + value: + objectReference: {fileID: 1947493795} + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemDestination + value: + objectReference: {fileID: 0} + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _AudioManager + value: + objectReference: {fileID: 1947493795} + - target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemDestination + value: + objectReference: {fileID: 0} + - target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 2117848154642380455, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2117848154642380455, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 2430288056194041593, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2802413248237860970, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_Name + value: Modem Destination + objectReference: {fileID: 0} + - target: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _Target + value: + objectReference: {fileID: 0} + - target: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _EventName + value: BeginTeleport + objectReference: {fileID: 0} + - target: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalPosition.x + value: -5.528002 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalPosition.z + value: 11.184003 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.38268328 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.92387956 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _AudioManager + value: + objectReference: {fileID: 1947493795} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemAnimator + value: + objectReference: {fileID: 1034723246} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemDestination + value: + objectReference: {fileID: 966631266} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemDestinationAnimator + value: + objectReference: {fileID: 966631269} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} +--- !u!114 &709364350 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + m_PrefabInstance: {fileID: 709364349} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1034723243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad9717a7d77e8e34bae7a424794f8bf1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &709364351 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + m_PrefabInstance: {fileID: 709364349} + m_PrefabAsset: {fileID: 0} --- !u!1 &709881665 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7426185837637875945, guid: e9914385266bca24db809c39e395f03c, @@ -26810,6 +26997,8 @@ MonoBehaviour: _HostCard: {fileID: 379391087} _AudioManager: {fileID: 1947493795} _CaseManager: {fileID: 841163054} + _Modem: {fileID: 966631266} + _ArrivalDisplay: {fileID: 2013644315} _LocationBoard: {fileID: 1748199014} --- !u!1 &866157750 stripped GameObject: @@ -27868,6 +28057,11 @@ PrefabInstance: value: objectReference: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 2291351857899888675, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2551822603199673179, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -28704,6 +28898,36 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1042026143} m_PrefabAsset: {fileID: 0} +--- !u!1 &966631264 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2802413248237860970, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + m_PrefabInstance: {fileID: 2041044807715436007} + m_PrefabAsset: {fileID: 0} +--- !u!4 &966631265 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + m_PrefabInstance: {fileID: 2041044807715436007} + m_PrefabAsset: {fileID: 0} +--- !u!114 &966631266 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + m_PrefabInstance: {fileID: 2041044807715436007} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 966631264} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ad9717a7d77e8e34bae7a424794f8bf1, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!95 &966631269 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 2498145779706936842, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + m_PrefabInstance: {fileID: 2041044807715436007} + m_PrefabAsset: {fileID: 0} --- !u!1 &966877577 stripped GameObject: m_CorrespondingSourceObject: {fileID: 8047230221287743207, guid: be33bc7f6c414e6409becfa348b9310d, @@ -30835,6 +31059,18 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1499591484} m_PrefabAsset: {fileID: 0} +--- !u!1 &1034723243 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 2802413248237860970, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + m_PrefabInstance: {fileID: 709364349} + m_PrefabAsset: {fileID: 0} +--- !u!95 &1034723246 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 2498145779706936842, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + m_PrefabInstance: {fileID: 709364349} + m_PrefabAsset: {fileID: 0} --- !u!1 &1035293950 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2691736278549684112, guid: e9914385266bca24db809c39e395f03c, @@ -42958,6 +43194,8 @@ Transform: - {fileID: 1331320733} - {fileID: 1583513123} - {fileID: 1449300098} + - {fileID: 709364351} + - {fileID: 2013644313} m_Father: {fileID: 1027471609} m_LocalEulerAnglesHint: {x: 0, y: -70, z: 0} --- !u!1 &1451902667 @@ -63278,6 +63516,30 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 134225857} m_PrefabAsset: {fileID: 0} +--- !u!1 &2013644312 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 963772615436927068, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + m_PrefabInstance: {fileID: 5579306912878172725} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2013644313 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + m_PrefabInstance: {fileID: 5579306912878172725} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2013644315 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 322415831587147598, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + m_PrefabInstance: {fileID: 5579306912878172725} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2013644312} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9f77acae58a8be34380b96b47188d4eb, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2017000455 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5340716136492000581, guid: 126991d511ca61841a0ef899b6c038a6, @@ -66052,6 +66314,7 @@ Transform: - {fileID: 1628790464} - {fileID: 5448599223445625651} - {fileID: 4337638711874237561} + - {fileID: 966631265} m_Father: {fileID: 1027471609} m_LocalEulerAnglesHint: {x: 0, y: 55, z: 0} --- !u!1 &2111816882 @@ -67759,6 +68022,174 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fa9de454fe013ac4e9fabd14308a4623, type: 3} +--- !u!1001 &2041044807715436007 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2110808113} + m_Modifications: + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _Target + value: + objectReference: {fileID: 0} + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _EventName + value: BeginTeleport + objectReference: {fileID: 0} + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _AudioManager + value: + objectReference: {fileID: 1947493795} + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemDestination + value: + objectReference: {fileID: 0} + - target: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 211682729891007865, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _AudioManager + value: + objectReference: {fileID: 1947493795} + - target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemDestination + value: + objectReference: {fileID: 0} + - target: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 1358204241583554791, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 2117848154642380455, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 2117848154642380455, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 2430288056194041593, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2802413248237860970, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_Name + value: Modem + objectReference: {fileID: 0} + - target: {fileID: 2802413248237860970, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _Target + value: + objectReference: {fileID: 0} + - target: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _EventName + value: BeginTeleport + objectReference: {fileID: 0} + - target: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 4265969037790604469, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalPosition.x + value: 10.03 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalPosition.z + value: -5.03 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.643522 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.7654277 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -99.89 + objectReference: {fileID: 0} + - target: {fileID: 6538633228974114170, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _AudioManager + value: + objectReference: {fileID: 1947493795} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemAnimator + value: + objectReference: {fileID: 966631269} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemDestination + value: + objectReference: {fileID: 709364350} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + - target: {fileID: 8446014020603136524, guid: 597de72e4385c0d498ba1475ac5ef4f7, + type: 3} + propertyPath: _ModemDestinationAnimator + value: + objectReference: {fileID: 1034723246} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 597de72e4385c0d498ba1475ac5ef4f7, type: 3} --- !u!224 &2324181848945583116 RectTransform: m_ObjectHideFlags: 0 @@ -70131,6 +70562,11 @@ PrefabInstance: value: objectReference: {fileID: 1845304264493794344, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} + - target: {fileID: 2291351857899888675, guid: 79ebe62246f7f464e98373cb14765f9a, + type: 3} + propertyPath: _syncMethod + value: 2 + objectReference: {fileID: 0} - target: {fileID: 2551822603199673179, guid: 79ebe62246f7f464e98373cb14765f9a, type: 3} propertyPath: serializationData.Prefab @@ -71656,6 +72092,90 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: e09f76786b294ec48b10d7991da943ea, type: 3} +--- !u!1001 &5579306912878172725 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1451322102} + m_Modifications: + - target: {fileID: 322415831587147598, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 322415831587147598, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + - target: {fileID: 963772615436927068, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_Name + value: Arrival Display + objectReference: {fileID: 0} + - target: {fileID: 963772615436927068, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3575829574452964246, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_Camera + value: + objectReference: {fileID: 1069902876} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalPosition.x + value: -6.4103007 + objectReference: {fileID: 0} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.5 + objectReference: {fileID: 0} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalPosition.z + value: 12.066307 + objectReference: {fileID: 0} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalRotation.w + value: -0.9238796 + objectReference: {fileID: 0} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.38268334 + objectReference: {fileID: 0} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 180 + objectReference: {fileID: 0} + - target: {fileID: 4855767781649723641, guid: d31a80d8d627ccf4dbe74f28d7061f7c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d31a80d8d627ccf4dbe74f28d7061f7c, type: 3} --- !u!222 &5714562178898250063 CanvasRenderer: m_ObjectHideFlags: 0 @@ -72203,37 +72723,39 @@ MonoBehaviour: useAssignedLayers: 0 DynamicPrefabs: [] DynamicMaterials: - - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} + - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} + - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} + - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - {fileID: 2100000, guid: 348ff3cc54305654d9eeebbbb385c262, type: 2} + - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} + - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} + - {fileID: 2100000, guid: cac39def7281c5c488b6a3465ec1951b, type: 2} + - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} + - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} + - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} + - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} + - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} + - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} + - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} + - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} + - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} + - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 8ded9a8136c72af4f901e652f138f9b6, type: 2} - {fileID: 2100000, guid: 81ea0ec5ed826d74fb516bcd6d26bf99, type: 2} - {fileID: 2100000, guid: e3bf0e4e3864c2149b48a821a799c6f4, type: 2} - {fileID: 2100000, guid: bc5888e576e9cb34bab7b7af42d2b63f, type: 2} - {fileID: 2100000, guid: 68c7d547c0d7542429e36f9a891362ec, type: 2} - - {fileID: 2100000, guid: 672c36f6dbb36b5439cc0fdd2f74c531, type: 2} - {fileID: 2100000, guid: c5d2a6b0c3904c747b937dd142cbb480, type: 2} - - {fileID: 2100000, guid: 82f2961c9baa48a45ac897be257fd655, type: 2} - - {fileID: 2100000, guid: 2c0cd617d97924748a9d5e2eeb2039b5, type: 2} - - {fileID: 2100000, guid: a793cd1d5fe89c440900d816c7b8c323, type: 2} - - {fileID: 2100000, guid: e45d02bbf7268504ca58513c548a58e7, type: 2} - - {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} - - {fileID: 2100000, guid: 0c3dfdcd7a2a6ac408ec3d431f9a4932, type: 2} - - {fileID: 2100000, guid: c1b531b2f1a7dab43b46daa7546cfda7, type: 2} - - {fileID: 2100000, guid: 4fb0b8cdca56f5d47be970c7490cb7a1, type: 2} - - {fileID: 2100000, guid: 9cdc0250a4c9b534fae68ae6aa90bf31, type: 2} - - {fileID: 2100000, guid: d1244b908a4cccd4397cc9cad45fe846, type: 2} - - {fileID: 2100000, guid: 80746b095abb6ce41a1c737df3649172, type: 2} - {fileID: 2100000, guid: 71fff76911e92ab43a71d15602da4c4b, type: 2} - - {fileID: 2100000, guid: 35c2a316ece610b4b963e047e5238337, type: 2} - - {fileID: 2100000, guid: 332daba92d0976f4d86bdcdc1a94179e, type: 2} - - {fileID: 2100000, guid: 885429151ec5f6a4a926f6aaabd7e001, type: 2} - - {fileID: 2100000, guid: c3186340e03d26341969d34663dbf8f3, type: 2} - {fileID: 2100000, guid: af0c1cbaaffed304ba0e3a1fbac41e7e, type: 2} - {fileID: 2100000, guid: cc22c7f9de95cab4488b30fe8699a82a, type: 2} - {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + - {fileID: 2100000, guid: 4c14b2f4b9a613f418bb1e6cf8cf68f4, type: 2} + - {fileID: 2100000, guid: cf2685410a4f72447a34ea1791a70a1c, type: 2} - {fileID: 2100000, guid: 6dd6b8b1c8133f04dbc23ac81f5dfded, type: 2} - {fileID: 2100000, guid: 98166ed003d332e488319f662c3b4429, type: 2} - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} LightMapsNear: [] LightMapsFar: [] LightMode: 0 @@ -76723,6 +77245,18 @@ MonoBehaviour: ID: 1086 SerializedTypeNames: - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 966631264} + ID: 1087 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 2013644312} + ID: 1088 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour + - gameObject: {fileID: 1034723243} + ID: 1089 + SerializedTypeNames: + - VRC.Udon.UdonBehaviour portraitCameraPositionOffset: {x: 0, y: 0, z: 0} portraitCameraRotationOffset: {x: 0, y: 1, z: 0, w: -0.00000004371139} PlayerPersistence: [] diff --git a/Assets/Scenes/witwics/LightingData.asset b/Assets/Scenes/witwics/LightingData.asset index 694a13f..05bcc8e 100644 Binary files a/Assets/Scenes/witwics/LightingData.asset and b/Assets/Scenes/witwics/LightingData.asset differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png index 927c3c9..f183e28 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png and b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index 256ffc3..40deab7 100644 Binary files a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr differ diff --git a/Assets/Scenes/witwics/Lightmap-1_comp_dir.png b/Assets/Scenes/witwics/Lightmap-1_comp_dir.png index a2a0d40..12878a6 100644 Binary files a/Assets/Scenes/witwics/Lightmap-1_comp_dir.png and b/Assets/Scenes/witwics/Lightmap-1_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-1_comp_light.exr b/Assets/Scenes/witwics/Lightmap-1_comp_light.exr index 6450317..9de5fbe 100644 Binary files a/Assets/Scenes/witwics/Lightmap-1_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-1_comp_light.exr differ diff --git a/Assets/Scenes/witwics/Lightmap-2_comp_dir.png b/Assets/Scenes/witwics/Lightmap-2_comp_dir.png index a306a02..78a5e27 100644 Binary files a/Assets/Scenes/witwics/Lightmap-2_comp_dir.png and b/Assets/Scenes/witwics/Lightmap-2_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-2_comp_light.exr b/Assets/Scenes/witwics/Lightmap-2_comp_light.exr index 1f7d381..59397c4 100644 Binary files a/Assets/Scenes/witwics/Lightmap-2_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-2_comp_light.exr differ diff --git a/Assets/Scenes/witwics/Lightmap-3_comp_dir.png b/Assets/Scenes/witwics/Lightmap-3_comp_dir.png index 0ad2637..e46fc08 100644 Binary files a/Assets/Scenes/witwics/Lightmap-3_comp_dir.png and b/Assets/Scenes/witwics/Lightmap-3_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-3_comp_light.exr b/Assets/Scenes/witwics/Lightmap-3_comp_light.exr index d8df1ce..808c323 100644 Binary files a/Assets/Scenes/witwics/Lightmap-3_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-3_comp_light.exr differ diff --git a/Assets/Scenes/witwics/Lightmap-4_comp_dir.png b/Assets/Scenes/witwics/Lightmap-4_comp_dir.png index 05c6bc2..8ecbe46 100644 Binary files a/Assets/Scenes/witwics/Lightmap-4_comp_dir.png and b/Assets/Scenes/witwics/Lightmap-4_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-4_comp_light.exr b/Assets/Scenes/witwics/Lightmap-4_comp_light.exr index e7e180a..80ac603 100644 Binary files a/Assets/Scenes/witwics/Lightmap-4_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-4_comp_light.exr differ diff --git a/Assets/Scenes/witwics/Lightmap-5_comp_dir.png b/Assets/Scenes/witwics/Lightmap-5_comp_dir.png index dcfa290..c2b2478 100644 Binary files a/Assets/Scenes/witwics/Lightmap-5_comp_dir.png and b/Assets/Scenes/witwics/Lightmap-5_comp_dir.png differ diff --git a/Assets/Scenes/witwics/Lightmap-5_comp_light.exr b/Assets/Scenes/witwics/Lightmap-5_comp_light.exr index 4f15bb9..9887787 100644 Binary files a/Assets/Scenes/witwics/Lightmap-5_comp_light.exr and b/Assets/Scenes/witwics/Lightmap-5_comp_light.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index 6995297..30f5f89 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-0.exr and b/Assets/Scenes/witwics/ReflectionProbe-0.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-1.exr b/Assets/Scenes/witwics/ReflectionProbe-1.exr index 6c3058e..920006e 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-1.exr and b/Assets/Scenes/witwics/ReflectionProbe-1.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index 137fcb2..20eceed 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-2.exr and b/Assets/Scenes/witwics/ReflectionProbe-2.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-3.exr b/Assets/Scenes/witwics/ReflectionProbe-3.exr index 242f449..4016345 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Shaders/ScreenUV.shader b/Assets/Shaders/ScreenUV.shader new file mode 100644 index 0000000..c31405c --- /dev/null +++ b/Assets/Shaders/ScreenUV.shader @@ -0,0 +1,60 @@ +Shader "Custom/ScreenNoise" +{ + Properties + { + _MainTex ("Image", 2D) = "white" {} + + _Colour1 ("Colour 1", Color) = (0.0, 0.0, 0.0, 1.0) + _Colour2 ("Colour 2", Color) = (1.0, 1.0, 1.0, 1.0) + } + SubShader + { + Tags { "RenderType"="Opaque" } + LOD 200 + + Pass { + Cull Off + + CGPROGRAM + #include "UnityCG.cginc" + #pragma vertex vert + #pragma fragment frag + + sampler2D _MainTex; + + CBUFFER_START(UnityPerMaterial) + uniform float4 _Colour1; + uniform float4 _Colour2; + CBUFFER_END + + struct Data + { + float4 vertex : POSITION; + float2 uv : TEXCOORD0; + }; + + struct V2F + { + float4 position : SV_POSITION; + float4 screenPosition : TEXCOORD0; + }; + + V2F vert(Data v) + { + V2F o; + o.position = UnityObjectToClipPos(v.vertex); + o.screenPosition = ComputeScreenPos(o.position); + return o; + } + + fixed4 frag(V2F i) : SV_TARGET + { + float2 textureCoordinate = (i.screenPosition.xy / i.screenPosition.w) + (_Time * 512); + float staticImage = tex2D(_MainTex, textureCoordinate).r; + return lerp(_Colour1, _Colour2, staticImage); + } + ENDCG + } + } + FallBack "Diffuse" +} diff --git a/Assets/Shaders/ScreenUV.shader.meta b/Assets/Shaders/ScreenUV.shader.meta new file mode 100644 index 0000000..f2d124d --- /dev/null +++ b/Assets/Shaders/ScreenUV.shader.meta @@ -0,0 +1,9 @@ +fileFormatVersion: 2 +guid: 06b4f64398d53f54c95a54946dd15cf0 +ShaderImporter: + externalObjects: {} + defaultTextures: [] + nonModifiableTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/T_SimplexNoise.png b/Assets/Textures/T_SimplexNoise.png new file mode 100644 index 0000000..3072289 Binary files /dev/null and b/Assets/Textures/T_SimplexNoise.png differ diff --git a/Assets/Textures/T_SimplexNoise.png.meta b/Assets/Textures/T_SimplexNoise.png.meta new file mode 100644 index 0000000..57df952 --- /dev/null +++ b/Assets/Textures/T_SimplexNoise.png.meta @@ -0,0 +1,140 @@ +fileFormatVersion: 2 +guid: cb072d3765e9cf443b3c71b63f2c4b9c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 0 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 0 + wrapV: 0 + wrapW: 0 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 10 + textureShape: 1 + singleChannelComponent: 1 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 3 + compressionQuality: 25 + crunchedCompression: 1 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 512 + resizeAlgorithm: 0 + textureFormat: 50 + textureCompression: 1 + compressionQuality: 0 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 1 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/ArrivalDisplay.asset b/Assets/UdonSharp/ArrivalDisplay.asset new file mode 100644 index 0000000..a81d378 --- /dev/null +++ b/Assets/UdonSharp/ArrivalDisplay.asset @@ -0,0 +1,113 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: ArrivalDisplay + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 95115165b180e8a4581dd4e0c769cf69, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 9f77acae58a8be34380b96b47188d4eb, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: 6513297454512952404 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Display + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Display + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: TMPro.TextMeshProUGUI, Unity.TextMeshPro + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 3 + - 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: 4|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 5|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: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/ArrivalDisplay.asset.meta b/Assets/UdonSharp/ArrivalDisplay.asset.meta new file mode 100644 index 0000000..a85fb0e --- /dev/null +++ b/Assets/UdonSharp/ArrivalDisplay.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4264a4018f41f2f48b9c813acc5aafa5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/ArrivalDisplay.cs b/Assets/UdonSharp/ArrivalDisplay.cs new file mode 100644 index 0000000..44072c6 --- /dev/null +++ b/Assets/UdonSharp/ArrivalDisplay.cs @@ -0,0 +1,18 @@ + +using TMPro; +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class ArrivalDisplay : UdonSharpBehaviour +{ + [SerializeField] private TextMeshProUGUI _Display; + + public void SetDisplay(string Text) + { + _Display.text = Text; + } +} diff --git a/Assets/UdonSharp/ArrivalDisplay.cs.meta b/Assets/UdonSharp/ArrivalDisplay.cs.meta new file mode 100644 index 0000000..a032db4 --- /dev/null +++ b/Assets/UdonSharp/ArrivalDisplay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 9f77acae58a8be34380b96b47188d4eb +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index da41adc..f59ca84 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -75,15 +75,19 @@ public class CaseManager : UdonSharpBehaviour { _CaseFileDictionary = JSONResult.DataDictionary; - if (_CaseFileDictionary.ContainsKey("Case Title") && _CaseFileDictionary.ContainsKey("Case Description") && _CaseFileDictionary.ContainsKey("Intro Video Transcript") && + if (_CaseFileDictionary.ContainsKey("Case Title") && _CaseFileDictionary.ContainsKey("Case Description") && _CaseFileDictionary.ContainsKey("Stolen Loot") && _CaseFileDictionary.ContainsKey("Accused Crook")) { _CaseTitle = _CaseFileDictionary["Case Title"].String; _CaseDescription = _CaseFileDictionary["Case Description"].String; - _CaseIntroVideoTranscript = _CaseFileDictionary["Intro Video Transcript"].String; _StolenLoot = _CaseFileDictionary["Stolen Loot"].String; _AccusedCrook = (AccusedCrook)(int)_CaseFileDictionary["Accused Crook"].Number; + if (_CaseFileDictionary.ContainsKey("Intro Video Transcript")) + { + _CaseIntroVideoTranscript = _CaseFileDictionary["Intro Video Transcript"].String; + } + if (_CaseFileDictionary.ContainsKey("Round 1") && _CaseFileDictionary.ContainsKey("Round 2") && _CaseFileDictionary.ContainsKey("Round 3")) { // Attempt to load Round 1 data diff --git a/Assets/UdonSharp/Game Managers/GameManagerBase.cs b/Assets/UdonSharp/Game Managers/GameManagerBase.cs index 11b65bc..3377703 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerBase.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerBase.cs @@ -23,6 +23,7 @@ public enum RoundSegmentType TheChase, FinalRound, Tiebreaker, + EndGame, RecoverTheLootExplainer, RecoverTheLoot, diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index 309fdd6..a6f9be9 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 23 + Data: 25 - Name: Entry: 7 Data: @@ -1178,10 +1178,19 @@ MonoBehaviour: Data: 72|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 73|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 73|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 74|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1205,13 +1214,13 @@ MonoBehaviour: Data: _VideoMusicClueSkateboard - Name: $v Entry: 7 - Data: 74|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 75|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoMusicClueSkateboard - Name: k__BackingField Entry: 7 - Data: 75|System.RuntimeType, mscorlib + Data: 76|System.RuntimeType, mscorlib - Name: Entry: 1 Data: VideoMusicClueSkateboard, Assembly-CSharp @@ -1235,13 +1244,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 76|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 77|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 77|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 78|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1250,7 +1259,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 78|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 79|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Props @@ -1259,7 +1268,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 79|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 80|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1283,13 +1292,13 @@ MonoBehaviour: Data: _ACMECrimenetComputer - Name: $v Entry: 7 - Data: 80|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 81|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _ACMECrimenetComputer - Name: k__BackingField Entry: 7 - Data: 81|System.RuntimeType, mscorlib + Data: 82|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ACMECrimenetComputer, Assembly-CSharp @@ -1313,13 +1322,133 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 82|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 83|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 83|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 84|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: _Modem + - Name: $v + Entry: 7 + Data: 85|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Modem + - Name: k__BackingField + Entry: 7 + Data: 86|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Modem, 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: 87|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 88|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: _ArrivalDisplay + - Name: $v + Entry: 7 + Data: 89|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ArrivalDisplay + - Name: k__BackingField + Entry: 7 + Data: 90|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: ArrivalDisplay, 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: 91|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 92|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -1343,13 +1472,13 @@ MonoBehaviour: Data: _LightningRoundAnimator - Name: $v Entry: 7 - Data: 84|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 93|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _LightningRoundAnimator - Name: k__BackingField Entry: 7 - Data: 85|System.RuntimeType, mscorlib + Data: 94|System.RuntimeType, mscorlib - Name: Entry: 1 Data: UnityEngine.Animator, UnityEngine.AnimationModule @@ -1358,7 +1487,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 85 + Data: 94 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1373,13 +1502,13 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 86|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 95|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 87|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 96|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -1388,7 +1517,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 88|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 97|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects @@ -1397,7 +1526,7 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 89|UnityEngine.SerializeField, UnityEngine.CoreModule + Data: 98|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index 31a8b2b..6aec768 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -41,11 +41,15 @@ public class GameManagerRound1 : GameManagerBase [UdonSynced] private int[] _FinalRoundPlayersSortedByScore; [UdonSynced] private int[] _TiebreakerPlayerNumbers; + [Space] + [SerializeField] private PlayerPodium[] _PlayerPodiums; [Space, Header("Props")] [SerializeField] private VideoMusicClueSkateboard _VideoMusicClueSkateboard; [SerializeField] private ACMECrimenetComputer _ACMECrimenetComputer; + [SerializeField] private Modem _Modem; + [SerializeField] private ArrivalDisplay _ArrivalDisplay; [Space, Header("Effects")] [SerializeField] private Animator _LightningRoundAnimator; @@ -59,7 +63,12 @@ public class GameManagerRound1 : GameManagerBase _PlayerBuzzInAllowed = new bool[_PlayerPodiums.Length]; + _Modem.ResetModem(); + _Modem.gameObject.SetActive(false); + _ArrivalDisplay.gameObject.SetActive(false); + _LightningRoundAnimator.SetBool("Lightning", false); + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusic", MusicEventType.WhereInTheWorld); SendCustomEventDelayedSeconds(nameof(PlaySecondPartOfThemeMusic), 3.6666666666f); @@ -1017,12 +1026,12 @@ public class GameManagerRound1 : GameManagerBase { if (SortedPlayerScores[0] == SortedPlayerScores[1]) { - Interface.HeaderUI.text = "We have a three-way tie."; + Interface.HeaderUI.text = "Three-Way Tie."; Interface.CommentUI.text = "We'll start with a tiebreaker between " + Number2.displayName + " and " + Number3.displayName + "."; } else { - Interface.HeaderUI.text = Number1.displayName + " is in first place"; + Interface.HeaderUI.text = Number1.displayName + " Wins"; Interface.CommentUI.text = "- " + Number1.displayName + " will be moving on to the next round.\n" + "- There is a tie for second place between " + Number2.displayName + " and " + Number3.displayName + ", so we will move on to a tiebreaker."; @@ -1046,14 +1055,18 @@ public class GameManagerRound1 : GameManagerBase WinningPlayers[0] = Randomiser[RandomIndex].displayName; WinningPlayers[1] = Randomiser[(RandomIndex + 1) % 2].displayName; - Interface.HeaderUI.text = Number1.displayName + " and " + Number2.displayName + " are tied for first place; both will move on to the next round."; + Interface.HeaderUI.text = "Tie For First"; + Interface.CommentUI.text = + "- " + Number1.displayName + " and " + Number2.displayName + " are tied for first place.\n" + + "- Both will move on to the next round."; } else { WinningPlayers[0] = Number1.displayName; WinningPlayers[1] = Number2.displayName; - Interface.HeaderUI.text = Number1.displayName + " and " + Number2.displayName + " will move on to the next round."; + Interface.HeaderUI.text = "Winners"; + Interface.CommentUI.text = Number1.displayName + " and " + Number2.displayName + " will move on to the next round."; } _CaseManager.SetCurrentWinningPlayers(WinningPlayers); @@ -1116,25 +1129,45 @@ public class GameManagerRound1 : GameManagerBase } else { - HostCardBetweenRoundsInterface Interface = - (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); - Interface.HeaderUI.text = "Round is over."; - Interface.CommentUI.text = "Move to the loot recovery area."; + _QuestionStage = 0; + _CurrentQuestionType = RoundSegmentType.EndGame; - _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, - "PlayMusicLoop", MusicEventType.CapitalLoop); - - for (int i = 0; i < _PlayerPodiums.Length; i++) - { - _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ResetPodium"); - } - - _CaseManager.ContinueToRound2(); - - EnableInteraction("Advance To Round 2"); + EnableInteraction("Play Round End Music"); } } + private void PrepareModem() + { + HostCardBetweenRoundsInterface Interface = + (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); + Interface.HeaderUI.text = "Round is over."; + Interface.CommentUI.text = "Everybody enter the Modem"; + + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, + "PlayMusicLoop", MusicEventType.CapitalLoop); + + _Modem.gameObject.SetActive(true); + _ArrivalDisplay.gameObject.SetActive(true); + + EnableInteraction("Activate Modem"); + } + + private void ActivateModem() + { + _Modem.BeginTeleportProcess(); + SendCustomEventDelayedSeconds(nameof(_ContinueToRound2_Private), 5.0f); + } + public void _ContinueToRound2_Private() + { + for (int i = 0; i < _PlayerPodiums.Length; i++) + { + _PlayerPodiums[i].SendCustomNetworkEvent(NetworkEventTarget.All, "ResetPodium"); + } + + _CaseManager.ContinueToRound2(); + EnableInteraction("Continue To Round 2"); + } + private void BeginTiebreakerRound() { @@ -1424,6 +1457,7 @@ public class GameManagerRound1 : GameManagerBase case RoundSegmentType.TheChase: AdvanceTheChase(); break; case RoundSegmentType.FinalRound: AdvanceFinalRound(); break; case RoundSegmentType.Tiebreaker: AdvanceTiebreaker(); break; + case RoundSegmentType.EndGame: AdvanceEndGame(); break; } RequestSerialization(); @@ -1509,6 +1543,16 @@ public class GameManagerRound1 : GameManagerBase } } + private void AdvanceEndGame() + { + switch (_QuestionStage) + { + case 1: PrepareModem(); break; + case 2: ActivateModem(); break; + default: break; + } + } + public VRCUrl GetMapURL(int MapIndex) { diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset index fd785f6..5ef9367 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.asset +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 13 + Data: 16 - Name: Entry: 7 Data: @@ -290,19 +290,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LocationBoard + Data: _Modem - Name: $v Entry: 7 Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LocationBoard + Data: _Modem - Name: k__BackingField Entry: 7 Data: 19|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: LocationBoard, Assembly-CSharp + Data: Modem, Assembly-CSharp - Name: Entry: 8 Data: @@ -350,37 +350,37 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Landmarks + Data: _ArrivalDisplay - Name: $v Entry: 7 Data: 22|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Landmarks + Data: _ArrivalDisplay - Name: k__BackingField Entry: 7 Data: 23|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.String[], mscorlib + Data: ArrivalDisplay, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 24|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -389,7 +389,7 @@ MonoBehaviour: Data: 1 - Name: Entry: 7 - Data: 25|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 25|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -410,37 +410,37 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _StageIndex + Data: _LocationBoard - Name: $v Entry: 7 Data: 26|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _StageIndex + Data: _LocationBoard - Name: k__BackingField Entry: 7 Data: 27|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: System.Int32, mscorlib + Data: LocationBoard, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 3 - Data: 1 + Entry: 6 + Data: - Name: Entry: 8 Data: - Name: k__BackingField Entry: 5 - Data: false + Data: true - Name: _fieldAttributes Entry: 7 Data: 28|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib @@ -449,7 +449,7 @@ MonoBehaviour: Data: 1 - Name: Entry: 7 - Data: 29|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 29|UnityEngine.SerializeField, UnityEngine.CoreModule - Name: Entry: 8 Data: @@ -470,19 +470,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CurrentPlayerCounter + Data: _Location - Name: $v Entry: 7 Data: 30|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CurrentPlayerCounter + Data: _Location - Name: k__BackingField - Entry: 9 - Data: 27 + Entry: 7 + Data: 31|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 27 + Data: 31 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -497,13 +503,19 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 31|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 32|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 1 + Data: 2 - Name: Entry: 7 - Data: 32|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 33|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 34|UdonSharp.FieldChangeCallbackAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -524,19 +536,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Players + Data: _Landmarks - Name: $v Entry: 7 - Data: 33|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 35|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Players + Data: _Landmarks - Name: k__BackingField - Entry: 9 - Data: 23 + Entry: 7 + Data: 36|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 23 + Data: 36 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -551,13 +569,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: @@ -578,79 +596,31 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_STANDARD - - Name: $v - Entry: 7 - Data: 36|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_STANDARD - - Name: k__BackingField - Entry: 7 - Data: 37|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Color, UnityEngine.CoreModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 37 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 38|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - 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: COLOR_RED + Data: _StageIndex - Name: $v Entry: 7 Data: 39|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_RED + Data: _StageIndex - Name: k__BackingField - Entry: 9 - Data: 37 + Entry: 7 + Data: 40|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: - Name: k__BackingField Entry: 9 - Data: 37 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -659,10 +629,16 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 40|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + Data: 41|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 - Data: 0 + Data: 1 + - Name: + Entry: 7 + Data: 42|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: - Name: Entry: 13 Data: @@ -680,73 +656,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: COLOR_YELLOW - - Name: $v - Entry: 7 - Data: 41|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: COLOR_YELLOW - - Name: k__BackingField - Entry: 9 - Data: 37 - - Name: k__BackingField - Entry: 9 - Data: 37 - - 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: false - - Name: _fieldAttributes - Entry: 7 - Data: 42|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 0 - - 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: COLOR_GREEN + Data: _CurrentPlayerCounter - Name: $v Entry: 7 Data: 43|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: COLOR_GREEN + Data: _CurrentPlayerCounter - Name: k__BackingField Entry: 9 - Data: 37 + Data: 40 - Name: k__BackingField Entry: 9 - Data: 37 + Data: 40 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib - Name: - Entry: 6 - Data: + Entry: 3 + Data: 1 - Name: Entry: 8 Data: @@ -756,6 +684,264 @@ MonoBehaviour: - Name: _fieldAttributes Entry: 7 Data: 44|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 45|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: _Players + - Name: $v + Entry: 7 + Data: 46|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Players + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField + Entry: 9 + Data: 36 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 47|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 48|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - 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: COLOR_STANDARD + - Name: $v + Entry: 7 + Data: 49|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_STANDARD + - Name: k__BackingField + Entry: 7 + Data: 50|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Color, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 50 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 51|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: COLOR_RED + - Name: $v + Entry: 7 + Data: 52|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_RED + - Name: k__BackingField + Entry: 9 + Data: 50 + - Name: k__BackingField + Entry: 9 + Data: 50 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 53|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: COLOR_YELLOW + - Name: $v + Entry: 7 + Data: 54|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_YELLOW + - Name: k__BackingField + Entry: 9 + Data: 50 + - Name: k__BackingField + Entry: 9 + Data: 50 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 55|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 0 + - 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: COLOR_GREEN + - Name: $v + Entry: 7 + Data: 56|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: COLOR_GREEN + - Name: k__BackingField + Entry: 9 + Data: 50 + - Name: k__BackingField + Entry: 9 + Data: 50 + - 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: false + - Name: _fieldAttributes + Entry: 7 + Data: 57|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 0 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs index 55e4eb8..ca9b7f6 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound2.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound2.cs @@ -21,8 +21,11 @@ public class GameManagerRound2 : GameManagerBase { [SerializeField] private CaseManager _CaseManager; + [SerializeField] private Modem _Modem; + [SerializeField] private ArrivalDisplay _ArrivalDisplay; [SerializeField] private LocationBoard _LocationBoard; + [UdonSynced, FieldChangeCallback(nameof(Location))] private string _Location = ""; [UdonSynced] private string[] _Landmarks; [UdonSynced] private int _StageIndex = 0; @@ -86,6 +89,8 @@ public class GameManagerRound2 : GameManagerBase } } + Location = LandmarkDictionary["Location"].String; + _Landmarks = NewLandmarks; _LocationBoard.SendCustomNetworkEvent(NetworkEventTarget.All, "PopulateLandmarks", NewLandmarks); LocationBoardReset(); @@ -118,6 +123,8 @@ public class GameManagerRound2 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic"); + _Modem.gameObject.SetActive(false); + EnableInteraction("Begin Round"); } @@ -236,7 +243,8 @@ public class GameManagerRound2 : GameManagerBase { HostCardBetweenRoundsInterface Interface = (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); - Interface.HeaderUI.text = "Round is over. Let's go to the map!"; + Interface.HeaderUI.text = "Round is over."; + Interface.CommentUI.text = "Let's go to the map!"; _CaseManager.ContinueToRound3(); @@ -352,4 +360,15 @@ public class GameManagerRound2 : GameManagerBase default: return "[[ERROR]]"; } } + + + public string Location + { + set + { + _Location = value; + _ArrivalDisplay.SetDisplay(_Location); + } + get => _Location; + } } diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs index b5ef031..ccdbcbb 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound3.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound3.cs @@ -99,6 +99,8 @@ public class GameManagerRound3 : GameManagerBase Debug.LogError("Malformed round data. Ensure Round 3 contains a continent to use for the map."); } + InitialiseMarkers(); + EnableInteraction("Display Briefing"); } @@ -240,7 +242,6 @@ public class GameManagerRound3 : GameManagerBase FailureCounter = 0; ActiveMarker++; - UpdateInterface(); RequestSerialization(); } @@ -253,6 +254,8 @@ public class GameManagerRound3 : GameManagerBase SendCustomNetworkEvent(NetworkEventTarget.Owner, nameof(GameHasBeenLost), true); return; } + + UpdateInterface(); GetCurrentMarker().SendCustomNetworkEvent(NetworkEventTarget.Owner, "Activated", true); } @@ -267,8 +270,10 @@ public class GameManagerRound3 : GameManagerBase HostCardBetweenRoundsInterface GameWinInterface = (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); - GameWinInterface.HeaderUI.text = "The player has won the game. " + _Timer + " seconds to spare."; - GameWinInterface.CommentUI.text = ""; + GameWinInterface.HeaderUI.text = "The player has won the game."; + GameWinInterface.CommentUI.text = + "- " + _Timer + " seconds to spare.\n" + + "- There's one more thing I want you to do for us. You know what it is..."; _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlaySFXLoop", SFXEventType.CarmenInJail); @@ -311,8 +316,10 @@ public class GameManagerRound3 : GameManagerBase HostCardBetweenRoundsInterface GameLossInterface = (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); - GameLossInterface.HeaderUI.text = "The player has run out of " + (RanOutOfMarkers ? "markers" : "time") + ". " + SuccessCounter + " countries in " + TIMER_LENGTH + " seconds."; - GameLossInterface.CommentUI.text = ""; + GameLossInterface.HeaderUI.text = "The player has run out of " + (RanOutOfMarkers ? "markers" : "time") + "."; + GameLossInterface.CommentUI.text = + "- Found " + SuccessCounter + " countries in " + TIMER_LENGTH + " seconds.\n\n" + + "- There's one more thing I want you to do for us. You know what it is..."; StopFinalRoundMusic(); SendCustomEventDelayedSeconds(nameof(PlayWindDownMusic), 2.5f); @@ -348,7 +355,7 @@ public class GameManagerRound3 : GameManagerBase _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "FadeOutMusic"); - EnableInteraction("Game is over. Load a new case file to start again."); + EnableInteraction("Game Over"); } diff --git a/Assets/UdonSharp/Interacts.meta b/Assets/UdonSharp/Interacts.meta new file mode 100644 index 0000000..9ad4ce7 --- /dev/null +++ b/Assets/UdonSharp/Interacts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 302b841406a6a7644ae2e0c603c2f9aa +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Interacts/CustomEventInteraction.asset b/Assets/UdonSharp/Interacts/CustomEventInteraction.asset new file mode 100644 index 0000000..3a7b455 --- /dev/null +++ b/Assets/UdonSharp/Interacts/CustomEventInteraction.asset @@ -0,0 +1,179 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: CustomEventInteraction + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: 788c1198ec928d84ca21dcac058c51eb, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: 0ce295bc35d40dd4c82081275b392c56, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 2 + hasInteractEvent: 1 + scriptID: -3327800156206502456 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _Target + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Target + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UdonSharp.UdonSharpBehaviour, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - 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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: _EventName + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _EventName + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 8 + - 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: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 10|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: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/Interacts/CustomEventInteraction.asset.meta b/Assets/UdonSharp/Interacts/CustomEventInteraction.asset.meta new file mode 100644 index 0000000..789d35a --- /dev/null +++ b/Assets/UdonSharp/Interacts/CustomEventInteraction.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0d8a2e1bd96144840bbc9095a926631b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Interacts/CustomEventInteraction.cs b/Assets/UdonSharp/Interacts/CustomEventInteraction.cs new file mode 100644 index 0000000..c82baa6 --- /dev/null +++ b/Assets/UdonSharp/Interacts/CustomEventInteraction.cs @@ -0,0 +1,20 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; +using VRC.Udon.Common.Interfaces; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.NoVariableSync)] +public class CustomEventInteraction : UdonSharpBehaviour +{ + [SerializeField] private UdonSharpBehaviour _Target; + [SerializeField] private string _EventName; + + + public override void Interact() + { + _Target.SendCustomEvent(_EventName); + } +} diff --git a/Assets/UdonSharp/Interacts/CustomEventInteraction.cs.meta b/Assets/UdonSharp/Interacts/CustomEventInteraction.cs.meta new file mode 100644 index 0000000..2940846 --- /dev/null +++ b/Assets/UdonSharp/Interacts/CustomEventInteraction.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 0ce295bc35d40dd4c82081275b392c56 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/ACME Crimenet Computer/CustomNetworkEventInteraction.asset b/Assets/UdonSharp/Interacts/CustomNetworkEventInteraction.asset similarity index 100% rename from Assets/UdonSharp/ACME Crimenet Computer/CustomNetworkEventInteraction.asset rename to Assets/UdonSharp/Interacts/CustomNetworkEventInteraction.asset diff --git a/Assets/UdonSharp/ACME Crimenet Computer/CustomNetworkEventInteraction.asset.meta b/Assets/UdonSharp/Interacts/CustomNetworkEventInteraction.asset.meta similarity index 100% rename from Assets/UdonSharp/ACME Crimenet Computer/CustomNetworkEventInteraction.asset.meta rename to Assets/UdonSharp/Interacts/CustomNetworkEventInteraction.asset.meta diff --git a/Assets/UdonSharp/ACME Crimenet Computer/CustomNetworkEventInteraction.cs b/Assets/UdonSharp/Interacts/CustomNetworkEventInteraction.cs similarity index 100% rename from Assets/UdonSharp/ACME Crimenet Computer/CustomNetworkEventInteraction.cs rename to Assets/UdonSharp/Interacts/CustomNetworkEventInteraction.cs diff --git a/Assets/UdonSharp/ACME Crimenet Computer/CustomNetworkEventInteraction.cs.meta b/Assets/UdonSharp/Interacts/CustomNetworkEventInteraction.cs.meta similarity index 100% rename from Assets/UdonSharp/ACME Crimenet Computer/CustomNetworkEventInteraction.cs.meta rename to Assets/UdonSharp/Interacts/CustomNetworkEventInteraction.cs.meta diff --git a/Assets/UdonSharp/Maps/FloorMapMarker.cs b/Assets/UdonSharp/Maps/FloorMapMarker.cs index 91098ce..44f5063 100644 --- a/Assets/UdonSharp/Maps/FloorMapMarker.cs +++ b/Assets/UdonSharp/Maps/FloorMapMarker.cs @@ -36,7 +36,7 @@ public class FloorMapMarker : UdonSharpBehaviour private VRCPlayerApi _CurrentOwner; private const int MAX_REPEAT_COLLISION_CHECKS = 3; - private const int MAX_CHECKS_WITH_NO_COLLISIONS = 8; + private const int MAX_CHECKS_WITH_NO_COLLISIONS = 6; private const float TIME_BETWEEN_REPEAT_COLLISION_CHECKS = 0.15f; diff --git a/Assets/UdonSharp/Modem.meta b/Assets/UdonSharp/Modem.meta new file mode 100644 index 0000000..081e058 --- /dev/null +++ b/Assets/UdonSharp/Modem.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0e30694b7050a2b4882856045e55f274 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Modem/Modem.asset b/Assets/UdonSharp/Modem/Modem.asset new file mode 100644 index 0000000..c242856 --- /dev/null +++ b/Assets/UdonSharp/Modem/Modem.asset @@ -0,0 +1,362 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c333ccfdd0cbdbc4ca30cef2dd6e6b9b, type: 3} + m_Name: Modem + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: e356a03a21c162c4c97b99f8edcd67a6, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: ad9717a7d77e8e34bae7a424794f8bf1, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: -1963162680062616674 + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: + - Name: fieldDefinitions + Entry: 7 + Data: 0|System.Collections.Generic.Dictionary`2[[System.String, mscorlib],[UdonSharp.Compiler.FieldDefinition, + UdonSharp.Editor]], mscorlib + - Name: comparer + Entry: 7 + Data: 1|System.Collections.Generic.GenericEqualityComparer`1[[System.String, + mscorlib]], mscorlib + - Name: + Entry: 8 + Data: + - Name: + Entry: 12 + Data: 5 + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _ModemDestination + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ModemDestination + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: Modem, Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 7 + Data: 4|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: VRC.Udon.UdonBehaviour, VRC.Udon + - Name: + Entry: 8 + Data: + - 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: 5|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 6|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: _AudioManager + - Name: $v + Entry: 7 + Data: 7|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _AudioManager + - Name: k__BackingField + Entry: 7 + Data: 8|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: AudioManager, 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: 9|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 10|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 11|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: _ModemAnimator + - Name: $v + Entry: 7 + Data: 12|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ModemAnimator + - Name: k__BackingField + Entry: 7 + Data: 13|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 13 + - 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: 14|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 15|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: 16|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _ModemDestinationAnimator + - Name: k__BackingField + Entry: 9 + Data: 13 + - Name: k__BackingField + Entry: 9 + Data: 13 + - 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: 17|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 18|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: 19|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _EnteredPlayers + - Name: k__BackingField + Entry: 7 + Data: 20|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.String[], mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 20 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 3 + Data: 1 + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: false + - Name: _fieldAttributes + Entry: 7 + Data: 21|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 22|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: diff --git a/Assets/UdonSharp/Modem/Modem.asset.meta b/Assets/UdonSharp/Modem/Modem.asset.meta new file mode 100644 index 0000000..48d7f9c --- /dev/null +++ b/Assets/UdonSharp/Modem/Modem.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: d4456ead048bf24448ff90d3a49a7914 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Modem/Modem.cs b/Assets/UdonSharp/Modem/Modem.cs new file mode 100644 index 0000000..f356def --- /dev/null +++ b/Assets/UdonSharp/Modem/Modem.cs @@ -0,0 +1,113 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDK3.UdonNetworkCalling; +using VRC.SDKBase; +using VRC.Udon; +using VRC.Udon.Common.Interfaces; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class Modem : UdonSharpBehaviour +{ + [SerializeField] private Modem _ModemDestination; + + [Space] + + [SerializeField] private AudioManager _AudioManager; + [SerializeField] private Animator _ModemAnimator; + [SerializeField] private Animator _ModemDestinationAnimator; + + [UdonSynced] private string[] _EnteredPlayers = new string[MAX_PLAYERS_IN_MODEM]; + private const int MAX_PLAYERS_IN_MODEM = 10; + + + + public void ResetModem() + { + _ModemAnimator.SetBool("Teleport", false); + _ModemDestinationAnimator.SetBool("Teleport", false); + } + + + public override void OnPlayerTriggerEnter(VRCPlayerApi Player) + { + for (int i = 0; i < MAX_PLAYERS_IN_MODEM; i++) + { + if (_EnteredPlayers[i] == null) + { + _EnteredPlayers[i] = Player.displayName; + break; + } + } + + RequestSerialization(); + base.OnPlayerTriggerEnter(Player); + } + + public override void OnPlayerTriggerExit(VRCPlayerApi Player) + { + for (int i = 0; i < MAX_PLAYERS_IN_MODEM; i++) + { + if (_EnteredPlayers[i] == Player.displayName) + { + _EnteredPlayers[i] = null; + break; + } + } + + RequestSerialization(); + base.OnPlayerTriggerExit(Player); + } + + + public void BeginTeleportProcess() + { + _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, + "PlaySFX", SFXEventType.ModemOperation); + + _ModemAnimator.SetBool("Teleport", true); + _ModemDestinationAnimator.SetBool("Teleport", true); + + SendCustomEventDelayedSeconds(nameof(TeleportAllPlayers), 4.0f); + SendCustomEventDelayedSeconds(nameof(ResetAnimations), 6.0f); + } + + public void TeleportAllPlayers() + { + SendCustomNetworkEvent(NetworkEventTarget.All, nameof(TeleportLocalPlayerIfInModem)); + } + + public void ResetAnimations() + { + _ModemAnimator.SetBool("Teleport", false); + _ModemDestinationAnimator.SetBool("Teleport", false); + } + + + [NetworkCallable] + public void TeleportLocalPlayerIfInModem() + { + for (int j = 0; j < _EnteredPlayers.Length; j++) + { + if (_EnteredPlayers[j] == Networking.LocalPlayer.displayName) + { + TeleportToModemDestination(); + break; + } + } + } + + private void TeleportToModemDestination() + { + Vector3 DeltaVector = Networking.LocalPlayer.GetPosition() - transform.position; + Quaternion DeltaRotation = _ModemDestination.transform.rotation * Quaternion.Inverse(transform.rotation); + + Vector3 DestinationVectorRotated = DeltaRotation * DeltaVector.normalized; + Vector3 DestinationPositionDelta = DestinationVectorRotated * DeltaVector.magnitude; + + Networking.LocalPlayer.TeleportTo( + _ModemDestination.transform.position + DestinationPositionDelta, + DeltaRotation * Networking.LocalPlayer.GetRotation()); + } +} diff --git a/Assets/UdonSharp/Modem/Modem.cs.meta b/Assets/UdonSharp/Modem/Modem.cs.meta new file mode 100644 index 0000000..d0de71b --- /dev/null +++ b/Assets/UdonSharp/Modem/Modem.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ad9717a7d77e8e34bae7a424794f8bf1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/PlayerTeleporter.asset b/Assets/UdonSharp/PlayerTeleporter.asset index 3879f2b..460d44a 100644 --- a/Assets/UdonSharp/PlayerTeleporter.asset +++ b/Assets/UdonSharp/PlayerTeleporter.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 7 + Data: 6 - Name: Entry: 7 Data: @@ -396,69 +396,6 @@ MonoBehaviour: - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: - - Name: $k - Entry: 1 - Data: _ModemArrivalsTeleportLocation - - Name: $v - Entry: 7 - Data: 24|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _ModemArrivalsTeleportLocation - - Name: k__BackingField - Entry: 9 - Data: 3 - - Name: k__BackingField - Entry: 9 - Data: 3 - - 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: 25|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - - Name: - Entry: 12 - Data: 2 - - Name: - Entry: 7 - Data: 26|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - - Name: height - Entry: 4 - Data: 8 - - Name: - Entry: 8 - Data: - - Name: - Entry: 7 - Data: 27|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: 13 Data: diff --git a/Assets/UdonSharp/PlayerTeleporter.cs b/Assets/UdonSharp/PlayerTeleporter.cs index d3e4005..0388d2a 100644 --- a/Assets/UdonSharp/PlayerTeleporter.cs +++ b/Assets/UdonSharp/PlayerTeleporter.cs @@ -1,6 +1,7 @@  using UdonSharp; using UnityEngine; +using VRC.SDK3.UdonNetworkCalling; using VRC.SDKBase; using VRC.Udon; @@ -18,10 +19,6 @@ public class PlayerTeleporter : UdonSharpBehaviour [SerializeField] private PlayerPodium[] _PlayerPodiums; - [Space] - - [SerializeField] private Transform _ModemArrivalsTeleportLocation; - public void TeleportToHostPosition() { 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/Packages/packages-lock.json b/Packages/packages-lock.json index ea6cd85..ad35908 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -6,12 +6,6 @@ "source": "embedded", "dependencies": {} }, - "com.mmmaellon.smartobjectsync": { - "version": "file:com.mmmaellon.smartobjectsync", - "depth": 0, - "source": "embedded", - "dependencies": {} - }, "com.unity.ai.navigation": { "version": "1.1.5", "depth": 1, diff --git a/Raw Files/Meshes/DestinationCard.blend b/Raw Files/Meshes/DestinationCard.blend new file mode 100644 index 0000000..ecc3a40 Binary files /dev/null and b/Raw Files/Meshes/DestinationCard.blend differ diff --git a/witwics.sln b/witwics.sln index 5d270a3..a61877a 100644 --- a/witwics.sln +++ b/witwics.sln @@ -41,8 +41,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRWorldToolkit.Editor", "VR EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.ExampleCentral.Editor", "VRC.ExampleCentral.Editor.csproj", "{EFC3CF82-BDD3-0A74-7E14-B8F28DD7337C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.mmmaellon.smartobjectsync", "com.mmmaellon.smartobjectsync.csproj", "{B33C6706-7ABF-07B9-BDCA-1044C65D29E3}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.vrchat.core.vpm-resolver.Editor", "com.vrchat.core.vpm-resolver.Editor.csproj", "{F9872A56-7DAC-38F7-DB8F-28A298D5C785}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.SDKBase.Editor.ShaderStripping", "VRC.SDKBase.Editor.ShaderStripping.csproj", "{F7161389-AE46-A707-AE04-38B99CD75559}" @@ -57,8 +55,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VRC.SDKBase.Editor.BuildPip EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "vrchat.jordo.easyquestswitch.Editor", "vrchat.jordo.easyquestswitch.Editor.csproj", "{68381FC4-7E6D-8422-C194-D43CD9B5430F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "com.mmmaellon.smartobjectsync.editor", "com.mmmaellon.smartobjectsync.editor.csproj", "{5508B9D2-267C-A336-1C6C-13E7ACFA2DE1}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.Addressables", "UniTask.Addressables.csproj", "{6AA0AACC-56ED-4C99-7D2A-220D3B243EDD}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UniTask.TextMeshPro", "UniTask.TextMeshPro.csproj", "{91F2D0BB-0290-6D83-B6CE-D722F4D01C8D}" @@ -149,10 +145,6 @@ Global {EFC3CF82-BDD3-0A74-7E14-B8F28DD7337C}.Debug|Any CPU.Build.0 = Debug|Any CPU {EFC3CF82-BDD3-0A74-7E14-B8F28DD7337C}.Release|Any CPU.ActiveCfg = Release|Any CPU {EFC3CF82-BDD3-0A74-7E14-B8F28DD7337C}.Release|Any CPU.Build.0 = Release|Any CPU - {B33C6706-7ABF-07B9-BDCA-1044C65D29E3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B33C6706-7ABF-07B9-BDCA-1044C65D29E3}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B33C6706-7ABF-07B9-BDCA-1044C65D29E3}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B33C6706-7ABF-07B9-BDCA-1044C65D29E3}.Release|Any CPU.Build.0 = Release|Any CPU {F9872A56-7DAC-38F7-DB8F-28A298D5C785}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {F9872A56-7DAC-38F7-DB8F-28A298D5C785}.Debug|Any CPU.Build.0 = Debug|Any CPU {F9872A56-7DAC-38F7-DB8F-28A298D5C785}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -181,10 +173,6 @@ Global {68381FC4-7E6D-8422-C194-D43CD9B5430F}.Debug|Any CPU.Build.0 = Debug|Any CPU {68381FC4-7E6D-8422-C194-D43CD9B5430F}.Release|Any CPU.ActiveCfg = Release|Any CPU {68381FC4-7E6D-8422-C194-D43CD9B5430F}.Release|Any CPU.Build.0 = Release|Any CPU - {5508B9D2-267C-A336-1C6C-13E7ACFA2DE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5508B9D2-267C-A336-1C6C-13E7ACFA2DE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5508B9D2-267C-A336-1C6C-13E7ACFA2DE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5508B9D2-267C-A336-1C6C-13E7ACFA2DE1}.Release|Any CPU.Build.0 = Release|Any CPU {6AA0AACC-56ED-4C99-7D2A-220D3B243EDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {6AA0AACC-56ED-4C99-7D2A-220D3B243EDD}.Debug|Any CPU.Build.0 = Debug|Any CPU {6AA0AACC-56ED-4C99-7D2A-220D3B243EDD}.Release|Any CPU.ActiveCfg = Release|Any CPU