diff --git a/Assets/Auto Letterbox/ForceCameraRatio.cs.meta b/Assets/Auto Letterbox/ForceCameraRatio.cs.meta index d31584d65..9a9e45c71 100644 --- a/Assets/Auto Letterbox/ForceCameraRatio.cs.meta +++ b/Assets/Auto Letterbox/ForceCameraRatio.cs.meta @@ -1,11 +1,10 @@ fileFormatVersion: 2 guid: e188ee899633d0b49870a5ae38b7359d -timeCreated: 1446557149 -licenseType: Store MonoImporter: + externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: -200 icon: {instanceID: 0} userData: assetBundleName: diff --git a/Assets/Resources/Games/fanClub.prefab b/Assets/Resources/Games/fanClub.prefab index 8bef962bd..688ecafbd 100644 --- a/Assets/Resources/Games/fanClub.prefab +++ b/Assets/Resources/Games/fanClub.prefab @@ -22477,7 +22477,7 @@ MonoBehaviour: - name: arisa_hai sequence: game: 1 - force: 0 + force: 1 clips: - clip: fanClub/arisa_hai_1_jp beat: 0 @@ -22485,18 +22485,21 @@ MonoBehaviour: volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/arisa_hai_2_jp beat: 1 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/arisa_hai_3_jp beat: 2 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - name: crowd_hai sequence: game: 1 @@ -22508,28 +22511,32 @@ MonoBehaviour: volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/crowd_hai_jp beat: 1 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/crowd_hai_jp beat: 2 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/crowd_hai_jp beat: 3 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - name: arisa_kamone sequence: game: 1 - force: 0 + force: 1 clips: - clip: fanClub/arisa_ka_jp beat: 0 @@ -22537,22 +22544,25 @@ MonoBehaviour: volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/arisa_mo_jp beat: 0.5 pitch: 1 volume: 1 looping: 0 offset: 0.07407407 + parameters: [] - clip: fanClub/arisa_ne_jp beat: 1 pitch: 1 volume: 1 looping: 0 offset: 0.07407407 + parameters: [] - name: arisa_kamone_fast sequence: game: 1 - force: 0 + force: 1 clips: - clip: fanClub/arisa_ka_fast_jp beat: 0 @@ -22560,18 +22570,21 @@ MonoBehaviour: volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/arisa_mo_fast_jp beat: 0.25 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/arisa_ne_fast_jp beat: 0.5 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - name: crowd_kamone sequence: game: 1 @@ -22583,28 +22596,32 @@ MonoBehaviour: volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/crowd_mo_jp beat: 1.5 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/crowd_ne_jp beat: 2 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - clip: fanClub/crowd_hey_jp beat: 3 pitch: 1 volume: 1 looping: 0 offset: 0 + parameters: [] - name: crowd_big_ready sequence: game: 1 - force: 0 + force: 1 clips: - clip: fanClub/crowd_big_ready beat: 0 @@ -22612,6 +22629,7 @@ MonoBehaviour: volume: 1 looping: 0 offset: 0 + parameters: [] EligibleHits: [] scheduledInputs: [] firstEnable: 0 diff --git a/Assets/Resources/Prefabs/Cameras.prefab b/Assets/Resources/Prefabs/Cameras.prefab index 37ea5abc3..b36714f5d 100644 --- a/Assets/Resources/Prefabs/Cameras.prefab +++ b/Assets/Resources/Prefabs/Cameras.prefab @@ -394,7 +394,7 @@ Camera: m_Depth: 1 m_CullingMask: serializedVersion: 2 - m_Bits: 8192 + m_Bits: 8256 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png index a379c88c4..19f00ff3d 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png and b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta index b2b56e1d5..d0460326e 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers.png.meta @@ -65,7 +65,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -77,7 +77,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png new file mode 100644 index 000000000..49beecbfd Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta new file mode 100644 index 000000000..c50a99ab7 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/RhythmTweezers_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: f622dabbce1b58d419efed3ab7225261 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png index d12066138..ce3495c50 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png and b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png.meta index 1ae2fbde5..74a242a5f 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline.png.meta @@ -65,10 +65,22 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png new file mode 100644 index 000000000..b9c07ecd7 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta new file mode 100644 index 000000000..7e41cb2c9 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/Tram&Pauline_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 7befd260d793b6b478549769d05cb4aa +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/airRally.png b/Assets/Resources/Sprites/Editor/GameIcons/airRally.png index ddc8bc658..0c24fecc4 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/airRally.png and b/Assets/Resources/Sprites/Editor/GameIcons/airRally.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/airRally.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/airRally.png.meta index 0aa33352d..a299ab9d1 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/airRally.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/airRally.png.meta @@ -65,7 +65,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -77,7 +77,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png new file mode 100644 index 000000000..6878f860a Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta new file mode 100644 index 000000000..362f4572c --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/airRally_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 4e9bec39b2c44ce418aace3773b40623 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png index babd52ed5..9efca822c 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png and b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta index 00ba97463..62039a56f 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS.png.meta @@ -65,7 +65,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -77,7 +77,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png new file mode 100644 index 000000000..43bf6cfbd Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta new file mode 100644 index 000000000..47ce7888f --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/builtToScaleDS_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: c0e61fc168761bd4b8b8682e69f93ee5 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png index 91eb79ace..37aa95356 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png and b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png.meta index b4471030f..30f6935da 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders.png.meta @@ -24,7 +24,6 @@ TextureImporter: streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 - ignoreMasterTextureLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -66,10 +65,22 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -89,7 +100,6 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] - nameFileIdTable: {} spritePackingTag: pSDRemoveMatte: 0 pSDShowRemoveMatteOption: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png new file mode 100644 index 000000000..067cc2be8 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta new file mode 100644 index 000000000..3ad233574 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/cheerReaders_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: e9fe1dd75c0972b4c95220e4dede6465 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png b/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png index d778ce71e..9f20892cd 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png and b/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png.meta index 44c5c5787..c94a7432c 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/coinToss.png.meta @@ -65,10 +65,22 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png new file mode 100644 index 000000000..4c7132301 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta new file mode 100644 index 000000000..16eaa707a --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/coinToss_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 26d6458b15558e94a8cb68cd1317725b +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png index 31403d039..7e882750f 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png and b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png.meta index eef918e0f..b2c581c56 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice.png.meta @@ -65,10 +65,10 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -77,10 +77,10 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png new file mode 100644 index 000000000..117309cbd Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta new file mode 100644 index 000000000..e9c981666 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/drummingPractice_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 70e9032a824658349afa27975544f4d9 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png b/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png index 7395ea880..d5cb050b1 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png and b/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png.meta index 2c11a49d7..733451939 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/firstContact.png.meta @@ -68,7 +68,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -80,7 +80,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/launch party.png b/Assets/Resources/Sprites/Editor/GameIcons/launch party.png index 166194156..e3aefeed3 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/launch party.png and b/Assets/Resources/Sprites/Editor/GameIcons/launch party.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/launch party.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/launch party.png.meta index 78e836323..39814fb58 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/launch party.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/launch party.png.meta @@ -65,10 +65,22 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png new file mode 100644 index 000000000..e3ba84e9e Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta new file mode 100644 index 000000000..065d6f5b3 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/launch party_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: ab5874f4cc6a71d4ebe7993657709e8c +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png index 3631bfa71..2c5f3e00d 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png and b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png.meta index 8d53089b2..0daf8cc0d 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders.png.meta @@ -65,10 +65,22 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png new file mode 100644 index 000000000..3834f9d12 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta new file mode 100644 index 000000000..13390a376 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/marchingOrders_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 0beebc9955f14d14097c1036e792a72f +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png index 61b6ba0fe..20b526c64 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png and b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta index 3b2cd0074..3f25af2cd 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat.png.meta @@ -65,7 +65,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -77,7 +77,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 64 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png new file mode 100644 index 000000000..c70486b49 Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta new file mode 100644 index 000000000..904b74e1e --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/mrUpbeat_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 02be4cad57d8c68478f4279816afc7b3 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png b/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png index fbc67f6a8..f08d37c26 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png and b/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png.meta index 703e9cf92..739921827 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/trickClass.png.meta @@ -68,7 +68,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 @@ -80,7 +80,7 @@ TextureImporter: maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png new file mode 100644 index 000000000..494dd9a2a Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta new file mode 100644 index 000000000..2a9bbbc0f --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/trickClass_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 8fd0b210a3ddec748a9ea7682ba80103 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png b/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png index 37f64c98e..d6e113086 100644 Binary files a/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png and b/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png.meta index 5d17b1416..b5645c441 100644 --- a/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/tunnel.png.meta @@ -65,10 +65,22 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 256 resizeAlgorithm: 0 textureFormat: -1 - textureCompression: 1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 compressionQuality: 50 crunchedCompression: 0 allowsAlphaSplitting: 0 diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png b/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png new file mode 100644 index 000000000..ce267604d Binary files /dev/null and b/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png differ diff --git a/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta new file mode 100644 index 000000000..6cfd05590 --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/tunnel_mask.png.meta @@ -0,0 +1,108 @@ +fileFormatVersion: 2 +guid: 837342340b1d4c34aa0bf37faf58e313 +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 + vTOnly: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 256 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 0 + 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: diff --git a/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png b/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png index fca659fff..0ddc96111 100644 Binary files a/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png and b/Assets/Resources/Sprites/Games/KarateMan/karateman_main.png differ diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/marcher_bg.png b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_bg.png new file mode 100644 index 000000000..deee94eb2 Binary files /dev/null and b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_bg.png differ diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png.meta b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_bg.png.meta similarity index 89% rename from Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png.meta rename to Assets/Resources/Sprites/Games/MarchingOrders/marcher_bg.png.meta index 570acb9bc..8f10da76d 100644 --- a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png.meta +++ b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_bg.png.meta @@ -61,7 +61,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 634.7656 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -80,7 +80,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -92,7 +92,7 @@ TextureImporter: forceMaximumCompressionQuality_BC6H_BC7: 0 - serializedVersion: 3 buildTarget: Standalone - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 @@ -121,16 +121,16 @@ TextureImporter: name: bgFloor rect: serializedVersion: 2 - x: 176 - y: 80 - width: 272 - height: 96 + x: 1117.1875 + y: 507.8125 + width: 1726.5625 + height: 609.375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: e4227e11a5d223dd0800000000000000 internalID: -2507892177621278130 @@ -142,16 +142,16 @@ TextureImporter: name: bgConveyor rect: serializedVersion: 2 - x: 32 - y: 352 - width: 720 - height: 112 + x: 203.125 + y: 2234.375 + width: 4570.3125 + height: 710.9375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: e21c879d13432bfc0800000000000000 internalID: -3480662173297360594 @@ -163,16 +163,16 @@ TextureImporter: name: bgPipes rect: serializedVersion: 2 - x: 32 - y: 240 - width: 480 - height: 80 + x: 203.125 + y: 1523.4375 + width: 3046.875 + height: 507.8125 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 0bcad4c34e41c9620800000000000000 internalID: 2782121640304946352 @@ -184,16 +184,16 @@ TextureImporter: name: bgWalls rect: serializedVersion: 2 - x: 32 - y: 496 - width: 624 - height: 496 + x: 203.125 + y: 3148.4375 + width: 3960.9375 + height: 3148.4375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: f71a4d03012634d90800000000000000 internalID: -7114735164637011585 diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/marcher_man.png b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_man.png new file mode 100644 index 000000000..fa7f40657 Binary files /dev/null and b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_man.png differ diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png.meta b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_man.png.meta similarity index 81% rename from Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png.meta rename to Assets/Resources/Sprites/Games/MarchingOrders/marcher_man.png.meta index 7d05c5ff7..922a9360a 100644 --- a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png.meta +++ b/Assets/Resources/Sprites/Games/MarchingOrders/marcher_man.png.meta @@ -187,7 +187,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 317.3828 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -247,16 +247,16 @@ TextureImporter: name: sargeBody rect: serializedVersion: 2 - x: 1824 - y: 16 - width: 208 - height: 400 + x: 5789.0625 + y: 50.78125 + width: 660.15625 + height: 1269.5312 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1321fd25b947cc910800000000000000 internalID: 1858988956656276017 @@ -268,16 +268,16 @@ TextureImporter: name: sargeHeadNormal rect: serializedVersion: 2 - x: 1808 - y: 448 - width: 224 - height: 208 + x: 5738.2812 + y: 1421.875 + width: 710.9375 + height: 660.15625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: bd664ac6d9ec91210800000000000000 internalID: 1304300742628370139 @@ -289,16 +289,16 @@ TextureImporter: name: sargeHeadTalk rect: serializedVersion: 2 - x: 1808 - y: 1184 - width: 224 - height: 224 + x: 5738.2812 + y: 3757.8125 + width: 710.9375 + height: 710.9375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 16c88d24ef42e91a0800000000000000 internalID: -6800957712821089183 @@ -310,16 +310,16 @@ TextureImporter: name: sargeHeadAngry rect: serializedVersion: 2 - x: 1808 - y: 688 - width: 224 - height: 208 + x: 5738.2812 + y: 2183.5938 + width: 710.9375 + height: 660.15625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1d49afdf9651f3670800000000000000 internalID: 8520552564985074897 @@ -331,16 +331,16 @@ TextureImporter: name: sargeHeadIrritate rect: serializedVersion: 2 - x: 1808 - y: 928 - width: 224 - height: 224 + x: 5738.2812 + y: 2945.3125 + width: 710.9375 + height: 710.9375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 15a05f393758fe640800000000000000 internalID: 5111450833538845265 @@ -352,16 +352,16 @@ TextureImporter: name: steam0 rect: serializedVersion: 2 - x: 528 - y: 928 - width: 224 - height: 224 + x: 1675.7812 + y: 2945.3125 + width: 710.9375 + height: 710.9375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 34fc9e363ba9f4730800000000000000 internalID: 3985574290512269123 @@ -373,16 +373,16 @@ TextureImporter: name: steam1 rect: serializedVersion: 2 - x: 16 - y: 1182 - width: 224 - height: 224 + x: 50.78125 + y: 3751.4648 + width: 710.9375 + height: 710.9375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: e9801dd028ce99890800000000000000 internalID: -7450664065186068322 @@ -394,16 +394,16 @@ TextureImporter: name: steam2 rect: serializedVersion: 2 - x: 272 - y: 1184 - width: 224 - height: 224 + x: 863.28125 + y: 3757.8125 + width: 710.9375 + height: 710.9375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 740aeeb3158f45ba0800000000000000 internalID: -6100978567398645689 @@ -415,16 +415,16 @@ TextureImporter: name: steam3 rect: serializedVersion: 2 - x: 528 - y: 1184 - width: 224 - height: 224 + x: 1675.7812 + y: 3757.8125 + width: 710.9375 + height: 710.9375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 29e1ce4ded2045ee0800000000000000 internalID: -1273389638560768366 @@ -436,16 +436,16 @@ TextureImporter: name: steam4 rect: serializedVersion: 2 - x: 16 - y: 928 - width: 224 - height: 224 + x: 50.78125 + y: 2945.3125 + width: 710.9375 + height: 710.9375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1127bae330c471ca0800000000000000 internalID: -6046280397901565423 @@ -457,16 +457,16 @@ TextureImporter: name: steam5 rect: serializedVersion: 2 - x: 272 - y: 928 - width: 224 - height: 224 + x: 863.28125 + y: 2945.3125 + width: 710.9375 + height: 710.9375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 340e3305cc41488b0800000000000000 internalID: -5150969206053543869 @@ -478,16 +478,16 @@ TextureImporter: name: torsoNormal rect: serializedVersion: 2 - x: 16 - y: 16 - width: 128 - height: 192 + x: 50.78125 + y: 50.78125 + width: 406.25 + height: 609.375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1a70937b7f668cd70800000000000000 internalID: 9063607464200046497 @@ -499,16 +499,16 @@ TextureImporter: name: torsoRaiseUp rect: serializedVersion: 2 - x: 176 - y: 16 - width: 128 - height: 192 + x: 558.59375 + y: 50.78125 + width: 406.25 + height: 609.375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 9a5a5589d2ce00230800000000000000 internalID: 3603139382469830057 @@ -520,16 +520,16 @@ TextureImporter: name: torsoPoint rect: serializedVersion: 2 - x: 336 - y: 16 - width: 128 - height: 192 + x: 1066.4062 + y: 50.78125 + width: 406.25 + height: 609.375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 44fec28fd23e224f0800000000000000 internalID: -854871192670245052 @@ -541,16 +541,16 @@ TextureImporter: name: cadetLegNormal rect: serializedVersion: 2 - x: 16 - y: 240 - width: 96 - height: 208 + x: 50.78125 + y: 761.71875 + width: 304.6875 + height: 660.15625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1a9c847b85a4b0a10800000000000000 internalID: 1876675414622521761 @@ -562,16 +562,16 @@ TextureImporter: name: cadetLegRaiseUp0 rect: serializedVersion: 2 - x: 144 - y: 240 - width: 96 - height: 208 + x: 457.03125 + y: 761.71875 + width: 304.6875 + height: 660.15625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d56dc587d37e79150800000000000000 internalID: 5879422089753843293 @@ -583,16 +583,16 @@ TextureImporter: name: cadetLegRaiseUp1 rect: serializedVersion: 2 - x: 272 - y: 240 - width: 96 - height: 192 + x: 863.28125 + y: 761.71875 + width: 304.6875 + height: 609.375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 39c1e71f17cfba860800000000000000 internalID: 7542399567275105427 @@ -604,16 +604,16 @@ TextureImporter: name: cadetLegRaiseUp2 rect: serializedVersion: 2 - x: 400 - y: 240 - width: 112 - height: 176 + x: 1269.5312 + y: 761.71875 + width: 355.46875 + height: 558.59375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 044cbd121e3865d50800000000000000 internalID: 6725708096483345472 @@ -625,16 +625,16 @@ TextureImporter: name: cadetLegRaiseUp3 rect: serializedVersion: 2 - x: 544 - y: 240 - width: 128 - height: 160 + x: 1726.5625 + y: 761.71875 + width: 406.25 + height: 507.8125 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 06486394b5a9e79c0800000000000000 internalID: -3927532108159482784 @@ -646,16 +646,16 @@ TextureImporter: name: cadetLegRaiseUp4 rect: serializedVersion: 2 - x: 704 - y: 240 - width: 128 - height: 144 + x: 2234.375 + y: 761.71875 + width: 406.25 + height: 457.03125 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 5b75b7decb2a72a80800000000000000 internalID: -8491639640061945931 @@ -667,16 +667,16 @@ TextureImporter: name: cadetLegBeat2 rect: serializedVersion: 2 - x: 864 - y: 240 - width: 128 - height: 208 + x: 2742.1875 + y: 761.71875 + width: 406.25 + height: 660.15625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 65822a0bc53e71e10800000000000000 internalID: 2168451732842096726 @@ -688,16 +688,16 @@ TextureImporter: name: cadetLegBeat1 rect: serializedVersion: 2 - x: 1024 - y: 240 - width: 128 - height: 208 + x: 3250 + y: 761.71875 + width: 406.25 + height: 660.15625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 3624b8e97cdf62e10800000000000000 internalID: 2172702904053088867 @@ -709,16 +709,16 @@ TextureImporter: name: cadetLegBeat0 rect: serializedVersion: 2 - x: 1184 - y: 240 - width: 128 - height: 208 + x: 3757.8125 + y: 761.71875 + width: 406.25 + height: 660.15625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 4441dc42c568c2b30800000000000000 internalID: 4263930677525550148 @@ -730,16 +730,16 @@ TextureImporter: name: cadetLegBeat3 rect: serializedVersion: 2 - x: 1344 - y: 240 - width: 128 - height: 240 + x: 4265.625 + y: 761.71875 + width: 406.25 + height: 761.71875 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b87353b197a6fede0800000000000000 internalID: -1301704698906724469 @@ -751,16 +751,16 @@ TextureImporter: name: cadetArmNormal rect: serializedVersion: 2 - x: 17 - y: 480 - width: 96 - height: 208 + x: 53.95508 + y: 1523.4375 + width: 304.6875 + height: 660.15625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: f3275c830e7580750800000000000000 internalID: 6271359101650170431 @@ -772,16 +772,16 @@ TextureImporter: name: cadetArmRaiseUpA0 rect: serializedVersion: 2 - x: 144 - y: 528 - width: 96 - height: 160 + x: 457.03125 + y: 1675.7812 + width: 304.6875 + height: 507.8125 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1bfb43ba35154fbf0800000000000000 internalID: -291518656075743311 @@ -793,16 +793,16 @@ TextureImporter: name: cadetArrmRaiseUpA1 rect: serializedVersion: 2 - x: 272 - y: 528 - width: 128 - height: 112 + x: 863.28125 + y: 1675.7812 + width: 406.25 + height: 355.46875 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 9e18589606d42e910800000000000000 internalID: 1865138272167363049 @@ -814,16 +814,16 @@ TextureImporter: name: cadetNeck rect: serializedVersion: 2 - x: 432 - y: 480 - width: 64 - height: 64 + x: 1371.0938 + y: 1523.4375 + width: 203.125 + height: 203.125 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 6eb8cc3d05dd00190800000000000000 internalID: -7998149598989480986 @@ -835,16 +835,16 @@ TextureImporter: name: cadetArmRaiseUpB rect: serializedVersion: 2 - x: 528 - y: 480 - width: 96 - height: 96 + x: 1675.7812 + y: 1523.4375 + width: 304.6875 + height: 304.6875 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 46a2fb779af1b00b0800000000000000 internalID: -5761476485571466652 @@ -856,16 +856,16 @@ TextureImporter: name: cadetArmRaiseUpC rect: serializedVersion: 2 - x: 656 - y: 480 - width: 96 - height: 96 + x: 2082.0312 + y: 1523.4375 + width: 304.6875 + height: 304.6875 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: be684ceb018df0b30800000000000000 internalID: 4255857739320035051 @@ -877,16 +877,16 @@ TextureImporter: name: cadetArmPointA2 rect: serializedVersion: 2 - x: 784 - y: 608 - width: 160 - height: 80 + x: 2488.2812 + y: 1929.6875 + width: 507.8125 + height: 253.90625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: e93a43d78ac796f40800000000000000 internalID: 5722241864647877534 @@ -898,16 +898,16 @@ TextureImporter: name: cadetArmPointA3 rect: serializedVersion: 2 - x: 784 - y: 480 - width: 128 - height: 96 + x: 2488.2812 + y: 1523.4375 + width: 406.25 + height: 304.6875 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: b412c488f8a75fca0800000000000000 internalID: -5983741773006233269 @@ -919,16 +919,16 @@ TextureImporter: name: cadetArmPointC rect: serializedVersion: 2 - x: 944 - y: 480 - width: 96 - height: 96 + x: 2996.0938 + y: 1523.4375 + width: 304.6875 + height: 304.6875 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: a1bda2790d1e535b0800000000000000 internalID: -5389153093073315046 @@ -940,16 +940,16 @@ TextureImporter: name: cadetArmPointB rect: serializedVersion: 2 - x: 1072 - y: 480 - width: 96 - height: 96 + x: 3402.3438 + y: 1523.4375 + width: 304.6875 + height: 304.6875 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: fb7c3e5ca3c3e64e0800000000000000 internalID: -1986584162498000961 @@ -961,16 +961,16 @@ TextureImporter: name: cadetArmPointA0 rect: serializedVersion: 2 - x: 1200 - y: 480 - width: 96 - height: 128 + x: 3808.5938 + y: 1523.4375 + width: 304.6875 + height: 406.25 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 9a1e234cc53b333b0800000000000000 internalID: -5533882306098175575 @@ -982,16 +982,16 @@ TextureImporter: name: cadetArmClapA rect: serializedVersion: 2 - x: 1328 - y: 512 - width: 80 - height: 96 + x: 4214.8438 + y: 1625 + width: 253.90625 + height: 304.6875 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 645caf062ae146380800000000000000 internalID: -8979018074309343930 @@ -1003,16 +1003,16 @@ TextureImporter: name: cadetArmClapB rect: serializedVersion: 2 - x: 1440 - y: 512 - width: 96 - height: 112 + x: 4570.3125 + y: 1625 + width: 304.6875 + height: 355.46875 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: d4ca1daec6dcca7f0800000000000000 internalID: -599878782667346867 @@ -1024,16 +1024,16 @@ TextureImporter: name: legPointA rect: serializedVersion: 2 - x: 784 - y: 928 - width: 144 - height: 192 + x: 2488.2812 + y: 2945.3125 + width: 457.03125 + height: 609.375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 5842ce1e14b4d9a50800000000000000 internalID: 6529457781092394117 @@ -1045,16 +1045,16 @@ TextureImporter: name: legPointB rect: serializedVersion: 2 - x: 960 - y: 928 - width: 96 - height: 208 + x: 3046.875 + y: 2945.3125 + width: 304.6875 + height: 660.15625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: af7203674d08d1920800000000000000 internalID: 2962665779883943930 @@ -1066,16 +1066,16 @@ TextureImporter: name: shadow rect: serializedVersion: 2 - x: 1088 - y: 928 - width: 240 - height: 80 + x: 3453.125 + y: 2945.3125 + width: 761.71875 + height: 253.90625 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: fafc21442184075c0800000000000000 internalID: -4219793607557460049 @@ -1087,16 +1087,16 @@ TextureImporter: name: cadetHeadLeft2 rect: serializedVersion: 2 - x: 16 - y: 720 - width: 208 - height: 176 + x: 50.78125 + y: 2285.1562 + width: 660.15625 + height: 558.59375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1a71858c05d2135e0800000000000000 internalID: -1931712940183382111 @@ -1108,16 +1108,16 @@ TextureImporter: name: cadetHeadLeft1 rect: serializedVersion: 2 - x: 1248 - y: 720 - width: 208 - height: 176 + x: 3960.9375 + y: 2285.1562 + width: 660.15625 + height: 558.59375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: a5c7a948472ceea90800000000000000 internalID: -7282669741714801574 @@ -1129,16 +1129,16 @@ TextureImporter: name: cadetHeadLeft0 rect: serializedVersion: 2 - x: 256 - y: 720 - width: 208 - height: 176 + x: 812.5 + y: 2285.1562 + width: 660.15625 + height: 558.59375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 1c5464179f43c6ee0800000000000000 internalID: -1266579149246020159 @@ -1150,16 +1150,16 @@ TextureImporter: name: cadetHeadNormal rect: serializedVersion: 2 - x: 496 - y: 720 - width: 240 - height: 176 + x: 1574.2188 + y: 2285.1562 + width: 761.71875 + height: 558.59375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 6b76ca432dc4387f0800000000000000 internalID: -611560658681698378 @@ -1171,16 +1171,16 @@ TextureImporter: name: cadetHeadRight0 rect: serializedVersion: 2 - x: 768 - y: 720 - width: 208 - height: 176 + x: 2437.5 + y: 2285.1562 + width: 660.15625 + height: 558.59375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: c2c3efe170277b6d0800000000000000 internalID: -2974783653944607700 @@ -1192,16 +1192,16 @@ TextureImporter: name: cadetHeadRight1 rect: serializedVersion: 2 - x: 1488 - y: 720 - width: 208 - height: 176 + x: 4722.6562 + y: 2285.1562 + width: 660.15625 + height: 558.59375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: f861ba7ae1c05dc30800000000000000 internalID: 4383423138116605583 @@ -1213,16 +1213,16 @@ TextureImporter: name: cadetHeadRight2 rect: serializedVersion: 2 - x: 1008 - y: 720 - width: 208 - height: 176 + x: 3199.2188 + y: 2285.1562 + width: 660.15625 + height: 558.59375 alignment: 0 pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] - tessellationDetail: 0 + tessellationDetail: -1 bones: [] spriteID: 78160e09896043df0800000000000000 internalID: -201528830989409913 diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png b/Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png deleted file mode 100644 index aed3d233a..000000000 Binary files a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_1024x1024_25508A84E62F266F_13_waifu2x_art_noise3_scale_tta_1.png and /dev/null differ diff --git a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png b/Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png deleted file mode 100644 index 8b3a09cff..000000000 Binary files a/Assets/Resources/Sprites/Games/MarchingOrders/tex1_512x512_643398E2B2B0B578_13_waifu2x_art_noise3_scale_tta_1.png and /dev/null differ diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index 66e29f49b..3efd88305 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -17692,7 +17692,7 @@ MonoBehaviour: m_HandleRect: {fileID: 704039020} m_Direction: 0 m_Value: 0 - m_Size: 0.032871284 + m_Size: 0.03287128 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -25563,7 +25563,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1589389271} m_Direction: 2 m_Value: 1 - m_Size: 0.9999896 + m_Size: 0.99823457 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -31110,7 +31110,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.97998, y: -17} + m_AnchoredPosition: {x: -408.98004, y: -17} m_SizeDelta: {x: -817.96, y: -46.29} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1118147045 @@ -32587,7 +32587,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: 129.8085} + m_AnchoredPosition: {x: 0, y: 129.911} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!114 &1154875944 @@ -39444,6 +39444,7 @@ MonoBehaviour: m_EditorClassIdentifier: level: {fileID: 0} music: {fileID: 0} + canvas: {fileID: 1791483799} debugUI: 0 playOnStart: 0 editor: 1 @@ -42568,7 +42569,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: -42.494995} + m_AnchoredPosition: {x: 0, y: -42.495026} m_SizeDelta: {x: 1440.022, y: -84.99} m_Pivot: {x: 0, y: 0.5} --- !u!114 &1527251881 @@ -44616,7 +44617,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1292844878} m_HandleRect: {fileID: 1292844877} m_Direction: 2 - m_Value: 1 + m_Value: 0 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -54654,7 +54655,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 32 + m_Bits: 96 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -55299,7 +55300,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: -42.494995} + m_AnchoredPosition: {x: 0, y: -42.495026} m_SizeDelta: {x: 1054, y: -84.99} m_Pivot: {x: 0, y: 0.5} --- !u!114 &2066632681 diff --git a/Assets/Scripts/AppInfo.cs b/Assets/Scripts/AppInfo.cs index 967171b79..b363dc186 100644 --- a/Assets/Scripts/AppInfo.cs +++ b/Assets/Scripts/AppInfo.cs @@ -2,8 +2,8 @@ using System; public static class AppInfo { //--- AutoGenerated.begin - public const string Version = "0.0.961"; - public static readonly DateTime Date = new DateTime(2022, 10, 13, 16, 09, 43, 581, DateTimeKind.Utc); + public const string Version = "0.0.963"; + public static readonly DateTime Date = new DateTime(2023, 01, 12, 00, 27, 14, 138, DateTimeKind.Utc); //--- AutoGenerated.end } diff --git a/Assets/Scripts/BeatmapFormats/DynamicBeatmap.cs b/Assets/Scripts/BeatmapFormats/DynamicBeatmap.cs index 77ef3024b..6788ab6f9 100644 --- a/Assets/Scripts/BeatmapFormats/DynamicBeatmap.cs +++ b/Assets/Scripts/BeatmapFormats/DynamicBeatmap.cs @@ -353,7 +353,8 @@ namespace HeavenStudio Debug.LogWarning($"Unknown game {gameName} found in remix.json! Adding game..."); game = new Minigames.Minigame(gameName, DisplayName(gameName) + " \n[inferred from remix.json]", "", false, true, new List()); EventCaller.instance.minigames.Add(game); - Editor.Editor.instance.AddIcon(game); + if (Editor.Editor.instance != null) + Editor.Editor.instance.AddIcon(game); } action = EventCaller.instance.GetGameAction(game, actionName); if (action == null) diff --git a/Assets/Scripts/Common/SoundSequence.cs b/Assets/Scripts/Common/SoundSequence.cs index 07a7db882..ffd85f590 100644 --- a/Assets/Scripts/Common/SoundSequence.cs +++ b/Assets/Scripts/Common/SoundSequence.cs @@ -26,13 +26,55 @@ namespace HeavenStudio.Util this.clips = new List(clips); } - public MultiSound Play(float startBeat) + public MultiSound Play(float startBeat, params SequenceParams[] args) { List sounds = new List(); + Dictionary paramMaps = new Dictionary(); - foreach (SequenceClip clip in clips) + foreach (SequenceClip clipdat in clips) { - sounds.Add(new MultiSound.Sound(clip.clip, startBeat + clip.beat, clip.pitch, clip.volume, clip.looping, clip.offset)); + string clip = clipdat.clip; + float beat = clipdat.beat; + float pitch = clipdat.pitch; + float volume = clipdat.volume; + bool looping = clipdat.looping; + float offset = clipdat.offset; + if (args != null && clipdat.parameters != null && clipdat.parameters.Length > 0) + { + paramMaps.Clear(); + // map param names to overrides + foreach (SequenceParams prm in clipdat.parameters) + { + if (!paramMaps.ContainsKey(prm.name)) + paramMaps.Add(prm.name, prm.map); + } + // apply overrides + foreach (SequenceParams prm in args) + { + if (paramMaps.ContainsKey(prm.name)) + { + string map = paramMaps[prm.name]; + switch (map) + { + case "beat": + beat = prm.value; + break; + case "pitch": + pitch = prm.value; + break; + case "volume": + volume = prm.value; + break; + case "offset": + offset = prm.value; + break; + default: + break; + } + } + } + } + sounds.Add(new MultiSound.Sound(clip, startBeat + beat, pitch, volume, looping, offset)); } return MultiSound.Play(sounds.ToArray(), game, force); @@ -41,16 +83,6 @@ namespace HeavenStudio.Util [Serializable] public struct SequenceClip { - public SequenceClip(string clip, float beat, float pitch = 1f, float volume = 1f, bool looping = false, float offset = 0f) - { - this.clip = clip; - this.beat = beat; - this.pitch = pitch; - this.volume = volume; - this.looping = looping; - this.offset = offset; - } - [Tooltip("Filename of clip to use (will look in assetbundles before resources)")] public string clip; [Tooltip("Beat to play clip at relative to start of sequence")] @@ -65,6 +97,9 @@ namespace HeavenStudio.Util public bool looping; [Tooltip("Offset to start playing clip")] public float offset; + + [Tooltip("Set of possible value overrides for clip data")] + public SequenceParams[] parameters; } [Serializable] @@ -75,5 +110,26 @@ namespace HeavenStudio.Util [Tooltip("Sequence to play")] public SoundSequence sequence; } + + [Serializable] + public struct SequenceParams + { + //SequenceParams used in minigame code + public SequenceParams(string name, float value) + { + this.map = ""; + this.name = name; + this.value = value; + } + + [Tooltip("Inspector use only; Sequence Clip value to override")] + public string map; + + [Tooltip("Name of parameter")] + public string name; + + [NonSerialized] + public float value; + } } } \ No newline at end of file diff --git a/Assets/Scripts/Conductor.cs b/Assets/Scripts/Conductor.cs index f494d7b53..7c07f2d3a 100644 --- a/Assets/Scripts/Conductor.cs +++ b/Assets/Scripts/Conductor.cs @@ -38,6 +38,10 @@ namespace HeavenStudio private double dspStartTime; public double dspStartTimeAsDouble => dspStartTime; + //the beat we started at + private double startBeat; + public double startBeatAsDouble => startBeat; + // an AudioSource attached to this GameObject that will play the music. public AudioSource musicSource; @@ -150,6 +154,7 @@ namespace HeavenStudio } lastAbsTime = Time.realtimeSinceStartupAsDouble; dspStartTime = AudioSettings.dspTime; + startBeat = beat; // GameManager.instance.SetCurrentEventToClosest(songPositionInBeats); } @@ -193,7 +198,7 @@ namespace HeavenStudio public void LateUpdate() { - if (metronome) + if (metronome && isPlaying) { if (ReportBeat(ref lastReportedBeat)) { @@ -260,7 +265,7 @@ namespace HeavenStudio return GameManager.instance.Beatmap.tempoChanges; } - public double GetSongPosFromBeat(float beat) + public double GetSongPosFromBeat(double beat) { var chart = GameManager.instance.Beatmap; SetBpm(chart.bpm); diff --git a/Assets/Scripts/DebugUI.cs b/Assets/Scripts/DebugUI.cs index 80ace75f3..349d667a3 100644 --- a/Assets/Scripts/DebugUI.cs +++ b/Assets/Scripts/DebugUI.cs @@ -31,7 +31,7 @@ namespace HeavenStudio private void Start() { - CreateDebugUI(out Title); SetText(Title, "Rhythm Heaven Mania v1.0 BRAEDON DEBUG PLAYTEST"); + CreateDebugUI(out Title); SetText(Title, $"Heaven Studio {GlobalGameManager.buildTime}"); CreateDebugUI(out SongPosBeats); CreateDebugUI(out SongPos); CreateDebugUI(out SecPerBeat); diff --git a/Assets/Scripts/GameManager.cs b/Assets/Scripts/GameManager.cs index 829e50a94..65b2066dc 100644 --- a/Assets/Scripts/GameManager.cs +++ b/Assets/Scripts/GameManager.cs @@ -19,7 +19,8 @@ namespace HeavenStudio public List SoundObjects = new List(); [Header("Components")] - public TextAsset txt; + public string txt; + public string ext; public Camera GameCamera, CursorCam, OverlayCamera; public GameObject GameLetterbox; public CircleCursor CircleCursor; @@ -83,17 +84,6 @@ namespace HeavenStudio GameObject fade = new GameObject(); this.fade = fade.AddComponent(); - if (txt != null) - { - string json = txt.text; - Beatmap = JsonConvert.DeserializeObject(json); - } - else - { - NewRemix(); - } - - SortEventsList(); GlobalGameManager.Init(); @@ -106,13 +96,16 @@ namespace HeavenStudio GameObject textbox = Instantiate(Resources.Load("Prefabs/Common/Textbox")); textbox.name = "Textbox"; - - if (playOnStart) + if (txt != null && ext != null) { - Play(startBeat); + LoadRemix(txt, ext); + } + else + { + NewRemix(); } - // SetCurrentGame(eventCaller.GamesHolder.transform.GetComponentsInChildren()[1].name); + SortEventsList(); if (Beatmap.entities.Count >= 1) { @@ -123,6 +116,11 @@ namespace HeavenStudio { SetGame("noGame"); } + + if (playOnStart) + { + Play(startBeat); + } } public void NewRemix() @@ -190,7 +188,7 @@ namespace HeavenStudio var inf = GetGameInfo(gameName); if (inf.usesAssetBundle && !inf.AssetsLoaded) { - Debug.Log("ASYNC loading assetbundle for game " + gameName); + Debug.Log($"ASYNC loading assetbundles for game {gameName}"); StartCoroutine(inf.LoadCommonAssetBundleAsync()); StartCoroutine(inf.LoadLocalizedAssetBundleAsync()); } @@ -204,23 +202,23 @@ namespace HeavenStudio if (start + seekTime >= entities[currentPreEvent]) { var entitiesAtSameBeat = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentPreEvent].beat && !EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(c.datamodel.Split('/')[0]))); - for (int i = 0; i < entitiesAtSameBeat.Count; i++) + foreach (DynamicBeatmap.DynamicEntity entity in entitiesAtSameBeat) { - string gameName = entitiesAtSameBeat[i].datamodel.Split('/')[0]; + string gameName = entity.datamodel.Split('/')[0]; var inf = GetGameInfo(gameName); if (inf.usesAssetBundle && !inf.AssetsLoaded) { - Debug.Log("ASYNC loading assetbundle for game " + gameName); + Debug.Log($"ASYNC loading assetbundles for game {gameName}"); StartCoroutine(inf.LoadCommonAssetBundleAsync()); StartCoroutine(inf.LoadLocalizedAssetBundleAsync()); } + currentPreEvent++; } - currentPreEvent++; } } } - public void SeekAheadAndDoPreEvent(float start, float seekTime = 1f) + public void SeekAheadAndDoPreEvent(float start, float seekTime = 2f) { List entities = Beatmap.entities.Select(c => c.beat).ToList(); if (currentPreSequence < Beatmap.entities.Count && currentPreSequence >= 0) @@ -231,9 +229,16 @@ namespace HeavenStudio var entitiesAtSameBeat = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentPreSequence].beat); foreach (DynamicBeatmap.DynamicEntity entity in entitiesAtSameBeat) { + string gameName = entity.datamodel.Split('/')[0]; + var inf = GetGameInfo(gameName); + if (inf.usesAssetBundle && inf.AssetsLoaded && !inf.SequencesPreloaded) + { + Debug.Log($"Preloading game {gameName}"); + PreloadGameSequences(gameName); + } eventCaller.CallPreEvent(entity); + currentPreSequence++; } - currentPreSequence++; } } } @@ -291,14 +296,14 @@ namespace HeavenStudio //seek ahead to preload games that have assetbundles SeekAheadAndPreload(Conductor.instance.songPositionInBeats, seekTime); - SeekAheadAndDoPreEvent(Conductor.instance.songPositionInBeats, 1f); + SeekAheadAndDoPreEvent(Conductor.instance.songPositionInBeats, 2f); if (currentEvent < Beatmap.entities.Count && currentEvent >= 0) { if (Conductor.instance.songPositionInBeats >= entities[currentEvent] /*&& SongPosLessThanClipLength(Conductor.instance.songPositionInBeats)*/) { // allows for multiple events on the same beat to be executed on the same frame, so no more 1-frame delay - var entitiesAtSameBeat = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentEvent].beat && !EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(c.datamodel.Split('/')[0]))); + var entitiesAtSameBeat = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentEvent].beat && !EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(c.datamodel.Split('/')[0]))); var fxEntities = Beatmap.entities.FindAll(c => c.beat == Beatmap.entities[currentEvent].beat && EventCaller.FXOnlyGames().Contains(EventCaller.instance.GetMinigame(c.datamodel.Split('/')[0]))); // FX entities should ALWAYS execute before gameplay entities @@ -308,17 +313,16 @@ namespace HeavenStudio currentEvent++; } - for (int i = 0; i < entitiesAtSameBeat.Count; i++) + foreach (DynamicBeatmap.DynamicEntity entity in entitiesAtSameBeat) { - var entity = entitiesAtSameBeat[i]; // if game isn't loaded, preload game so whatever event that would be called will still run outside if needed - if (entitiesAtSameBeat[i].datamodel.Split('/')[0] != currentGame && !preloadedGames.Contains(preloadedGames.Find(c => c.name == entitiesAtSameBeat[i].datamodel.Split('/')[0]))) + if (entity.datamodel.Split('/')[0] != currentGame) { - eventCaller.CallEvent(entitiesAtSameBeat[i], false); + eventCaller.CallEvent(entity, false); } else { - eventCaller.CallEvent(entitiesAtSameBeat[i], true); + eventCaller.CallEvent(entity, true); } // Thank you to @shshwdr for bring this to my attention @@ -328,8 +332,6 @@ namespace HeavenStudio // currentEvent += gameManagerEntities.Count; } } - - } public void ToggleInputs(bool inputs) @@ -380,6 +382,11 @@ namespace HeavenStudio SetCurrentEventToClosest(beat); onBeatChanged?.Invoke(beat); KillAllSounds(); + + if (playOnStart) + { + Play(0); + } } public void KillAllSounds() @@ -549,47 +556,21 @@ namespace HeavenStudio { Destroy(currentGameO); - var instantiate = true; - - if (preloadedGames.Count > 0) - { - for (int i = 0; i < preloadedGames.Count; i++) - { - if (preloadedGames[i].gameObject != null) - { - if (preloadedGames[i].gameObject.name == game) - { - preloadedGames[i].SetActive(true); - currentGameO = preloadedGames[i]; - preloadedGames.Remove(preloadedGames[i]); - instantiate = false; - } - } - } - } - - if (instantiate) - { - currentGameO = Instantiate(GetGame(game)); - currentGameO.transform.parent = eventCaller.GamesHolder.transform; - currentGameO.name = game; - } + currentGameO = Instantiate(GetGame(game)); + currentGameO.transform.parent = eventCaller.GamesHolder.transform; + currentGameO.name = game; SetCurrentGame(game); ResetCamera(); } - private void PreloadGame(string game) + public void PreloadGameSequences(string game) { - if (preloadedGames.Contains(preloadedGames.Find(c => c.name == game))) - return; - - var g = Instantiate(GetGame(game)); - g.transform.parent = eventCaller.GamesHolder.transform; - g.SetActive(false); - g.name = game; - preloadedGames.Add(g); + var gameInfo = GetGameInfo(game); + //load the games' sound sequences + if (gameInfo != null && gameInfo.LoadedSoundSequences == null) + gameInfo.LoadedSoundSequences = GetGame(game).GetComponent().SoundSequences; } public GameObject GetGame(string name) diff --git a/Assets/Scripts/Games/FanClub/FanClub.cs b/Assets/Scripts/Games/FanClub/FanClub.cs index 571134539..9c23973c8 100644 --- a/Assets/Scripts/Games/FanClub/FanClub.cs +++ b/Assets/Scripts/Games/FanClub/FanClub.cs @@ -31,7 +31,8 @@ namespace HeavenStudio.Games.Loaders { new Param("toggle", false, "Disable call", "Disable the idol's call") }, - inactiveFunction = delegate { var e = eventCaller.currentEntity; FanClub.WarnHai(e.beat, e["toggle"]);} + inactiveFunction = delegate { var e = eventCaller.currentEntity; FanClub.WarnHai(e.beat, e["toggle"]);}, + preFunction = delegate { var e = eventCaller.currentEntity; FanClub.HaiSound(e.beat, e["toggle"]); } }, new GameAction("I suppose", "I Suppose!") { @@ -42,7 +43,8 @@ namespace HeavenStudio.Games.Loaders new Param("type", FanClub.KamoneResponseType.Through, "Response type", "Type of response to use"), new Param("toggle", false, "Disable call", "Disable the idol's call") }, - inactiveFunction = delegate { var e = eventCaller.currentEntity; FanClub.WarnKamone(e.beat, e["toggle"], 0, e["type"]);} + inactiveFunction = delegate { var e = eventCaller.currentEntity; FanClub.WarnKamone(e.beat, e["toggle"], 0, e["type"]);}, + preFunction = delegate { var e = eventCaller.currentEntity; FanClub.KamoneSound(e.beat, e["toggle"], 0, e["type"]); } }, new GameAction("double clap", "Double Clap") { @@ -52,7 +54,8 @@ namespace HeavenStudio.Games.Loaders { new Param("toggle", false, "Disable call", "Disable the call") }, - inactiveFunction = delegate { var e = eventCaller.currentEntity; FanClub.WarnBigReady(e.beat, e["toggle"]); } + inactiveFunction = delegate { var e = eventCaller.currentEntity; FanClub.WarnBigReady(e.beat, e["toggle"]); }, + preFunction = delegate { var e = eventCaller.currentEntity; FanClub.BigReadySound(e.beat, e["toggle"]); } }, new GameAction("play idol animation", "Idol Coreography") { @@ -526,8 +529,6 @@ namespace HeavenStudio.Games const float HAIS_LENGTH = 4.5f; public void CallHai(float beat, bool noSound = false, int type = 0) { - if (!noSound) - PlaySoundSequence("arisa_hai", beat); responseToggle = false; DisableBop(beat, 8f); @@ -550,20 +551,21 @@ namespace HeavenStudio.Games new BeatAction.Action(beat + 7f, delegate { PlayOneClap(beat + 7f); DoIdolClaps();}), }); - PlaySoundSequence("crowd_hai", beat + 4f); + PlaySoundSequence("fanClub", "crowd_hai", beat + 4f); } public static void WarnHai(float beat, bool noSound = false, int type = 0) { wantHais = beat; - if (noSound) return; - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("fanClub/arisa_hai_1_jp", beat), - new MultiSound.Sound("fanClub/arisa_hai_2_jp", beat + 1f), - new MultiSound.Sound("fanClub/arisa_hai_3_jp", beat + 2f), - }, forcePlay:true); } + public static void HaiSound(float beat, bool noSound = false, int type = 0) + { + if (noSound) return; + PlaySoundSequence("fanClub", "arisa_hai", beat); + } + + public void ContinueHais(float beat, int type = 0) { CallHai(beat, true, type); @@ -575,13 +577,6 @@ namespace HeavenStudio.Games bool doJump = (responseType == (int) KamoneResponseType.Jump || responseType == (int) KamoneResponseType.JumpFast); bool isBig = (responseType == (int) KamoneResponseType.ThroughFast || responseType == (int) KamoneResponseType.JumpFast); DisableResponse(beat, 2f); - if (!noSound) - { - if (isBig) - PlaySoundSequence("arisa_kamone_fast", beat); - else - PlaySoundSequence("arisa_kamone", beat); - } responseToggle = true; DisableBop(beat, (doJump) ? 6.25f : 5.25f); @@ -614,29 +609,25 @@ namespace HeavenStudio.Games }), }); - PlaySoundSequence("crowd_kamone", beat + 2f); + PlaySoundSequence("fanClub", "crowd_kamone", beat + 2f); } public static void WarnKamone(float beat, bool noSound = false, int type = 0, int responseType = (int) KamoneResponseType.Through) { wantKamone = beat; wantKamoneType = responseType; + } + + public static void KamoneSound(float beat, bool noSound = false, int type = 0, int responseType = (int) KamoneResponseType.Through) + { if (noSound) return; if (responseType == (int) KamoneResponseType.ThroughFast || responseType == (int) KamoneResponseType.JumpFast) { - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("fanClub/arisa_ka_fast_jp", beat), - new MultiSound.Sound("fanClub/arisa_mo_fast_jp", beat + 0.25f), - new MultiSound.Sound("fanClub/arisa_ne_fast_jp", beat + 0.5f), - }, forcePlay:true); + PlaySoundSequence("fanClub", "arisa_kamone_fast", beat); } else { - MultiSound.Play(new MultiSound.Sound[] { - new MultiSound.Sound("fanClub/arisa_ka_jp", beat), - new MultiSound.Sound("fanClub/arisa_mo_jp", beat + 0.5f, offset: 0.07407407f), - new MultiSound.Sound("fanClub/arisa_ne_jp", beat + 1f, offset: 0.07407407f), - }, forcePlay:true); + PlaySoundSequence("fanClub", "arisa_kamone", beat); } } @@ -648,9 +639,6 @@ namespace HeavenStudio.Games const float BIGCALL_LENGTH = 2.75f; public void CallBigReady(float beat, bool noSound = false) { - if (!noSound) - PlaySoundSequence("crowd_big_ready", beat); - Prepare(beat + 1.5f); Prepare(beat + 2f); @@ -669,8 +657,12 @@ namespace HeavenStudio.Games public static void WarnBigReady(float beat, bool noSound = false) { wantBigReady = beat; + } + + public static void BigReadySound(float beat, bool noSound = false) + { if (noSound) return; - Jukebox.PlayOneShotGame("fanClub/crowd_big_ready", beat); + PlaySoundSequence("fanClub", "crowd_big_ready", beat); } public void ContinueBigReady(float beat) diff --git a/Assets/Scripts/Games/Minigame.cs b/Assets/Scripts/Games/Minigame.cs index a3703b7eb..b34e27057 100644 --- a/Assets/Scripts/Games/Minigame.cs +++ b/Assets/Scripts/Games/Minigame.cs @@ -216,16 +216,18 @@ namespace HeavenStudio.Games return sameTime; } - public MultiSound PlaySoundSequence(string name, float startBeat) + public static MultiSound PlaySoundSequence(string game, string name, float startBeat, params SoundSequence.SequenceParams[] args) { - foreach (SoundSequence.SequenceKeyValue pair in SoundSequences) + Minigames.Minigame gameInfo = GameManager.instance.GetGameInfo(game); + foreach (SoundSequence.SequenceKeyValue pair in gameInfo.LoadedSoundSequences) { if (pair.name == name) { + // Debug.Log($"Playing sound sequence {name} at beat {startBeat}"); return pair.sequence.Play(startBeat); } } - Debug.LogWarning($"Sound sequence {name} not found in game {this.name} (did you build AssetBundles?)"); + Debug.LogWarning($"Sound sequence {name} not found in game {game} (did you build AssetBundles?)"); return null; } } diff --git a/Assets/Scripts/Initializer.cs b/Assets/Scripts/Initializer.cs index ee18415c9..7490aa468 100644 --- a/Assets/Scripts/Initializer.cs +++ b/Assets/Scripts/Initializer.cs @@ -1,5 +1,11 @@ +using System; using System.Collections; using System.Collections.Generic; +using System.IO; + +using System.IO.Compression; +using System.Text; + using UnityEngine; using UnityEngine.Audio; @@ -9,13 +15,37 @@ namespace HeavenStudio { public TextAsset level; public AudioClip music; + public GameObject canvas; public bool debugUI; public bool playOnStart = false; public bool editor = false; + string json = ""; + string ext = ""; + private void Start() { + string[] args = System.Environment.GetCommandLineArgs(); + string input = ""; + for (int i = 1; i < args.Length; i++) { + // first arg is always this executable + Debug.Log(args[i]); + if (args[i].IndexOfAny(Path.GetInvalidPathChars()) == -1) + { + if (File.Exists(args[i])) + { + input = args[i]; + editor = false; + playOnStart = true; + } + } + else if (args[i] == "-debug") + { + debugUI = true; + } + } + GameObject Cameras = Instantiate(Resources.Load("Prefabs/Cameras")); Cameras.name = "Cameras"; GameObject MainCamera = Cameras.transform.GetChild(0).gameObject; GameObject CursorCamera = Cameras.transform.GetChild(1).gameObject; @@ -33,7 +63,6 @@ namespace HeavenStudio GameManager gameManager = GameManager.AddComponent(); gameManager.playOnStart = playOnStart; - gameManager.txt = level; gameManager.GamesHolder = Games; gameManager.CircleCursor = Cursor.transform.GetChild(0).GetComponent(); gameManager.GameCamera = MainCamera.GetComponent(); @@ -64,8 +93,58 @@ namespace HeavenStudio } else { + this.GetComponent().enabled = false; + this.GetComponent().enabled = false; + this.GetComponent().enabled = false; + canvas.SetActive(false); + + OpenCmdRemix(input); + Debug.Log(json); + gameManager.txt = json; + gameManager.ext = ext; gameManager.Init(); } } + + public void OpenCmdRemix(string path) + { + if (path == string.Empty) return; + if (!File.Exists(path)) return; + byte[] MusicBytes; + bool loadedMusic = false; + string extension = path.GetExtension(); + + using var zipFile = File.Open(path, FileMode.Open); + using var archive = new ZipArchive(zipFile, ZipArchiveMode.Read); + + foreach (var entry in archive.Entries) + switch (entry.Name) + { + case "remix.json": + { + using var stream = entry.Open(); + using var reader = new StreamReader(stream); + json = reader.ReadToEnd(); + ext = extension; + break; + } + case "song.ogg": + { + using var stream = entry.Open(); + using var memoryStream = new MemoryStream(); + stream.CopyTo(memoryStream); + MusicBytes = memoryStream.ToArray(); + Conductor.instance.musicSource.clip = OggVorbis.VorbisPlugin.ToAudioClip(MusicBytes, "music"); + loadedMusic = true; + break; + } + } + + if (!loadedMusic) + { + Conductor.instance.musicSource.clip = null; + MusicBytes = null; + } + } } } \ No newline at end of file diff --git a/Assets/Scripts/LevelEditor/BoxSelection.cs b/Assets/Scripts/LevelEditor/BoxSelection.cs index 11c89d362..9caddd16c 100644 --- a/Assets/Scripts/LevelEditor/BoxSelection.cs +++ b/Assets/Scripts/LevelEditor/BoxSelection.cs @@ -48,6 +48,7 @@ namespace HeavenStudio.Editor private void Update() { + if (Editor.instance == null) return; float deltaTimelineX = timelineContent.transform.localPosition.x - timelineLastX; Camera camera = Editor.instance.EditorCamera; diff --git a/Assets/Scripts/LevelEditor/EditorTheme.cs b/Assets/Scripts/LevelEditor/EditorTheme.cs index effab54ec..a28e057f6 100644 --- a/Assets/Scripts/LevelEditor/EditorTheme.cs +++ b/Assets/Scripts/LevelEditor/EditorTheme.cs @@ -31,6 +31,7 @@ namespace HeavenStudio.Editor private void Start() { + if (Editor.instance == null) return; specialLayers.GetComponent().color = theme.properties.SpecialLayersCol.Hex2RGB(); tempoLayer.GetComponent().color = theme.properties.TempoLayerCol.Hex2RGB(); musicLayer.GetComponent().color = theme.properties.MusicLayerCol.Hex2RGB(); diff --git a/Assets/Scripts/Minigames.cs b/Assets/Scripts/Minigames.cs index 4f4df7d9a..73b62c9f9 100644 --- a/Assets/Scripts/Minigames.cs +++ b/Assets/Scripts/Minigames.cs @@ -37,6 +37,7 @@ namespace HeavenStudio public bool usesAssetBundle => (wantAssetBundle != ""); public bool hasLocales => (supportedLocales.Count > 0); public bool AssetsLoaded => (((hasLocales && localeLoaded && currentLoadedLocale == defaultLocale) || (!hasLocales)) && commonLoaded); + public bool SequencesPreloaded => soundSequences != null; private AssetBundle bundleCommon = null; private bool commonLoaded = false; @@ -46,6 +47,14 @@ namespace HeavenStudio private bool localeLoaded = false; private bool localePreloaded = false; + private SoundSequence.SequenceKeyValue[] soundSequences = null; + + public SoundSequence.SequenceKeyValue[] LoadedSoundSequences + { + get => soundSequences; + set => soundSequences = value; + } + public Minigame(string name, string displayName, string color, bool threeD, bool fxOnly, List actions, List tags = null, string assetBundle = "", string defaultLocale = "en", List supportedLocales = null) { this.name = name; diff --git a/Assets/Scripts/Util/Sound.cs b/Assets/Scripts/Util/Sound.cs index e0f11f88d..d9bfd68ae 100644 --- a/Assets/Scripts/Util/Sound.cs +++ b/Assets/Scripts/Util/Sound.cs @@ -38,27 +38,28 @@ namespace HeavenStudio.Util audioSource.pitch = pitch; audioSource.volume = volume; audioSource.loop = looping; + Conductor cnd = Conductor.instance; if (beat == -1 && !scheduled) { audioSource.PlayScheduled(AudioSettings.dspTime); playInstant = true; played = true; - startTime = Conductor.instance.songPositionAsDouble; + startTime = cnd.songPositionAsDouble; StartCoroutine(NotRelyOnBeatSound()); } else { playInstant = false; - scheduledPitch = Conductor.instance.musicSource.pitch; - startTime = (AudioSettings.dspTime + (Conductor.instance.GetSongPosFromBeat(beat) - Conductor.instance.songPositionAsDouble)/(double)scheduledPitch); + scheduledPitch = cnd.musicSource.pitch; + startTime = cnd.dspStartTimeAsDouble + ((cnd.GetSongPosFromBeat(beat - cnd.startBeatAsDouble))/(double)scheduledPitch); audioSource.PlayScheduled(startTime); - Debug.Log($"Scheduling future sound {clip.name} for beat {beat} (scheduled: {startTime}, current time: {AudioSettings.dspTime})"); } } private void Update() { + Conductor cnd = Conductor.instance; if (!played) { if (scheduled) @@ -78,12 +79,11 @@ namespace HeavenStudio.Util } else { - if (!played && scheduledPitch != Conductor.instance.musicSource.pitch) + if (!played && scheduledPitch != cnd.musicSource.pitch) { - scheduledPitch = Conductor.instance.musicSource.pitch; - startTime = (AudioSettings.dspTime + (Conductor.instance.GetSongPosFromBeat(beat) - Conductor.instance.songPositionAsDouble)/(double)scheduledPitch); + scheduledPitch = cnd.musicSource.pitch; + startTime = (AudioSettings.dspTime + (cnd.GetSongPosFromBeat(beat) - cnd.songPositionAsDouble)/(double)scheduledPitch); audioSource.SetScheduledStartTime(startTime); - Debug.Log($"Rescheduling future sound {clip.name} for beat {beat} (scheduled: {startTime}, current time: {AudioSettings.dspTime})"); } } } @@ -93,7 +93,7 @@ namespace HeavenStudio.Util { if (looping && loopEndBeat != -1) // Looping sounds play forever unless params are set. { - if (Conductor.instance.songPositionInBeats > loopEndBeat) + if (cnd.songPositionInBeats > loopEndBeat) { KillLoop(fadeTime); loopIndex++; diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 9b421b65a..81c9a0864 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 e07331984..1e304ecc0 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 1243838037 +CRC: 2483180215 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/ctrpillow/common b/Assets/StreamingAssets/ctrpillow/common index 8e82b1ac0..c05571915 100644 Binary files a/Assets/StreamingAssets/ctrpillow/common and b/Assets/StreamingAssets/ctrpillow/common differ diff --git a/Assets/StreamingAssets/ctrpillow/common.manifest b/Assets/StreamingAssets/ctrpillow/common.manifest index 2977095b2..50cfdbfa9 100644 --- a/Assets/StreamingAssets/ctrpillow/common.manifest +++ b/Assets/StreamingAssets/ctrpillow/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 1167382196 +CRC: 3465358365 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 91ca0253f29ae5f7a1df107a25dc7c75 + Hash: 3a4fb33b5553c823eef6c8ecb04520e1 TypeTreeHash: serializedVersion: 2 - Hash: 222d3ac4260743916f7d5e044ddd31d4 + Hash: f7c97b63c72a16f96d1364bd2603929e HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/karate/common b/Assets/StreamingAssets/karate/common index bcf93c612..097c309ae 100644 Binary files a/Assets/StreamingAssets/karate/common and b/Assets/StreamingAssets/karate/common differ diff --git a/Assets/StreamingAssets/karate/common.manifest b/Assets/StreamingAssets/karate/common.manifest index e78f21c1a..b78ae019d 100644 --- a/Assets/StreamingAssets/karate/common.manifest +++ b/Assets/StreamingAssets/karate/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 149759227 +CRC: 229325513 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 462778359784eea47ee51c3c63402505 + Hash: 069bce0dd25bdbc41e83dc4b09bd8143 TypeTreeHash: serializedVersion: 2 - Hash: fc2a2e95963d1b3faf439c84ecb440b4 + Hash: 98a6d4eb4172ec02b55d5f14afb2d5a8 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ntrcoin/common b/Assets/StreamingAssets/ntrcoin/common index 3d5672f67..149661c0b 100644 Binary files a/Assets/StreamingAssets/ntrcoin/common and b/Assets/StreamingAssets/ntrcoin/common differ diff --git a/Assets/StreamingAssets/ntrcoin/common.manifest b/Assets/StreamingAssets/ntrcoin/common.manifest index 5276f8bcc..525ab1cec 100644 --- a/Assets/StreamingAssets/ntrcoin/common.manifest +++ b/Assets/StreamingAssets/ntrcoin/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 1663830856 +CRC: 3127587906 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 688c0aa50fbd25fe17346b36c6bf2176 + Hash: e10341a51d15d8d18350e495d447c162 TypeTreeHash: serializedVersion: 2 - Hash: 51d10f004f46f35e758498b711eedb2f + Hash: 139f759006457bf43e15a8517f8ee5c0 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ntrdj/common b/Assets/StreamingAssets/ntrdj/common index 1020ed61a..009a678ec 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 2c1a4bfe1..961b55509 100644 --- a/Assets/StreamingAssets/ntrdj/common.manifest +++ b/Assets/StreamingAssets/ntrdj/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 3480558300 +CRC: 3201955903 Hashes: AssetFileHash: serializedVersion: 2 - Hash: cfaae0e9f9c81b2d255e8da0db667aae + Hash: 6dd02a8fda5fdb63afe693b00d6c8509 TypeTreeHash: serializedVersion: 2 - Hash: a669441aae6ee39a06c1090efd6d25bc + Hash: b0396ee8cf677796daf23b65e38d1ad2 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ntridol/common b/Assets/StreamingAssets/ntridol/common index fb986e9c5..090dbf47d 100644 Binary files a/Assets/StreamingAssets/ntridol/common and b/Assets/StreamingAssets/ntridol/common differ diff --git a/Assets/StreamingAssets/ntridol/common.manifest b/Assets/StreamingAssets/ntridol/common.manifest index 9211fc380..26e74afe9 100644 --- a/Assets/StreamingAssets/ntridol/common.manifest +++ b/Assets/StreamingAssets/ntridol/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 1706991399 +CRC: 2160738779 Hashes: AssetFileHash: serializedVersion: 2 - Hash: ae519aaff83042895009b1d4dbae0a79 + Hash: ad07dd4676edfbe5572d0236124a4350 TypeTreeHash: serializedVersion: 2 - Hash: 994ea96351ef9c039cf2db2caf2c1169 + Hash: 6c542f6873f7e3067be67f888d87c947 HashAppended: 0 ClassTypes: - Class: 1 diff --git a/Assets/StreamingAssets/ntrsamurai/common b/Assets/StreamingAssets/ntrsamurai/common index b863692fc..c0ee0c263 100644 Binary files a/Assets/StreamingAssets/ntrsamurai/common and b/Assets/StreamingAssets/ntrsamurai/common differ diff --git a/Assets/StreamingAssets/ntrsamurai/common.manifest b/Assets/StreamingAssets/ntrsamurai/common.manifest index 3763f619f..20ea2e4a6 100644 --- a/Assets/StreamingAssets/ntrsamurai/common.manifest +++ b/Assets/StreamingAssets/ntrsamurai/common.manifest @@ -1,12 +1,12 @@ ManifestFileVersion: 0 -CRC: 3961443211 +CRC: 1283939881 Hashes: AssetFileHash: serializedVersion: 2 - Hash: c56eae7afab3c51aa0d877ecb5fa6484 + Hash: d166274169e80ae349c4e66b396c95a6 TypeTreeHash: serializedVersion: 2 - Hash: 9a9bdfe5fc84d62897a4e311b61519be + Hash: 36c1544bd987dbffd607c6771ff240cf HashAppended: 0 ClassTypes: - Class: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index de7d695db..4a9cc8c02 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -134,7 +134,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 0.0.961 + bundleVersion: 0.0.963 preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 @@ -155,11 +155,11 @@ PlayerSettings: applicationIdentifier: Standalone: com.Megaminerzero.HeavenStudio buildNumber: - Standalone: 961 + Standalone: 963 iPhone: 0 tvOS: 0 overrideDefaultApplicationIdentifier: 0 - AndroidBundleVersionCode: 961 + AndroidBundleVersionCode: 963 AndroidMinSdkVersion: 19 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1