diff --git a/SCHIZO/Resources/AssetBundles/Assets.cs b/SCHIZO/Resources/AssetBundles/Assets.cs index e16e02f5..6ae36e98 100644 --- a/SCHIZO/Resources/AssetBundles/Assets.cs +++ b/SCHIZO/Resources/AssetBundles/Assets.cs @@ -12,7 +12,7 @@ namespace SCHIZO.Resources; public static class Assets { - private const int _rnd = 488613676; + private const int _rnd = -474431403; private static readonly UnityEngine.AssetBundle _a = ResourceManager.GetAssetBundle("assets"); diff --git a/SCHIZO/Resources/AssetBundles/assets b/SCHIZO/Resources/AssetBundles/assets index dde70049..a946eb19 100644 Binary files a/SCHIZO/Resources/AssetBundles/assets and b/SCHIZO/Resources/AssetBundles/assets differ diff --git a/Unity/Assets/Mod/Jukebox/TruckersFM/TruckersFM.asset b/Unity/Assets/Mod/Jukebox/TruckersFM/TruckersFM.asset index 9952cab5..1aa42d4a 100644 --- a/Unity/Assets/Mod/Jukebox/TruckersFM/TruckersFM.asset +++ b/Unity/Assets/Mod/Jukebox/TruckersFM/TruckersFM.asset @@ -15,7 +15,7 @@ MonoBehaviour: identifier: TruckersFM source: 2 audioClip: {fileID: 0} - fmodEvent: + fmodEvent: url: http://radio.truckers.fm isStream: 1 streamLabelFormat: 'TruckersFM @@ -24,7 +24,8 @@ MonoBehaviour: overrideTrackLabel: 0 trackLabel: TruckersFM unlockedOnStart: 0 - diskPrefab: {fileID: 0} + diskPrefab: {fileID: 38736133463817561, guid: b451605680c7d0247a76ac6cc7b8be9a, + type: 3} diskSpawnLocation: position: {x: -369.3, y: -174.6, z: -319.7} rotation: {x: 9.7, y: 7.5, z: 9.4} diff --git a/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab b/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab new file mode 100644 index 00000000..7c49aac1 --- /dev/null +++ b/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab @@ -0,0 +1,76 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &6525880274626874321 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4691052849724364637, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 68c4bf79f01ae85468c245feb1519c49, type: 2} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalPosition.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalRotation.x + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalRotation.y + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalRotation.z + value: -0.5 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5859987316805233714, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 6492233284419335816, guid: d22ec62c611ee7545b0126d2a612b118, + type: 3} + propertyPath: m_Name + value: cog disk + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d22ec62c611ee7545b0126d2a612b118, type: 3} diff --git a/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab.meta b/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab.meta new file mode 100644 index 00000000..da338bc2 --- /dev/null +++ b/Unity/Assets/Mod/Jukebox/TruckersFM/cog disk truckersfm.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: b451605680c7d0247a76ac6cc7b8be9a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Mod/Jukebox/cog disk/materials/disk image truckersfm.mat b/Unity/Assets/Mod/Jukebox/cog disk/materials/disk image truckersfm.mat new file mode 100644 index 00000000..ec84e224 --- /dev/null +++ b/Unity/Assets/Mod/Jukebox/cog disk/materials/disk image truckersfm.mat @@ -0,0 +1,82 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: disk image truckersfm + m_Shader: {fileID: 45, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + 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: 507cdfe895662f244bb5634d8f29449c, type: 3} + m_Scale: {x: 1, y: 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.024 + - _GlossyReflections: 1 + - _Metallic: 0.216 + - _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} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} diff --git a/Unity/Assets/Mod/Jukebox/cog disk/materials/disk image truckersfm.mat.meta b/Unity/Assets/Mod/Jukebox/cog disk/materials/disk image truckersfm.mat.meta new file mode 100644 index 00000000..8f47681f --- /dev/null +++ b/Unity/Assets/Mod/Jukebox/cog disk/materials/disk image truckersfm.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 68c4bf79f01ae85468c245feb1519c49 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Mod/Jukebox/cog disk/textures/Screenshot_18.png.meta b/Unity/Assets/Mod/Jukebox/cog disk/textures/Screenshot_18.png.meta index 4ee3582d..4410d12a 100644 --- a/Unity/Assets/Mod/Jukebox/cog disk/textures/Screenshot_18.png.meta +++ b/Unity/Assets/Mod/Jukebox/cog disk/textures/Screenshot_18.png.meta @@ -6,7 +6,7 @@ TextureImporter: serializedVersion: 11 mipmaps: mipMapMode: 0 - enableMipMap: 1 + enableMipMap: 0 sRGBTexture: 1 linearTexture: 0 fadeOut: 0 @@ -71,6 +71,18 @@ TextureImporter: overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Unity/Assets/Mod/Jukebox/cog disk/textures/truckersfm disk image.jpg b/Unity/Assets/Mod/Jukebox/cog disk/textures/truckersfm disk image.jpg new file mode 100644 index 00000000..f33dd552 Binary files /dev/null and b/Unity/Assets/Mod/Jukebox/cog disk/textures/truckersfm disk image.jpg differ diff --git a/Unity/Assets/Mod/Jukebox/cog disk/textures/truckersfm disk image.jpg.meta b/Unity/Assets/Mod/Jukebox/cog disk/textures/truckersfm disk image.jpg.meta new file mode 100644 index 00000000..2e2632e7 --- /dev/null +++ b/Unity/Assets/Mod/Jukebox/cog disk/textures/truckersfm disk image.jpg.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: 507cdfe895662f244bb5634d8f29449c +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 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: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + 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: 0 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 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 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: