diff --git a/Assets/Materials/ACME Logos.meta b/Assets/Materials/ACME Logos.meta new file mode 100644 index 0000000..fce8231 --- /dev/null +++ b/Assets/Materials/ACME Logos.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: fed7835d81876434dbd3ed10eb5e5888 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/ACME Crimenet Computer/M_ACMECrimenetComputerLogo.mat b/Assets/Materials/ACME Logos/M_ACMECrimenetComputerLogo.mat similarity index 100% rename from Assets/Materials/ACME Crimenet Computer/M_ACMECrimenetComputerLogo.mat rename to Assets/Materials/ACME Logos/M_ACMECrimenetComputerLogo.mat diff --git a/Assets/Materials/ACME Crimenet Computer/M_ACMECrimenetComputerLogo.mat.meta b/Assets/Materials/ACME Logos/M_ACMECrimenetComputerLogo.mat.meta similarity index 100% rename from Assets/Materials/ACME Crimenet Computer/M_ACMECrimenetComputerLogo.mat.meta rename to Assets/Materials/ACME Logos/M_ACMECrimenetComputerLogo.mat.meta diff --git a/Assets/Materials/M_ACMECrimenetDecal.mat b/Assets/Materials/ACME Logos/M_ACMECrimenetDecal.mat similarity index 100% rename from Assets/Materials/M_ACMECrimenetDecal.mat rename to Assets/Materials/ACME Logos/M_ACMECrimenetDecal.mat diff --git a/Assets/Materials/M_ACMECrimenetDecal.mat.meta b/Assets/Materials/ACME Logos/M_ACMECrimenetDecal.mat.meta similarity index 100% rename from Assets/Materials/M_ACMECrimenetDecal.mat.meta rename to Assets/Materials/ACME Logos/M_ACMECrimenetDecal.mat.meta diff --git a/Assets/Materials/M_ACMEPhonenetDecal.mat b/Assets/Materials/ACME Logos/M_ACMEPhonenetDecal.mat similarity index 87% rename from Assets/Materials/M_ACMEPhonenetDecal.mat rename to Assets/Materials/ACME Logos/M_ACMEPhonenetDecal.mat index 44fb78b..dcdbeae 100644 --- a/Assets/Materials/M_ACMEPhonenetDecal.mat +++ b/Assets/Materials/ACME Logos/M_ACMEPhonenetDecal.mat @@ -28,12 +28,12 @@ Material: m_TexEnvs: - _EmissionMap: m_Texture: {fileID: 0} - m_Scale: {x: 1.06, y: 1.09} - m_Offset: {x: -0.03, y: -0.095} + m_Scale: {x: 0.91, y: 1.12} + m_Offset: {x: 0.05, y: -0.095} - _MainTex: m_Texture: {fileID: 2800000, guid: 89f420a3c07bb454b842681100ab4570, type: 3} - m_Scale: {x: 1.06, y: 1.09} - m_Offset: {x: -0.03, y: -0.095} + m_Scale: {x: 0.91, y: 1.12} + m_Offset: {x: 0.05, y: -0.095} m_Ints: [] m_Floats: - _DstBlend: 10 diff --git a/Assets/Materials/M_ACMEPhonenetDecal.mat.meta b/Assets/Materials/ACME Logos/M_ACMEPhonenetDecal.mat.meta similarity index 100% rename from Assets/Materials/M_ACMEPhonenetDecal.mat.meta rename to Assets/Materials/ACME Logos/M_ACMEPhonenetDecal.mat.meta diff --git a/Assets/Materials/Assorted/M_ACMEUmbrellanetLogo.mat b/Assets/Materials/ACME Logos/M_ACMEUmbrellanetLogo.mat similarity index 100% rename from Assets/Materials/Assorted/M_ACMEUmbrellanetLogo.mat rename to Assets/Materials/ACME Logos/M_ACMEUmbrellanetLogo.mat diff --git a/Assets/Materials/Assorted/M_ACMEUmbrellanetLogo.mat.meta b/Assets/Materials/ACME Logos/M_ACMEUmbrellanetLogo.mat.meta similarity index 100% rename from Assets/Materials/Assorted/M_ACMEUmbrellanetLogo.mat.meta rename to Assets/Materials/ACME Logos/M_ACMEUmbrellanetLogo.mat.meta diff --git a/Assets/Materials/M_AcmeControlnetDoorDecal.mat b/Assets/Materials/ACME Logos/M_AcmeControlnetDoorDecal.mat similarity index 100% rename from Assets/Materials/M_AcmeControlnetDoorDecal.mat rename to Assets/Materials/ACME Logos/M_AcmeControlnetDoorDecal.mat diff --git a/Assets/Materials/M_AcmeControlnetDoorDecal.mat.meta b/Assets/Materials/ACME Logos/M_AcmeControlnetDoorDecal.mat.meta similarity index 100% rename from Assets/Materials/M_AcmeControlnetDoorDecal.mat.meta rename to Assets/Materials/ACME Logos/M_AcmeControlnetDoorDecal.mat.meta diff --git a/Assets/Materials/M_AcmeControlnetDoorDecalReverse.mat b/Assets/Materials/ACME Logos/M_AcmeControlnetDoorDecalReverse.mat similarity index 100% rename from Assets/Materials/M_AcmeControlnetDoorDecalReverse.mat rename to Assets/Materials/ACME Logos/M_AcmeControlnetDoorDecalReverse.mat diff --git a/Assets/Materials/M_AcmeControlnetDoorDecalReverse.mat.meta b/Assets/Materials/ACME Logos/M_AcmeControlnetDoorDecalReverse.mat.meta similarity index 100% rename from Assets/Materials/M_AcmeControlnetDoorDecalReverse.mat.meta rename to Assets/Materials/ACME Logos/M_AcmeControlnetDoorDecalReverse.mat.meta diff --git a/Assets/Materials/M_AcmeCrimenetDoorDecal.mat b/Assets/Materials/ACME Logos/M_AcmeCrimenetDoorDecal.mat similarity index 100% rename from Assets/Materials/M_AcmeCrimenetDoorDecal.mat rename to Assets/Materials/ACME Logos/M_AcmeCrimenetDoorDecal.mat diff --git a/Assets/Materials/M_AcmeCrimenetDoorDecal.mat.meta b/Assets/Materials/ACME Logos/M_AcmeCrimenetDoorDecal.mat.meta similarity index 100% rename from Assets/Materials/M_AcmeCrimenetDoorDecal.mat.meta rename to Assets/Materials/ACME Logos/M_AcmeCrimenetDoorDecal.mat.meta diff --git a/Assets/Materials/M_AcmeCrimenetDoorDecalReverse.mat b/Assets/Materials/ACME Logos/M_AcmeCrimenetDoorDecalReverse.mat similarity index 100% rename from Assets/Materials/M_AcmeCrimenetDoorDecalReverse.mat rename to Assets/Materials/ACME Logos/M_AcmeCrimenetDoorDecalReverse.mat diff --git a/Assets/Materials/M_AcmeCrimenetDoorDecalReverse.mat.meta b/Assets/Materials/ACME Logos/M_AcmeCrimenetDoorDecalReverse.mat.meta similarity index 100% rename from Assets/Materials/M_AcmeCrimenetDoorDecalReverse.mat.meta rename to Assets/Materials/ACME Logos/M_AcmeCrimenetDoorDecalReverse.mat.meta diff --git a/Assets/Scenes/witwics.unity b/Assets/Scenes/witwics.unity index b332357..55640d4 100644 --- a/Assets/Scenes/witwics.unity +++ b/Assets/Scenes/witwics.unity @@ -10129,18 +10129,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 172614115} m_PrefabAsset: {fileID: 0} ---- !u!114 &172614118 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1169644073640452379, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 172614115} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1951544800} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &172614119 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1255192616189574615, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -18396,18 +18384,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 609222593c2107c47884603707a4071a, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &481893953 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6121086720961081603, guid: 5066b3b269b691d458beae6cb7911193, - type: 3} - m_PrefabInstance: {fileID: 481893949} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 561914020} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &482748888 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5240237489455217984, guid: 126991d511ca61841a0ef899b6c038a6, @@ -19023,10 +18999,6 @@ MonoBehaviour: _PlayerMicrophone: {fileID: 431721603} _AudienceSilencer: {fileID: 344488391} _HostPositionMarker: {fileID: 596933552} - _PlayerPositionMarkers: - - {fileID: 4438766482650780792} - - {fileID: 172614118} - - {fileID: 937910640} _CameraController: {fileID: 1524477936} _TiebreakerData: url: https://witwics.actual.horse/static/TiebreakerData.json @@ -25449,18 +25421,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 723960303} m_PrefabAsset: {fileID: 0} ---- !u!114 &723960305 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 4105016280834921697, guid: 5473144ba0ee14a42bc806011eb0681b, - type: 3} - m_PrefabInstance: {fileID: 723960303} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 640178650} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &725965270 stripped GameObject: m_CorrespondingSourceObject: {fileID: 2424683995555794090, guid: 6587765855cbbb94c8cc3eb80d5956d6, @@ -29462,9 +29422,6 @@ MonoBehaviour: _PlayerMicrophone: {fileID: 51189182} _AudienceSilencer: {fileID: 344488391} _HostPositionMarker: {fileID: 551129936} - _PlayerPositionMarkers: - - {fileID: 6332640093748342309} - - {fileID: 481893953} _CameraController: {fileID: 1355919010} _PlayerPodiums: - {fileID: 1869102735} @@ -32130,18 +32087,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 937910637} m_PrefabAsset: {fileID: 0} ---- !u!114 &937910640 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1169644073640452379, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 937910637} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1030937701} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &937910641 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1255192616189574615, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -33618,8 +33563,6 @@ MonoBehaviour: _PlayerMicrophone: {fileID: 772205216} _AudienceSilencer: {fileID: 344488391} _HostPositionMarker: {fileID: 1892959904} - _PlayerPositionMarkers: - - {fileID: 723960305} _CameraController: {fileID: 1691482842} _Maps: - {fileID: 886213381} @@ -83777,18 +83720,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4438766482650780789} m_PrefabAsset: {fileID: 0} ---- !u!114 &4438766482650780792 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1169644073640452379, guid: 79ebe62246f7f464e98373cb14765f9a, - type: 3} - m_PrefabInstance: {fileID: 4438766482650780789} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1681321219} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &4438766482650780793 stripped GameObject: m_CorrespondingSourceObject: {fileID: 1255192616189574615, guid: 79ebe62246f7f464e98373cb14765f9a, @@ -87421,18 +87352,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5066b3b269b691d458beae6cb7911193, type: 3} ---- !u!114 &6332640093748342309 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6121086720961081603, guid: 5066b3b269b691d458beae6cb7911193, - type: 3} - m_PrefabInstance: {fileID: 6332640093748342308} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 425743403} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f09218772ba50c40af1b3aec63a6b55, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1001 &6597279250610392207 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Textures/ACME Logos.meta b/Assets/Textures/ACME Logos.meta new file mode 100644 index 0000000..ba6bff3 --- /dev/null +++ b/Assets/Textures/ACME Logos.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 821f2dcb1911901498872536b136b12e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Textures/T_AcmeControlnetDoorDecal.png b/Assets/Textures/ACME Logos/T_AcmeControlnetDoorDecal.png similarity index 100% rename from Assets/Textures/T_AcmeControlnetDoorDecal.png rename to Assets/Textures/ACME Logos/T_AcmeControlnetDoorDecal.png diff --git a/Assets/Textures/T_AcmeControlnetDoorDecal.png.meta b/Assets/Textures/ACME Logos/T_AcmeControlnetDoorDecal.png.meta similarity index 100% rename from Assets/Textures/T_AcmeControlnetDoorDecal.png.meta rename to Assets/Textures/ACME Logos/T_AcmeControlnetDoorDecal.png.meta diff --git a/Assets/Textures/T_AcmeCrimenet.png b/Assets/Textures/ACME Logos/T_AcmeCrimenet.png similarity index 100% rename from Assets/Textures/T_AcmeCrimenet.png rename to Assets/Textures/ACME Logos/T_AcmeCrimenet.png diff --git a/Assets/Textures/T_AcmeCrimenet.png.meta b/Assets/Textures/ACME Logos/T_AcmeCrimenet.png.meta similarity index 100% rename from Assets/Textures/T_AcmeCrimenet.png.meta rename to Assets/Textures/ACME Logos/T_AcmeCrimenet.png.meta diff --git a/Assets/Textures/T_AcmeCrimenetComputer.png b/Assets/Textures/ACME Logos/T_AcmeCrimenetComputer.png similarity index 100% rename from Assets/Textures/T_AcmeCrimenetComputer.png rename to Assets/Textures/ACME Logos/T_AcmeCrimenetComputer.png diff --git a/Assets/Textures/T_AcmeCrimenetComputer.png.meta b/Assets/Textures/ACME Logos/T_AcmeCrimenetComputer.png.meta similarity index 100% rename from Assets/Textures/T_AcmeCrimenetComputer.png.meta rename to Assets/Textures/ACME Logos/T_AcmeCrimenetComputer.png.meta diff --git a/Assets/Textures/T_AcmeCrimenetDoorDecal.png b/Assets/Textures/ACME Logos/T_AcmeCrimenetDoorDecal.png similarity index 100% rename from Assets/Textures/T_AcmeCrimenetDoorDecal.png rename to Assets/Textures/ACME Logos/T_AcmeCrimenetDoorDecal.png diff --git a/Assets/Textures/T_AcmeCrimenetDoorDecal.png.meta b/Assets/Textures/ACME Logos/T_AcmeCrimenetDoorDecal.png.meta similarity index 100% rename from Assets/Textures/T_AcmeCrimenetDoorDecal.png.meta rename to Assets/Textures/ACME Logos/T_AcmeCrimenetDoorDecal.png.meta diff --git a/Assets/Textures/ACME Logos/T_AcmePhonenet.png b/Assets/Textures/ACME Logos/T_AcmePhonenet.png new file mode 100644 index 0000000..3720ea5 Binary files /dev/null and b/Assets/Textures/ACME Logos/T_AcmePhonenet.png differ diff --git a/Assets/Textures/T_AcmePhonenet.png.meta b/Assets/Textures/ACME Logos/T_AcmePhonenet.png.meta similarity index 99% rename from Assets/Textures/T_AcmePhonenet.png.meta rename to Assets/Textures/ACME Logos/T_AcmePhonenet.png.meta index 5691747..21ac469 100644 --- a/Assets/Textures/T_AcmePhonenet.png.meta +++ b/Assets/Textures/ACME Logos/T_AcmePhonenet.png.meta @@ -73,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 - compressionQuality: 30 + compressionQuality: 12 crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 diff --git a/Assets/Textures/T_AcmeUmbrellanet.png b/Assets/Textures/ACME Logos/T_AcmeUmbrellanet.png similarity index 100% rename from Assets/Textures/T_AcmeUmbrellanet.png rename to Assets/Textures/ACME Logos/T_AcmeUmbrellanet.png diff --git a/Assets/Textures/T_AcmeUmbrellanet.png.meta b/Assets/Textures/ACME Logos/T_AcmeUmbrellanet.png.meta similarity index 99% rename from Assets/Textures/T_AcmeUmbrellanet.png.meta rename to Assets/Textures/ACME Logos/T_AcmeUmbrellanet.png.meta index f71c61c..53bd82e 100644 --- a/Assets/Textures/T_AcmeUmbrellanet.png.meta +++ b/Assets/Textures/ACME Logos/T_AcmeUmbrellanet.png.meta @@ -73,7 +73,7 @@ TextureImporter: resizeAlgorithm: 0 textureFormat: -1 textureCompression: 3 - compressionQuality: 15 + compressionQuality: 12 crunchedCompression: 1 allowsAlphaSplitting: 0 overridden: 0 diff --git a/Assets/Textures/T_AcmePhonenet.png b/Assets/Textures/T_AcmePhonenet.png deleted file mode 100644 index 85ef8ad..0000000 Binary files a/Assets/Textures/T_AcmePhonenet.png and /dev/null differ