diff --git a/Assets/Resources/Sfx/games/djSchool/boo.wav.meta b/Assets/Resources/Sfx/games/djSchool/boo.wav.meta index 9af13bef1..57781c97e 100644 --- a/Assets/Resources/Sfx/games/djSchool/boo.wav.meta +++ b/Assets/Resources/Sfx/games/djSchool/boo.wav.meta @@ -18,5 +18,5 @@ AudioImporter: ambisonic: 0 3D: 1 userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJSchool/Animations.meta b/Assets/Resources/Sprites/Games/DJSchool/Animations.meta index 993ee15fb..fee925ddc 100644 --- a/Assets/Resources/Sprites/Games/DJSchool/Animations.meta +++ b/Assets/Resources/Sprites/Games/DJSchool/Animations.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJSchool/background.png.meta b/Assets/Resources/Sprites/Games/DJSchool/background.png.meta index 312c2888b..8168d4ee6 100644 --- a/Assets/Resources/Sprites/Games/DJSchool/background.png.meta +++ b/Assets/Resources/Sprites/Games/DJSchool/background.png.meta @@ -3,7 +3,7 @@ guid: e00f7b9371057fc48bae850664c3e879 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -87,6 +89,18 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + 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: [] @@ -100,6 +114,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/DJSchool/djYellow.meta b/Assets/Resources/Sprites/Games/DJSchool/djYellow.meta index 0de93e8e6..86a614dc3 100644 --- a/Assets/Resources/Sprites/Games/DJSchool/djYellow.meta +++ b/Assets/Resources/Sprites/Games/DJSchool/djYellow.meta @@ -4,5 +4,5 @@ folderAsset: yes DefaultImporter: externalObjects: {} userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Resources/Sprites/Games/DJSchool/flash.png.meta b/Assets/Resources/Sprites/Games/DJSchool/flash.png.meta index 12ccf55e7..849e49497 100644 --- a/Assets/Resources/Sprites/Games/DJSchool/flash.png.meta +++ b/Assets/Resources/Sprites/Games/DJSchool/flash.png.meta @@ -3,7 +3,7 @@ guid: 16363667eb8772f4ab686ef69a0d1e40 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,30 @@ 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 + - serializedVersion: 3 + buildTarget: Server + 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: [] @@ -88,6 +114,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/DJSchool/slam.png.meta b/Assets/Resources/Sprites/Games/DJSchool/slam.png.meta index cb9d0aab8..45207258f 100644 --- a/Assets/Resources/Sprites/Games/DJSchool/slam.png.meta +++ b/Assets/Resources/Sprites/Games/DJSchool/slam.png.meta @@ -3,7 +3,7 @@ guid: 82b35bd6b6a2d9d4c90a3c5a8dc4ef91 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,30 @@ 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 + - serializedVersion: 3 + buildTarget: Server + 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: [] @@ -88,6 +114,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/DJSchool/table.png.meta b/Assets/Resources/Sprites/Games/DJSchool/table.png.meta index d12213c72..9558ea28d 100644 --- a/Assets/Resources/Sprites/Games/DJSchool/table.png.meta +++ b/Assets/Resources/Sprites/Games/DJSchool/table.png.meta @@ -3,7 +3,7 @@ guid: 14370324759ca6142a5b3cf7bb735445 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,30 @@ 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 + - serializedVersion: 3 + buildTarget: Server + 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: [] @@ -88,6 +114,7 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Games/DJSchool/test.png.meta b/Assets/Resources/Sprites/Games/DJSchool/test.png.meta index ecba8f583..2bf6856f9 100644 --- a/Assets/Resources/Sprites/Games/DJSchool/test.png.meta +++ b/Assets/Resources/Sprites/Games/DJSchool/test.png.meta @@ -3,7 +3,7 @@ guid: ebe13dc7ec0dfaf49aa7bb9e583c0a21 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 11 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,6 +24,7 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 + ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -62,6 +63,7 @@ TextureImporter: textureFormatSet: 0 ignorePngGamma: 0 applyGammaDecoding: 0 + cookieLightType: 1 platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform @@ -75,6 +77,30 @@ 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 + - serializedVersion: 3 + buildTarget: Server + 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: [] @@ -88,9 +114,10 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 userData: - assetBundleName: + assetBundleName: ntrdj/common assetBundleVariant: diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 6d0c964c8..b459388b4 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -3577,7 +3577,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -289.15002, y: 2} + m_AnchoredPosition: {x: -289.15, y: 2} m_SizeDelta: {x: -578.29, y: 49.92} m_Pivot: {x: 0.5, y: 0} --- !u!114 &156962255 @@ -12875,7 +12875,7 @@ MonoBehaviour: m_HandleRect: {fileID: 704039020} m_Direction: 0 m_Value: 0 - m_Size: 0.1051881 + m_Size: 0.10518809 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -19328,8 +19328,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1589389272} m_HandleRect: {fileID: 1589389271} m_Direction: 2 - m_Value: 0 - m_Size: 0.9968537 + m_Value: 1 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -22774,7 +22774,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -408.98004, y: -17} + m_AnchoredPosition: {x: -408.97998, y: -17} m_SizeDelta: {x: -817.96, y: -46.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1121370303 @@ -23941,7 +23941,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 111.92248} + m_AnchoredPosition: {x: 0, y: 129.96861} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 @@ -32174,7 +32174,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1292844878} m_HandleRect: {fileID: 1292844877} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -35819,7 +35819,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: -84.98999} + m_AnchoredPosition: {x: 0, y: -84.98996} m_SizeDelta: {x: 320, y: -84.99} m_Pivot: {x: 0, y: 1} --- !u!1 &1852819572 diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 865d11969..17b0d4b43 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index 69b3cafc8..351c22b68 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 599442165 +CRC: 1614830825 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/ntrdj/common b/Assets/StreamingAssets/ntrdj/common index 14081fcd4..49dd563ae 100644 Binary files a/Assets/StreamingAssets/ntrdj/common and b/Assets/StreamingAssets/ntrdj/common differ diff --git a/Assets/StreamingAssets/ntrdj/common.manifest b/Assets/StreamingAssets/ntrdj/common.manifest index 9f6f371a4..4d32f5531 100644 --- a/Assets/StreamingAssets/ntrdj/common.manifest +++ b/Assets/StreamingAssets/ntrdj/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 4176469889 +CRC: 3791351762 Hashes: AssetFileHash: serializedVersion: 2 - Hash: a210ca1948ff492c6d73555149fe9bc9 + Hash: a0bcda543b0365fff6d4c1c944ad4f2b TypeTreeHash: serializedVersion: 2 Hash: aa4e522fd1136788371ab66bc52daa28 @@ -43,12 +43,14 @@ SerializeReferenceClassIdentifiers: [] Assets: - Assets/Resources/Sprites/Games/DoubleDate/Animations/Boy.controller - Assets/Resources/Sfx/games/djSchool/letsGo2.ogg +- Assets/Resources/Sprites/Games/DJSchool/djYellow/dj-yellow.png - Assets/Resources/Sfx/games/djSchool/andStop1.ogg - Assets/Resources/Sfx/games/djSchool/breakCmonLoud2.ogg - Assets/Resources/Sfx/games/djSchool/ohYeahAlt1.ogg - Assets/Resources/Sfx/games/djSchool/checkItOut2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/IdleBop.anim - Assets/Resources/Sprites/Games/DoubleDate/Animations/IdleBop2.anim +- Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/Student_Turntable_Swipe.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Hold.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hey.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Scratcho2.anim @@ -82,6 +84,7 @@ Assets: - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/Student.controller - Assets/Resources/Sprites/Games/DJSchool/Animations/FlashInverse.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/flash.controller +- Assets/Resources/Sfx/games/djSchool/boo.wav - Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt1.ogg - Assets/Resources/Sfx/games/djSchool/breakCmonAlt1.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt3.ogg @@ -90,6 +93,7 @@ Assets: - Assets/Resources/Sprites/Games/DJSchool/student.png - Assets/Resources/Sfx/games/djSchool/ohYeah2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Flash.anim +- Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/Student_Turntable_Hold.anim - Assets/Resources/Sprites/Games/DJSchool/background.png - Assets/Resources/Sfx/games/djSchool/heyLoud.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt2.ogg @@ -97,13 +101,16 @@ Assets: - Assets/Resources/Sprites/Games/DJSchool/Animations/flashInverse.controller - Assets/Resources/Sfx/games/djSchool/recordSwipe.ogg - Assets/Resources/Games/djSchool.prefab +- Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/Student_Turntable_StartHold.anim - Assets/Resources/Sprites/Games/DJSchool/turntable.png - Assets/Resources/Sfx/games/djSchool/scratchoHeyAlt4.ogg - Assets/Resources/Sfx/games/djSchool/scratchoHey2.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/TurnTable_Player.controller - Assets/Resources/Sprites/Games/DJSchool/flash.png - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Idle.anim - Assets/Resources/Sfx/games/djSchool/ooh.ogg - Assets/Resources/Sfx/games/djSchool/letsGo.ogg +- Assets/Resources/Sprites/Games/DJSchool/Animations/Turntable/Student_Turntable_Idle.anim - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/Hold.anim - Assets/Resources/Sfx/games/djSchool/ohYeahAlt2.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/DJ Yellow/HoldBop.anim @@ -115,6 +122,7 @@ Assets: - Assets/Resources/Sfx/games/djSchool/oohLoud.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/HoldBop.anim - Assets/Resources/Sfx/games/djSchool/hey.ogg +- Assets/Resources/Sprites/Games/DJSchool/test.png - Assets/Resources/Sfx/games/djSchool/scratchoHeyLoud1.ogg - Assets/Resources/Sprites/Games/DJSchool/Animations/Student/IdleBop.anim Dependencies: []