diff --git a/Assembly-CSharp.csproj b/Assembly-CSharp.csproj index d8d33d6..13ebeff 100644 --- a/Assembly-CSharp.csproj +++ b/Assembly-CSharp.csproj @@ -98,6 +98,7 @@ + diff --git a/Assets/Materials/Assorted/M_BellLogo.mat b/Assets/Materials/Assorted/M_BellLogo.mat index 22d3daa..c8e0102 100644 --- a/Assets/Materials/Assorted/M_BellLogo.mat +++ b/Assets/Materials/Assorted/M_BellLogo.mat @@ -77,7 +77,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _Border: 0.5 + - _Border: 0.373 - _BorderSize: 0.5 - _BumpScale: 1 - _Cutoff: 0.5 diff --git a/Assets/Models/SM_WarningLight.fbx b/Assets/Models/SM_WarningLight.fbx index 3b7c058..08e7f4f 100644 Binary files a/Assets/Models/SM_WarningLight.fbx and b/Assets/Models/SM_WarningLight.fbx differ diff --git a/Assets/Prefabs/ACME Bugnet Alert.prefab b/Assets/Prefabs/ACME Bugnet Alert.prefab new file mode 100644 index 0000000..123f283 --- /dev/null +++ b/Assets/Prefabs/ACME Bugnet Alert.prefab @@ -0,0 +1,654 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2555680429761886000 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2310200484114195802} + - component: {fileID: 3470490277592903623} + - component: {fileID: 8886533789961338979} + - component: {fileID: 6248225522334958596} + m_Layer: 0 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!224 &2310200484114195802 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2555680429761886000} + m_LocalRotation: {x: -1.2993782e-14, y: 1, z: -0, w: -0.000000059604645} + m_LocalPosition: {x: 0, y: 0, z: 0.007} + m_LocalScale: {x: 0.001, y: 0.001, z: 0.001} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1490237182596557415} + m_Father: {fileID: 7743010736180348541} + m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -0} + m_SizeDelta: {x: 910, y: 660} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &3470490277592903623 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2555680429761886000} + 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!114 &8886533789961338979 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2555680429761886000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 1 +--- !u!114 &6248225522334958596 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2555680429761886000} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &3109332370907342566 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3216041619545460397} + - component: {fileID: 489599064567695873} + - component: {fileID: 3122154488745394400} + m_Layer: 0 + m_Name: ACME Bugnet Alert + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3216041619545460397 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3109332370907342566} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: 0.000000029802322, z: -0, w: 1} + m_LocalPosition: {x: -1.4180021, y: 1.49, z: 0.45799983} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2757078267418855107} + - {fileID: 4314922388338592270} + - {fileID: 7743010736180348541} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &489599064567695873 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3109332370907342566} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c5902c1aa04e01c4fb9b5622b71b5677, type: 3} + m_Name: + m_EditorClassIdentifier: + serializationData: + SerializedFormat: 2 + SerializedBytes: + ReferencedUnityObjects: [] + SerializedBytesString: + Prefab: {fileID: 0} + PrefabModificationsReferencedUnityObjects: [] + PrefabModifications: [] + SerializationNodes: [] + _udonSharpBackingUdonBehaviour: {fileID: 3122154488745394400} + _LampMesh: {fileID: 3146472220429300065} + _LampMaterialSlot: 1 + _UnlitMaterial: {fileID: 2100000, guid: fe872fb72ad98da4dbb868481468e848, type: 2} + _LitMaterial: {fileID: 2100000, guid: 3fef7fe6d628ca64ba291c8ee8d7a723, type: 2} +--- !u!114 &3122154488745394400 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3109332370907342566} + 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: f9311ea04773f404d983464aa492b492, + type: 2} + programSource: {fileID: 11400000, guid: 4e2aa45f8c7c5e34baa72b21310347c0, type: 2} + serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgEAAAAAAAAAAi8CAAAAAUkAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBJAG4AdAAzADIALAAgAG0AcwBjAG8AcgBsAGkAYgBdAF0ALAAgAFYAUgBDAC4AVQBkAG8AbgAuAEMAbwBtAG0AbwBuAAIAAAAGAgAAAAAAAAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAHQAcgBpAG4AZwAsACAAbQBzAGMAbwByAGwAaQBiACcBCgAAAFMAeQBtAGIAbwBsAE4AYQBtAGUAAR8AAABfAF8AXwBVAGQAbwBuAFMAaABhAHIAcABCAGUAaABhAHYAaQBvAHUAcgBWAGUAcgBzAGkAbwBuAF8AXwBfACcBBAAAAHQAeQBwAGUAARYAAABTAHkAcwB0AGUAbQAuAEkAbgB0ADMAMgAsACAAbQBzAGMAbwByAGwAaQBiABcBBQAAAFYAYQBsAHUAZQACAAAABwUHBQcF + publicVariablesUnityEngineObjects: [] + publicVariablesSerializationDataFormat: 0 +--- !u!1 &7928396878868095631 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1490237182596557415} + - component: {fileID: 4574325810300629932} + - component: {fileID: 6197498132645743362} + m_Layer: 0 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 2147483647 + m_IsActive: 1 +--- !u!224 &1490237182596557415 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7928396878868095631} + 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: [] + m_Father: {fileID: 2310200484114195802} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4574325810300629932 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7928396878868095631} + m_CullTransparentMesh: 1 +--- !u!114 &6197498132645743362 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7928396878868095631} + 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: BUGNET ALERT + 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: 4284743880 + m_fontColor: {r: 0.78431374, g: 0, b: 0.39215687, 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: 292.5 + m_fontSizeBase: 292.5 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: -63.5 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + 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 &2434658969290940712 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3216041619545460397} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalScale.x + value: 0.19 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalScale.y + value: 0.19 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalScale.z + value: 0.19 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.184 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.0000005411063 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.000000025492865 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_StitchLightmapSeams + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 51b03d257a738e6468f623865f31dbec, type: 2} + - target: {fileID: 919132149155446097, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_Name + value: SM_ACMECrimenetDecal + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 94e1085f316b5f147965e5e2cb3933e7, type: 3} +--- !u!4 &2757078267418855107 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + m_PrefabInstance: {fileID: 2434658969290940712} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &4353598141534055909 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3216041619545460397} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_ScaleInLightmap + value: 5 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} + - target: {fileID: -7511558181221131132, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: b9535b955923d624e91671c4ba715372, type: 2} + - target: {fileID: 919132149155446097, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_Name + value: SM_WarningLight + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6827f4f48aff5694799652d6af33b9a3, type: 3} +--- !u!23 &3146472220429300065 stripped +MeshRenderer: + m_CorrespondingSourceObject: {fileID: -7511558181221131132, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + m_PrefabInstance: {fileID: 4353598141534055909} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4314922388338592270 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, + type: 3} + m_PrefabInstance: {fileID: 4353598141534055909} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7853726074347037078 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3216041619545460397} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalScale.x + value: 0.19 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalScale.y + value: 0.19 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalScale.z + value: 0.19 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.169 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.00000021799949 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalRotation.z + value: 0.00000001688742 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_CastShadows + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -7511558181221131132, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: accd304c49b7d6d43b97738e8e118342, type: 2} + - target: {fileID: 919132149155446097, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_Name + value: SM_ACMECrimenetDecal (1) + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + propertyPath: m_StaticEditorFlags + value: 2147483647 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2310200484114195802} + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 94e1085f316b5f147965e5e2cb3933e7, type: 3} +--- !u!4 &7743010736180348541 stripped +Transform: + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 94e1085f316b5f147965e5e2cb3933e7, + type: 3} + m_PrefabInstance: {fileID: 7853726074347037078} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/ACME Bugnet Alert.prefab.meta b/Assets/Prefabs/ACME Bugnet Alert.prefab.meta new file mode 100644 index 0000000..7e25552 --- /dev/null +++ b/Assets/Prefabs/ACME Bugnet Alert.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4f7c6ac3aed46904ea4c01cde932dbf4 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index 8074145..1c70df0 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -19915,6 +19915,7 @@ MonoBehaviour: _VideoMusicClueSkateboard: {fileID: 4337638711874237563} _DetectiveNoirEffect: {fileID: 7187778359178514366} _FilingCabinet: {fileID: 1187707351} + _ACMEBugnetAlert: {fileID: 1870989325} _Modem: {fileID: 966631266} _ArrivalDisplays: [] _LightningRoundEffects: {fileID: 806909630} @@ -21584,7 +21585,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 5bc12a6cede7b5b4ea0a43f46015ba8c, type: 3} propertyPath: m_LocalPosition.x - value: -1.322 + value: -1.243 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5bc12a6cede7b5b4ea0a43f46015ba8c, type: 3} @@ -21594,7 +21595,7 @@ PrefabInstance: - target: {fileID: -8679921383154817045, guid: 5bc12a6cede7b5b4ea0a43f46015ba8c, type: 3} propertyPath: m_LocalPosition.z - value: 0.4884 + value: 0.488 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5bc12a6cede7b5b4ea0a43f46015ba8c, type: 3} @@ -25908,7 +25909,7 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, type: 3} insertIndex: -1 - addedObject: {fileID: 2059010582} + addedObject: {fileID: 1870989323} - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: f5bc5d61a5d3b344dbf2a816916c3498, type: 3} insertIndex: -1 @@ -72190,6 +72191,30 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0458afc6c10ba344f8af219c2363ee74, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &1870989322 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3109332370907342566, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + m_PrefabInstance: {fileID: 3407097804787603705} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1870989323 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + m_PrefabInstance: {fileID: 3407097804787603705} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1870989325 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 489599064567695873, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + m_PrefabInstance: {fileID: 3407097804787603705} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1870989322} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c5902c1aa04e01c4fb9b5622b71b5677, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1872997051 GameObject: m_ObjectHideFlags: 0 @@ -78915,90 +78940,6 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 4953860686005405531} m_PrefabAsset: {fileID: 0} ---- !u!1001 &2059010581 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 705210511} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalPosition.x - value: -1.299 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalPosition.y - value: 1.939 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalPosition.z - value: 0.458 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: b9535b955923d624e91671c4ba715372, type: 2} - - target: {fileID: -7511558181221131132, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: c10453b4aa0c864458b74f3797cb611e, type: 2} - - target: {fileID: 919132149155446097, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - propertyPath: m_Name - value: SM_WarningLight - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6827f4f48aff5694799652d6af33b9a3, type: 3} ---- !u!4 &2059010582 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 6827f4f48aff5694799652d6af33b9a3, - type: 3} - m_PrefabInstance: {fileID: 2059010581} - m_PrefabAsset: {fileID: 0} --- !u!1 &2059107781 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1233416562922120989, guid: 126991d511ca61841a0ef899b6c038a6, @@ -84455,6 +84396,80 @@ MonoBehaviour: serializedPublicVariablesBytesString: Ai8AAAAAATIAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAFQAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAAAAAAYBAAAAAAAAACcBBAAAAHQAeQBwAGUAAWgAAABTAHkAcwB0AGUAbQAuAEMAbwBsAGwAZQBjAHQAaQBvAG4AcwAuAEcAZQBuAGUAcgBpAGMALgBMAGkAcwB0AGAAMQBbAFsAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4ALgBJAG4AdABlAHIAZgBhAGMAZQBzAC4ASQBVAGQAbwBuAFYAYQByAGkAYQBiAGwAZQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AXQBdACwAIABtAHMAYwBvAHIAbABpAGIAAQEJAAAAVgBhAHIAaQBhAGIAbABlAHMALwEAAAABaAAAAFMAeQBzAHQAZQBtAC4AQwBvAGwAbABlAGMAdABpAG8AbgBzAC4ARwBlAG4AZQByAGkAYwAuAEwAaQBzAHQAYAAxAFsAWwBWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAEkAbgB0AGUAcgBmAGEAYwBlAHMALgBJAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlACwAIABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgBdAF0ALAAgAG0AcwBjAG8AcgBsAGkAYgABAAAABgQAAAAAAAAAAi8CAAAAAUoAAABWAFIAQwAuAFUAZABvAG4ALgBDAG8AbQBtAG8AbgAuAFUAZABvAG4AVgBhAHIAaQBhAGIAbABlAGAAMQBbAFsAUwB5AHMAdABlAG0ALgBTAGkAbgBnAGwAZQAsACAAbQBzAGMAbwByAGwAaQBiAF0AXQAsACAAVgBSAEMALgBVAGQAbwBuAC4AQwBvAG0AbQBvAG4AAgAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABCwAAAGoAdQBtAHAASQBtAHAAdQBsAHMAZQAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAGkAbgBnAGwAZQAsACAAbQBzAGMAbwByAGwAaQBiAB8BBQAAAFYAYQBsAHUAZQAAAEBABwUCMAIAAAADAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAEJAAAAdwBhAGwAawBTAHAAZQBlAGQAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwBpAG4AZwBsAGUALAAgAG0AcwBjAG8AcgBsAGkAYgAfAQUAAABWAGEAbAB1AGUAAABAQAcFAjACAAAABAAAAAYCAAAAAAAAACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAdAByAGkAbgBnACwAIABtAHMAYwBvAHIAbABpAGIAJwEKAAAAUwB5AG0AYgBvAGwATgBhAG0AZQABCAAAAHIAdQBuAFMAcABlAGUAZAAnAQQAAAB0AHkAcABlAAEXAAAAUwB5AHMAdABlAG0ALgBTAGkAbgBnAGwAZQAsACAAbQBzAGMAbwByAGwAaQBiAB8BBQAAAFYAYQBsAHUAZQAAAKBABwUCMAIAAAAFAAAABgIAAAAAAAAAJwEEAAAAdAB5AHAAZQABFwAAAFMAeQBzAHQAZQBtAC4AUwB0AHIAaQBuAGcALAAgAG0AcwBjAG8AcgBsAGkAYgAnAQoAAABTAHkAbQBiAG8AbABOAGEAbQBlAAELAAAAcwB0AHIAYQBmAGUAUwBwAGUAZQBkACcBBAAAAHQAeQBwAGUAARcAAABTAHkAcwB0AGUAbQAuAFMAaQBuAGcAbABlACwAIABtAHMAYwBvAHIAbABpAGIAHwEFAAAAVgBhAGwAdQBlAAAAQEAHBQcFBwU= publicVariablesUnityEngineObjects: [] publicVariablesSerializationDataFormat: 0 +--- !u!1001 &3407097804787603705 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 705210511} + m_Modifications: + - target: {fileID: 489599064567695873, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: serializationData.Prefab + value: + objectReference: {fileID: 489599064567695873, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + - target: {fileID: 3109332370907342566, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_Name + value: ACME Bugnet Alert + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalPosition.x + value: -1.4180021 + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.49 + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalPosition.z + value: 0.45799983 + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalRotation.y + value: 0.000000029802322 + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3216041619545460397, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 4f7c6ac3aed46904ea4c01cde932dbf4, type: 3} --- !u!1001 &3420206679586331503 PrefabInstance: m_ObjectHideFlags: 0 @@ -98152,6 +98167,10 @@ MonoBehaviour: - gameObject: {fileID: 723960310} ID: 1521 SerializedTypeNames: [] + - gameObject: {fileID: 1870989322} + ID: 1522 + 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 5659b93..94a924d 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 40d243f..af438ba 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_dir.png.meta b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png.meta index d594f3d..91be073 100644 --- a/Assets/Scenes/witwics/Lightmap-0_comp_dir.png.meta +++ b/Assets/Scenes/witwics/Lightmap-0_comp_dir.png.meta @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 512 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 2 diff --git a/Assets/Scenes/witwics/Lightmap-0_comp_light.exr b/Assets/Scenes/witwics/Lightmap-0_comp_light.exr index b4e5501..fe5e139 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/ReflectionProbe-0.exr b/Assets/Scenes/witwics/ReflectionProbe-0.exr index c706f18..2afe2c8 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 3a60c1d..4dee3a7 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-10.exr b/Assets/Scenes/witwics/ReflectionProbe-10.exr index 91de818..8e8e29f 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-10.exr and b/Assets/Scenes/witwics/ReflectionProbe-10.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-11.exr b/Assets/Scenes/witwics/ReflectionProbe-11.exr index c63df91..3addb3f 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-11.exr and b/Assets/Scenes/witwics/ReflectionProbe-11.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-12.exr b/Assets/Scenes/witwics/ReflectionProbe-12.exr index 58b7a53..3112011 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-12.exr and b/Assets/Scenes/witwics/ReflectionProbe-12.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-13.exr b/Assets/Scenes/witwics/ReflectionProbe-13.exr index 83531fb..a320ebd 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-13.exr and b/Assets/Scenes/witwics/ReflectionProbe-13.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-14.exr b/Assets/Scenes/witwics/ReflectionProbe-14.exr index 7b37cf5..9f741f5 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-14.exr and b/Assets/Scenes/witwics/ReflectionProbe-14.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-2.exr b/Assets/Scenes/witwics/ReflectionProbe-2.exr index ba5719f..501d2db 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 a14ac04..dc8ebd2 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-3.exr and b/Assets/Scenes/witwics/ReflectionProbe-3.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-4.exr b/Assets/Scenes/witwics/ReflectionProbe-4.exr index 38d19cc..fec495f 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-4.exr and b/Assets/Scenes/witwics/ReflectionProbe-4.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-5.exr b/Assets/Scenes/witwics/ReflectionProbe-5.exr index 0cc72d1..40f29ac 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-5.exr and b/Assets/Scenes/witwics/ReflectionProbe-5.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-6.exr b/Assets/Scenes/witwics/ReflectionProbe-6.exr index 7d21461..7662aa9 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-6.exr and b/Assets/Scenes/witwics/ReflectionProbe-6.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-7.exr b/Assets/Scenes/witwics/ReflectionProbe-7.exr index eb4d01e..27618d5 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-7.exr and b/Assets/Scenes/witwics/ReflectionProbe-7.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-8.exr b/Assets/Scenes/witwics/ReflectionProbe-8.exr index 0060e7a..6bc31a9 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-8.exr and b/Assets/Scenes/witwics/ReflectionProbe-8.exr differ diff --git a/Assets/Scenes/witwics/ReflectionProbe-9.exr b/Assets/Scenes/witwics/ReflectionProbe-9.exr index 22ad35b..551974b 100644 Binary files a/Assets/Scenes/witwics/ReflectionProbe-9.exr and b/Assets/Scenes/witwics/ReflectionProbe-9.exr differ diff --git a/Assets/Textures/T_BellLogo_SDF.png.meta b/Assets/Textures/T_BellLogo_SDF.png.meta index b528e92..30cbd5f 100644 --- a/Assets/Textures/T_BellLogo_SDF.png.meta +++ b/Assets/Textures/T_BellLogo_SDF.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 12 mipmaps: mipMapMode: 1 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 0 linearTexture: 0 fadeOut: 0 @@ -69,7 +69,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 128 + maxTextureSize: 64 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 diff --git a/Assets/UdonSharp/ACMEBugnetAlert.asset b/Assets/UdonSharp/ACMEBugnetAlert.asset new file mode 100644 index 0000000..674c53f --- /dev/null +++ b/Assets/UdonSharp/ACMEBugnetAlert.asset @@ -0,0 +1,356 @@ +%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: ACMEBugnetAlert + m_EditorClassIdentifier: + serializedUdonProgramAsset: {fileID: 11400000, guid: f9311ea04773f404d983464aa492b492, + type: 2} + udonAssembly: + assemblyError: + sourceCsScript: {fileID: 11500000, guid: c5902c1aa04e01c4fb9b5622b71b5677, type: 3} + scriptVersion: 2 + compiledVersion: 2 + behaviourSyncMode: 4 + hasInteractEvent: 0 + scriptID: -3862002438904952836 + 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: _LampMesh + - Name: $v + Entry: 7 + Data: 2|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LampMesh + - Name: k__BackingField + Entry: 7 + Data: 3|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.MeshRenderer, UnityEngine.CoreModule + - 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: 7 + Data: + - Name: $k + Entry: 1 + Data: _LampMaterialSlot + - Name: $v + Entry: 7 + Data: 6|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LampMaterialSlot + - Name: k__BackingField + Entry: 7 + Data: 7|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Int32, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 7 + - 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: 8|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 9|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: _UnlitMaterial + - Name: $v + Entry: 7 + Data: 10|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _UnlitMaterial + - Name: k__BackingField + Entry: 7 + Data: 11|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Material, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 11 + - 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: 12|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 2 + - Name: + Entry: 7 + Data: 13|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + - Name: height + Entry: 4 + Data: 8 + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: 14|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: _LitMaterial + - Name: $v + Entry: 7 + Data: 15|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LitMaterial + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 9 + Data: 11 + - Name: k__BackingField + Entry: 7 + Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib + - Name: + Entry: 6 + Data: + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 5 + Data: true + - Name: _fieldAttributes + Entry: 7 + Data: 16|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 17|UnityEngine.SerializeField, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: + Entry: 13 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 8 + Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _IsLit + - Name: $v + Entry: 7 + Data: 18|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _IsLit + - Name: k__BackingField + Entry: 7 + Data: 19|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: System.Boolean, mscorlib + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 19 + - 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: 20|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 21|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/ACMEBugnetAlert.asset.meta b/Assets/UdonSharp/ACMEBugnetAlert.asset.meta new file mode 100644 index 0000000..2a7dcda --- /dev/null +++ b/Assets/UdonSharp/ACMEBugnetAlert.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4e2aa45f8c7c5e34baa72b21310347c0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/ACMEBugnetAlert.cs b/Assets/UdonSharp/ACMEBugnetAlert.cs new file mode 100644 index 0000000..bd747e5 --- /dev/null +++ b/Assets/UdonSharp/ACMEBugnetAlert.cs @@ -0,0 +1,41 @@ + +using UdonSharp; +using UnityEngine; +using VRC.SDKBase; +using VRC.Udon; +using VRC.Udon.Common; + + +[UdonBehaviourSyncMode(BehaviourSyncMode.Manual)] +public class ACMEBugnetAlert : UdonSharpBehaviour +{ + [SerializeField] private MeshRenderer _LampMesh; + [SerializeField] private int _LampMaterialSlot = 0; + [Space] + [SerializeField] private Material _UnlitMaterial; + [SerializeField] private Material _LitMaterial; + + [UdonSynced] private bool _IsLit = false; + + + public override void OnDeserialization(DeserializationResult Result) + { + _SetLit_Synced(); + + base.OnDeserialization(Result); + } + + + public void SetLit(bool Lit) + { + _IsLit = Lit; + _SetLit_Synced(); + RequestSerialization(); + } + private void _SetLit_Synced() + { + Material[] LampMaterials = _LampMesh.materials; + LampMaterials[_LampMaterialSlot] = _IsLit ? _LitMaterial : _UnlitMaterial; + _LampMesh.materials = LampMaterials; + } +} diff --git a/Assets/UdonSharp/ACMEBugnetAlert.cs.meta b/Assets/UdonSharp/ACMEBugnetAlert.cs.meta new file mode 100644 index 0000000..bc5f0fa --- /dev/null +++ b/Assets/UdonSharp/ACMEBugnetAlert.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c5902c1aa04e01c4fb9b5622b71b5677 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/UdonSharp/Game Managers/CaseManager.asset b/Assets/UdonSharp/Game Managers/CaseManager.asset index 0334e01..f00d018 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.asset +++ b/Assets/UdonSharp/Game Managers/CaseManager.asset @@ -44,7 +44,7 @@ MonoBehaviour: Data: - Name: Entry: 12 - Data: 31 + Data: 32 - Name: Entry: 7 Data: @@ -1645,16 +1645,71 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _FinalRoundContinent + Data: _Round2Destination - Name: $v Entry: 7 Data: 108|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _Round2Destination + - Name: k__BackingField + Entry: 9 + Data: 88 + - Name: k__BackingField + Entry: 9 + Data: 88 + - 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: 109|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 110|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: _FinalRoundContinent + - Name: $v + Entry: 7 + Data: 111|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _FinalRoundContinent - Name: k__BackingField Entry: 7 - Data: 109|System.RuntimeType, mscorlib + Data: 112|System.RuntimeType, mscorlib - Name: Entry: 1 Data: ContinentMap, Assembly-CSharp @@ -1678,14 +1733,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 110|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 113|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 111|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 114|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1709,13 +1764,13 @@ MonoBehaviour: Data: _CurrentWinningPlayers - Name: $v Entry: 7 - Data: 112|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 115|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _CurrentWinningPlayers - Name: k__BackingField Entry: 7 - Data: 113|System.RuntimeType, mscorlib + Data: 116|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.String[], mscorlib @@ -1724,7 +1779,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 113 + Data: 116 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -1739,14 +1794,14 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 114|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 117|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 1 - Name: Entry: 7 - Data: 115|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime + Data: 118|UdonSharp.UdonSyncedAttribute, UdonSharp.Runtime - Name: Entry: 8 Data: @@ -1768,73 +1823,18 @@ MonoBehaviour: - Name: $k Entry: 1 Data: _CaseFileDictionary - - Name: $v - Entry: 7 - Data: 116|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _CaseFileDictionary - - Name: k__BackingField - Entry: 7 - Data: 117|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 117 - - 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: 118|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: _LootImageDownloader - Name: $v Entry: 7 Data: 119|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LootImageDownloader + Data: _CaseFileDictionary - Name: k__BackingField Entry: 7 Data: 120|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 + Data: VRC.SDK3.Data.DataDictionary, VRCSDK3 - Name: Entry: 8 Data: @@ -1877,19 +1877,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LootImageTexture + Data: _LootImageDownloader - Name: $v Entry: 7 Data: 122|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LootImageTexture + Data: _LootImageDownloader - Name: k__BackingField Entry: 7 Data: 123|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: UnityEngine.Texture2D, UnityEngine.CoreModule + Data: VRC.SDK3.Image.VRCImageDownloader, VRCSDK3 - Name: Entry: 8 Data: @@ -1927,6 +1927,61 @@ MonoBehaviour: - Name: Entry: 8 Data: + - Name: + Entry: 7 + Data: + - Name: $k + Entry: 1 + Data: _LootImageTexture + - Name: $v + Entry: 7 + Data: 125|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LootImageTexture + - Name: k__BackingField + Entry: 7 + Data: 126|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Texture2D, UnityEngine.CoreModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 126 + - 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: 127|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: 13 Data: diff --git a/Assets/UdonSharp/Game Managers/CaseManager.cs b/Assets/UdonSharp/Game Managers/CaseManager.cs index 6dfa0a2..ead00ac 100644 --- a/Assets/UdonSharp/Game Managers/CaseManager.cs +++ b/Assets/UdonSharp/Game Managers/CaseManager.cs @@ -64,6 +64,7 @@ public class CaseManager : UdonSharpBehaviour [UdonSynced] private string _StolenLoot = ""; [UdonSynced] private AccusedCrook _AccusedCrook = AccusedCrook.INDEX_MAX; + [UdonSynced] private string _Round2Destination = ""; [UdonSynced] private ContinentMap _FinalRoundContinent = ContinentMap.INDEX_MAX; [UdonSynced] private string[] _CurrentWinningPlayers = new string[0]; @@ -172,15 +173,14 @@ public class CaseManager : UdonSharpBehaviour _StolenLoot = _CaseFileDictionary["Stolen Loot"].String; _AccusedCrook = (AccusedCrook)(int)_CaseFileDictionary["Accused Crook"].Number; - if (_CaseFileDictionary.ContainsKey("Intro Video")) - { - _CaseIntroVideo = (int)_CaseFileDictionary["Intro Video"].Number; - } + _CaseIntroVideo = + _CaseFileDictionary.ContainsKey("Intro Video") + ? (int)_CaseFileDictionary["Intro Video"].Number + : -1; - if (_CaseFileDictionary.ContainsKey("Intro Video Transcript")) - { - _CaseIntroVideoTranscript = _CaseFileDictionary["Intro Video Transcript"].String; - } + _CaseIntroVideoTranscript = _CaseFileDictionary.ContainsKey("Intro Video Transcript") + ? _CaseFileDictionary["Intro Video Transcript"].String + : ""; if (_CaseFileDictionary.ContainsKey("Round 1") && _CaseFileDictionary.ContainsKey("Round 2") && _CaseFileDictionary.ContainsKey("Round 3")) { @@ -197,7 +197,15 @@ public class CaseManager : UdonSharpBehaviour // Attempt to load Round 2 data if (_CaseFileDictionary["Round 2"].TokenType == TokenType.DataDictionary) { - _Round2Manager.LoadQuestionData(_CaseFileDictionary["Round 2"]); + DataToken Round2Dictionary = _CaseFileDictionary["Round 2"]; + + _Round2Manager.LoadQuestionData(Round2Dictionary); + + // Get the Round 2 destination so we can reference it in Round 1 + _Round2Destination = + Round2Dictionary.DataDictionary.ContainsKey("Location") + ? Round2Dictionary.DataDictionary["Location"].String + : ""; } else { @@ -207,10 +215,12 @@ public class CaseManager : UdonSharpBehaviour // Attempt to load Round 3 data if (_CaseFileDictionary["Round 3"].TokenType == TokenType.DataDictionary) { - _Round3Manager.LoadQuestionData(_CaseFileDictionary["Round 3"]); + DataToken Round3Dictionary = _CaseFileDictionary["Round 3"]; + + _Round3Manager.LoadQuestionData(Round3Dictionary); // Get the final round continent so we can reference it in Round 2 - _FinalRoundContinent = (ContinentMap)(int)_CaseFileDictionary["Round 3"].DataDictionary["Continent"].Number; + _FinalRoundContinent = (ContinentMap)(int)Round3Dictionary.DataDictionary["Continent"].Number; } else { @@ -419,6 +429,11 @@ public class CaseManager : UdonSharpBehaviour return _CaseFileClueImages[ImageIndex]; } + public string GetRound2Destination() + { + return _Round2Destination; + } + public ContinentMap GetFinalRoundContinent() { return _FinalRoundContinent; diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.asset b/Assets/UdonSharp/Game Managers/GameManagerRound1.asset index 910c033..4e8b717 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: 38 + Data: 39 - Name: Entry: 7 Data: @@ -1957,19 +1957,19 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _Modem + Data: _ACMEBugnetAlert - Name: $v Entry: 7 Data: 124|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _Modem + Data: _ACMEBugnetAlert - Name: k__BackingField Entry: 7 Data: 125|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: Modem, Assembly-CSharp + Data: ACMEBugnetAlert, Assembly-CSharp - Name: Entry: 8 Data: @@ -2018,25 +2018,25 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _ArrivalDisplays + Data: _Modem - Name: $v Entry: 7 Data: 128|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _ArrivalDisplays + Data: _Modem - Name: k__BackingField Entry: 7 Data: 129|System.RuntimeType, mscorlib - Name: Entry: 1 - Data: ArrivalDisplay[], Assembly-CSharp + Data: Modem, Assembly-CSharp - Name: Entry: 8 Data: - Name: k__BackingField Entry: 9 - Data: 98 + Data: 4 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2079,16 +2079,77 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _LightningRoundEffects + Data: _ArrivalDisplays - Name: $v Entry: 7 Data: 132|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _LightningRoundEffects + Data: _ArrivalDisplays - Name: k__BackingField Entry: 7 Data: 133|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: ArrivalDisplay[], Assembly-CSharp + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 98 + - 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: 134|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 135|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: _LightningRoundEffects + - Name: $v + Entry: 7 + Data: 136|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _LightningRoundEffects + - Name: k__BackingField + Entry: 7 + Data: 137|System.RuntimeType, mscorlib - Name: Entry: 1 Data: LightningRoundEffectsController, Assembly-CSharp @@ -2112,14 +2173,14 @@ MonoBehaviour: Data: true - Name: _fieldAttributes Entry: 7 - Data: 134|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 138|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 Data: 3 - Name: Entry: 7 - Data: 135|UnityEngine.SpaceAttribute, UnityEngine.CoreModule + Data: 139|UnityEngine.SpaceAttribute, UnityEngine.CoreModule - Name: height Entry: 4 Data: 8 @@ -2128,74 +2189,13 @@ MonoBehaviour: Data: - Name: Entry: 7 - Data: 136|UnityEngine.HeaderAttribute, UnityEngine.CoreModule + Data: 140|UnityEngine.HeaderAttribute, UnityEngine.CoreModule - Name: header Entry: 1 Data: Effects - Name: Entry: 8 Data: - - Name: - Entry: 7 - Data: 137|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: _TheChaseAnimator - - Name: $v - Entry: 7 - Data: 138|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - - Name: k__BackingField - Entry: 1 - Data: _TheChaseAnimator - - Name: k__BackingField - Entry: 7 - Data: 139|System.RuntimeType, mscorlib - - Name: - Entry: 1 - Data: UnityEngine.Animator, UnityEngine.AnimationModule - - Name: - Entry: 8 - Data: - - Name: k__BackingField - Entry: 9 - Data: 139 - - 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: 140|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], - mscorlib - - Name: - Entry: 12 - Data: 1 - Name: Entry: 7 Data: 141|UnityEngine.SerializeField, UnityEngine.CoreModule @@ -2219,16 +2219,77 @@ MonoBehaviour: Data: - Name: $k Entry: 1 - Data: _CameraControllerRound1 + Data: _TheChaseAnimator - Name: $v Entry: 7 Data: 142|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 - Data: _CameraControllerRound1 + Data: _TheChaseAnimator - Name: k__BackingField Entry: 7 Data: 143|System.RuntimeType, mscorlib + - Name: + Entry: 1 + Data: UnityEngine.Animator, UnityEngine.AnimationModule + - Name: + Entry: 8 + Data: + - Name: k__BackingField + Entry: 9 + Data: 143 + - 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: 144|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + mscorlib + - Name: + Entry: 12 + Data: 1 + - Name: + Entry: 7 + Data: 145|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: _CameraControllerRound1 + - Name: $v + Entry: 7 + Data: 146|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + - Name: k__BackingField + Entry: 1 + Data: _CameraControllerRound1 + - Name: k__BackingField + Entry: 7 + Data: 147|System.RuntimeType, mscorlib - Name: Entry: 1 Data: CameraControllerRound1, Assembly-CSharp @@ -2252,7 +2313,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 144|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 148|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 @@ -2277,13 +2338,13 @@ MonoBehaviour: Data: _VideoPlayerTimer - Name: $v Entry: 7 - Data: 145|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor + Data: 149|UdonSharp.Compiler.FieldDefinition, UdonSharp.Editor - Name: k__BackingField Entry: 1 Data: _VideoPlayerTimer - Name: k__BackingField Entry: 7 - Data: 146|System.RuntimeType, mscorlib + Data: 150|System.RuntimeType, mscorlib - Name: Entry: 1 Data: System.Single, mscorlib @@ -2292,7 +2353,7 @@ MonoBehaviour: Data: - Name: k__BackingField Entry: 9 - Data: 146 + Data: 150 - Name: k__BackingField Entry: 7 Data: System.Nullable`1[[UdonSharp.UdonSyncMode, UdonSharp.Runtime]], mscorlib @@ -2307,7 +2368,7 @@ MonoBehaviour: Data: false - Name: _fieldAttributes Entry: 7 - Data: 147|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], + Data: 151|System.Collections.Generic.List`1[[System.Attribute, mscorlib]], mscorlib - Name: Entry: 12 diff --git a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs index c2e2003..afced7d 100644 --- a/Assets/UdonSharp/Game Managers/GameManagerRound1.cs +++ b/Assets/UdonSharp/Game Managers/GameManagerRound1.cs @@ -52,6 +52,7 @@ public class GameManagerRound1 : GameManagerBase [SerializeField] private VideoMusicClueSkateboard _VideoMusicClueSkateboard; [SerializeField] private DetectiveNoirEffect _DetectiveNoirEffect; [SerializeField] private FilingCabinet _FilingCabinet; + [SerializeField] private ACMEBugnetAlert _ACMEBugnetAlert; [SerializeField] private Modem _Modem; [SerializeField] private ArrivalDisplay[] _ArrivalDisplays; @@ -150,6 +151,7 @@ public class GameManagerRound1 : GameManagerBase Networking.SetOwner(NewOwner, _VideoMusicClueSkateboard.gameObject); Networking.SetOwner(NewOwner, _DetectiveNoirEffect.gameObject); Networking.SetOwner(NewOwner, _FilingCabinet.gameObject); + Networking.SetOwner(NewOwner, _ACMEBugnetAlert.gameObject); Networking.SetOwner(NewOwner, _Modem.gameObject); foreach (ArrivalDisplay Display in _ArrivalDisplays) @@ -1500,7 +1502,7 @@ public class GameManagerRound1 : GameManagerBase HostCardBetweenRoundsInterface Interface = (HostCardBetweenRoundsInterface)GetHostCardInterface(RoundSegmentType.BetweenSegments); Interface.HeaderUI.text = "Round is over."; - Interface.CommentUI.text = "Everybody enter the Modem"; + Interface.CommentUI.text = "Everybody enter the Modem; We're heading to " + _CaseManager.GetRound2Destination(); _AudioManager.SendCustomNetworkEvent(NetworkEventTarget.All, "PlayMusicLoop", MusicEventType.CapitalLoop); diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index d925021..ba6209e 100644 --- a/ProjectSettings/AudioManager.asset +++ b/ProjectSettings/AudioManager.asset @@ -10,8 +10,8 @@ AudioManager: Default Speaker Mode: 2 m_SampleRate: 48000 m_DSPBufferSize: 1024 - m_VirtualVoiceCount: 32 - m_RealVoiceCount: 24 + m_VirtualVoiceCount: 64 + m_RealVoiceCount: 32 m_EnableOutputSuspension: 1 m_SpatializerPlugin: OculusSpatializer m_AmbisonicDecoderPlugin: OculusSpatializer diff --git a/Raw Files/WarningLight.blend b/Raw Files/WarningLight.blend index 3b51065..7701624 100644 Binary files a/Raw Files/WarningLight.blend and b/Raw Files/WarningLight.blend differ