diff --git a/Assets/Resources/Sfx/games/loveLab.meta b/Assets/Resources/Sfx/games/loveLab.meta new file mode 100644 index 000000000..6fab01ca1 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bcbc46590d08f424792fb2fbb6ff48f0 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/bagHeart.ogg b/Assets/Resources/Sfx/games/loveLab/bagHeart.ogg new file mode 100644 index 000000000..1a2e6c6ae Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/bagHeart.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/bagHeart.ogg.meta b/Assets/Resources/Sfx/games/loveLab/bagHeart.ogg.meta new file mode 100644 index 000000000..655fd1452 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/bagHeart.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5001c1cad8515ad4799f21e3902c54df +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/bagHeartLast.ogg b/Assets/Resources/Sfx/games/loveLab/bagHeartLast.ogg new file mode 100644 index 000000000..aa8474f85 Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/bagHeartLast.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/bagHeartLast.ogg.meta b/Assets/Resources/Sfx/games/loveLab/bagHeartLast.ogg.meta new file mode 100644 index 000000000..987b42a53 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/bagHeartLast.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5d365840c1c0a2c499b90e74f8c44f9a +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/data.json b/Assets/Resources/Sfx/games/loveLab/data.json new file mode 100644 index 000000000..7dee39df6 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/data.json @@ -0,0 +1,498 @@ +{ + "id": "loveLab", + "name": "Love Lab", + "series": "ds", + "objects": [ + { + "type": "cue", + "id": "*/shakeUp", + "name": "shake - up", + "deprecatedIDs": [ + "loveLab/shake1" + ], + "subtext": "", + "duration": 0.25, + "responseIDs": [ + "*/shakeUp" + ] + }, + { + "type": "cue", + "id": "*/shakeDown", + "name": "shake - down", + "deprecatedIDs": [ + "loveLab/shake2" + ], + "subtext": "", + "duration": 0.25, + "responseIDs": [ + "*/shakeDown" + ] + }, + { + "type": "cue", + "id": "*/leftCatch", + "name": "left - catch", + "deprecatedIDs": [], + "subtext": "", + "duration": 0.5, + "responseIDs": [ + "*/rightCatch" + ] + }, + { + "type": "cue", + "id": "*/leftThrow", + "name": "left - throw", + "deprecatedIDs": [], + "subtext": "", + "duration": 0.5, + "responseIDs": [ + "*/rightThrow" + ] + }, + { + "type": "cue", + "id": "*/rightCatch", + "name": "right - catch", + "deprecatedIDs": [], + "subtext": "", + "duration": 0.5 + }, + { + "type": "cue", + "id": "*/rightThrow", + "name": "right - throw", + "deprecatedIDs": [], + "subtext": "", + "duration": 0.5 + }, + { + "type": "cue", + "id": "*/rightThrowNoShake", + "name": "right - throw - no shake", + "deprecatedIDs": [], + "subtext": "", + "duration": 0.5 + }, + { + "type": "cue", + "id": "*/heartsCombine", + "name": "hearts - combine", + "deprecatedIDs": [ + "loveLab/heartCombine" + ], + "subtext": "", + "duration": 1.0 + }, + { + "type": "cue", + "id": "*/bagHeart", + "name": "bag - heart", + "deprecatedIDs": [ + "loveLab/heartBag" + ], + "subtext": "", + "duration": 0.0625, + "repitchable": true + }, + { + "type": "cue", + "id": "*/bagHeartLast", + "name": "bag - last heart", + "deprecatedIDs": [ + "loveLab/heartBagLong" + ], + "subtext": "", + "duration": 0.0625, + "repitchable": true + }, + { + "type": "pattern", + "id": "*_1heart", + "name": "1 heart pattern", + "deprecatedIDs": [], + "cues": [ + { + "id": "*/leftCatch", + "beat": 0.0 + }, + { + "id": "*/leftThrow", + "beat": 1.0 + }, + { + "id": "*/rightCatch", + "beat": 2.0 + }, + { + "id": "*/rightThrow", + "beat": 3.0 + }, + { + "id": "*/heartsCombine", + "beat": 4.0 + }, + { + "id": "*/bagHeartLast", + "beat": 5.25 + } + ], + "subtext": "" + }, + { + "type": "pattern", + "id": "*_1heartOffbeat", + "name": "1 heart offbeat pattern", + "deprecatedIDs": [], + "cues": [ + { + "id": "*/leftCatch", + "beat": 0.0 + }, + { + "id": "*/leftThrow", + "beat": 0.5 + }, + { + "id": "*/rightCatch", + "beat": 2.0 + }, + { + "id": "*/rightThrow", + "beat": 2.5 + }, + { + "id": "*/heartsCombine", + "beat": 3.5 + }, + { + "id": "*/bagHeartLast", + "beat": 4.75 + } + ], + "subtext": "" + }, + { + "type": "pattern", + "id": "*_2heart", + "name": "2 heart pattern", + "deprecatedIDs": [], + "cues": [ + { + "id": "*/leftCatch", + "beat": 0.0 + }, + { + "id": "*/shakeUp", + "beat": 0.5 + }, + { + "id": "*/shakeDown", + "beat": 0.75 + }, + { + "id": "*/leftThrow", + "beat": 1.0 + }, + { + "id": "*/rightCatch", + "beat": 2.0 + }, + { + "id": "*/shakeUp", + "beat": 2.5 + }, + { + "id": "*/shakeDown", + "beat": 2.75 + }, + { + "id": "*/rightThrow", + "beat": 3.0 + }, + { + "id": "*/heartsCombine", + "beat": 4.0 + }, + { + "id": "*_heartPour2", + "beat": 5.25 + } + ], + "subtext": "" + }, + { + "type": "pattern", + "id": "*_3heart", + "name": "3 heart pattern", + "deprecatedIDs": [], + "cues": [ + { + "id": "*/leftCatch", + "beat": 0.0 + }, + { + "id": "*/shakeUp", + "beat": 1.0 + }, + { + "id": "*/shakeDown", + "beat": 1.25 + }, + { + "id": "*/shakeUp", + "beat": 1.5 + }, + { + "id": "*/shakeDown", + "beat": 1.75 + }, + { + "id": "*/leftThrow", + "beat": 2.0 + }, + { + "id": "*/rightCatch", + "beat": 4.0 + }, + { + "id": "*/shakeUp", + "beat": 5.0 + }, + { + "id": "*/shakeDown", + "beat": 5.25 + }, + { + "id": "*/shakeUp", + "beat": 5.5 + }, + { + "id": "*/shakeDown", + "beat": 5.75 + }, + { + "id": "*/rightThrow", + "beat": 6.0 + }, + { + "id": "*/heartsCombine", + "beat": 7.0 + }, + { + "id": "*_heartPour3", + "beat": 8.25 + } + ], + "subtext": "" + }, + { + "type": "pattern", + "id": "*_5heart", + "name": "5 heart pattern", + "deprecatedIDs": [], + "cues": [ + { + "id": "*/leftCatch", + "beat": 0.0 + }, + { + "id": "*/shakeUp", + "beat": 0.5 + }, + { + "id": "*/shakeDown", + "beat": 0.75 + }, + { + "id": "*/shakeUp", + "beat": 1.0 + }, + { + "id": "*/shakeDown", + "beat": 1.25 + }, + { + "id": "*/shakeUp", + "beat": 2.0 + }, + { + "id": "*/shakeDown", + "beat": 2.25 + }, + { + "id": "*/shakeUp", + "beat": 2.5 + }, + { + "id": "*/shakeDown", + "beat": 2.75 + }, + { + "id": "*/leftThrow", + "beat": 3.0 + }, + { + "id": "*/rightCatch", + "beat": 4.0 + }, + { + "id": "*/shakeUp", + "beat": 4.5 + }, + { + "id": "*/shakeDown", + "beat": 4.75 + }, + { + "id": "*/shakeUp", + "beat": 5.0 + }, + { + "id": "*/shakeDown", + "beat": 5.25 + }, + { + "id": "*/shakeUp", + "beat": 6.0 + }, + { + "id": "*/shakeDown", + "beat": 6.25 + }, + { + "id": "*/shakeUp", + "beat": 6.5 + }, + { + "id": "*/shakeDown", + "beat": 6.75 + }, + { + "id": "*/rightThrow", + "beat": 7.0 + }, + { + "id": "*/heartsCombine", + "beat": 8.0 + }, + { + "id": "*_heartPour5", + "beat": 9.25 + } + ], + "subtext": "" + }, + { + "type": "pattern", + "id": "*_heartPour2", + "name": "bag - 2 hearts", + "deprecatedIDs": [ + "loveLab/heartPour2" + ], + "cues": [ + { + "id": "*/bagHeart", + "beat": 0.0 + }, + { + "id": "*/bagHeartLast", + "beat": 0.0625, + "semitone": 2 + } + ], + "subtext": "" + }, + { + "type": "pattern", + "id": "*_heartPour3", + "name": "bag - 3 hearts", + "deprecatedIDs": [ + "loveLab/heartPour3" + ], + "cues": [ + { + "id": "*/bagHeart", + "beat": 0.0 + }, + { + "id": "*/bagHeart", + "beat": 0.0625, + "semitone": 2 + }, + { + "id": "*/bagHeartLast", + "beat": 0.125, + "semitone": 4 + } + ], + "subtext": "" + }, + { + "type": "pattern", + "id": "*_heartPour4", + "name": "bag - 4 hearts", + "deprecatedIDs": [ + "loveLab/heartPour4" + ], + "cues": [ + { + "id": "*/bagHeart", + "beat": 0.0 + }, + { + "id": "*/bagHeart", + "beat": 0.0625, + "semitone": 2 + }, + { + "id": "*/bagHeart", + "beat": 0.125, + "semitone": 4 + }, + { + "id": "*/bagHeartLast", + "beat": 0.1875, + "semitone": 7 + } + ], + "subtext": "" + }, + { + "type": "pattern", + "id": "*_heartPour5", + "name": "bag - 5 hearts", + "deprecatedIDs": [ + "loveLab/heartPour5" + ], + "cues": [ + { + "id": "*/bagHeart", + "beat": 0.0 + }, + { + "id": "*/bagHeart", + "beat": 0.0625, + "semitone": 2 + }, + { + "id": "*/bagHeart", + "beat": 0.125, + "semitone": 4 + }, + { + "id": "*/bagHeart", + "beat": 0.1875, + "semitone": 7 + }, + { + "id": "*/bagHeartLast", + "beat": 0.25, + "semitone": 8 + } + ], + "subtext": "" + } + ] +} \ No newline at end of file diff --git a/Assets/Resources/Sfx/games/loveLab/data.json.meta b/Assets/Resources/Sfx/games/loveLab/data.json.meta new file mode 100644 index 000000000..887ce0671 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/data.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 96fc052bc6321d6468b281f578a38615 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/heartsCombine.ogg b/Assets/Resources/Sfx/games/loveLab/heartsCombine.ogg new file mode 100644 index 000000000..9949d3456 Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/heartsCombine.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/heartsCombine.ogg.meta b/Assets/Resources/Sfx/games/loveLab/heartsCombine.ogg.meta new file mode 100644 index 000000000..a924fa71d --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/heartsCombine.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 6ad78a65458497e4bbf5e014b13cd4aa +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/icon.png b/Assets/Resources/Sfx/games/loveLab/icon.png new file mode 100644 index 000000000..a141ebe22 Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/icon.png differ diff --git a/Assets/Resources/Sfx/games/loveLab/icon.png.meta b/Assets/Resources/Sfx/games/loveLab/icon.png.meta new file mode 100644 index 000000000..71a80f91d --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/icon.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: d4088c23eec591647aef842b5d2338e7 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + 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 + ignoreMasterTextureLimit: 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 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/leftCatch.ogg b/Assets/Resources/Sfx/games/loveLab/leftCatch.ogg new file mode 100644 index 000000000..c15c54de0 Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/leftCatch.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/leftCatch.ogg.meta b/Assets/Resources/Sfx/games/loveLab/leftCatch.ogg.meta new file mode 100644 index 000000000..0307f6934 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/leftCatch.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: f5c958dfd94eed64499ffdd58f22bec1 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/leftThrow.ogg b/Assets/Resources/Sfx/games/loveLab/leftThrow.ogg new file mode 100644 index 000000000..46b93328e Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/leftThrow.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/leftThrow.ogg.meta b/Assets/Resources/Sfx/games/loveLab/leftThrow.ogg.meta new file mode 100644 index 000000000..dfb0ccf58 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/leftThrow.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 3df8bda7d85675940b2a63118ff3a8a0 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/rightCatch.ogg b/Assets/Resources/Sfx/games/loveLab/rightCatch.ogg new file mode 100644 index 000000000..8be2b596b Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/rightCatch.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/rightCatch.ogg.meta b/Assets/Resources/Sfx/games/loveLab/rightCatch.ogg.meta new file mode 100644 index 000000000..17074eff4 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/rightCatch.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 8fe1b51137560cd4c945c63b54dbbe8e +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/rightThrow.ogg b/Assets/Resources/Sfx/games/loveLab/rightThrow.ogg new file mode 100644 index 000000000..a9bb2e2a1 Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/rightThrow.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/rightThrow.ogg.meta b/Assets/Resources/Sfx/games/loveLab/rightThrow.ogg.meta new file mode 100644 index 000000000..27d8b761c --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/rightThrow.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 5ce08fb206f01ee45aa9a7f56901cead +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/rightThrowNoShake.ogg b/Assets/Resources/Sfx/games/loveLab/rightThrowNoShake.ogg new file mode 100644 index 000000000..29033dc16 Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/rightThrowNoShake.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/rightThrowNoShake.ogg.meta b/Assets/Resources/Sfx/games/loveLab/rightThrowNoShake.ogg.meta new file mode 100644 index 000000000..6e57d7522 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/rightThrowNoShake.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 543cd551a7aa7da4d853683ae285c548 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/shakeDown.ogg b/Assets/Resources/Sfx/games/loveLab/shakeDown.ogg new file mode 100644 index 000000000..c844a9867 Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/shakeDown.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/shakeDown.ogg.meta b/Assets/Resources/Sfx/games/loveLab/shakeDown.ogg.meta new file mode 100644 index 000000000..3ffbcd913 --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/shakeDown.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 418d00ec2fb656046a2e60e19bf03221 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Sfx/games/loveLab/shakeUp.ogg b/Assets/Resources/Sfx/games/loveLab/shakeUp.ogg new file mode 100644 index 000000000..eee2c0464 Binary files /dev/null and b/Assets/Resources/Sfx/games/loveLab/shakeUp.ogg differ diff --git a/Assets/Resources/Sfx/games/loveLab/shakeUp.ogg.meta b/Assets/Resources/Sfx/games/loveLab/shakeUp.ogg.meta new file mode 100644 index 000000000..025d9913c --- /dev/null +++ b/Assets/Resources/Sfx/games/loveLab/shakeUp.ogg.meta @@ -0,0 +1,22 @@ +fileFormatVersion: 2 +guid: 9788272175a86d247b7748c46fb739a1 +AudioImporter: + externalObjects: {} + serializedVersion: 6 + defaultSettings: + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + preloadAudioData: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Editor.unity b/Assets/Scenes/Editor.unity index d90543fa8..7773201a6 100644 --- a/Assets/Scenes/Editor.unity +++ b/Assets/Scenes/Editor.unity @@ -7166,8 +7166,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 656.00006, y: -25} - m_SizeDelta: {x: 1288.0001, y: 40} + m_AnchoredPosition: {x: 704.49994, y: -25} + m_SizeDelta: {x: 1384.9999, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &278632245 MonoBehaviour: @@ -8905,6 +8905,72 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 330515826} m_CullTransparentMesh: 1 +--- !u!1 &336909614 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 336909615} + - component: {fileID: 336909616} + m_Layer: 5 + m_Name: Slider Holder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &336909615 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 336909614} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 590691360} + - {fileID: 907963052} + - {fileID: 2073774546} + m_Father: {fileID: 1922212788} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 589.1869, y: -20} + m_SizeDelta: {x: 384, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &336909616 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 336909614} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 3 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 --- !u!1 &339874947 GameObject: m_ObjectHideFlags: 0 @@ -11036,6 +11102,143 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 424396916} m_CullTransparentMesh: 1 +--- !u!1 &438205292 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 438205293} + - component: {fileID: 438205295} + - component: {fileID: 438205294} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &438205293 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 438205292} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1472198528} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &438205294 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 438205292} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Light + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &438205295 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 438205292} + m_CullTransparentMesh: 1 --- !u!1 &441876680 GameObject: m_ObjectHideFlags: 0 @@ -11212,6 +11415,143 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 446434228} m_CullTransparentMesh: 1 +--- !u!1 &446828354 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446828355} + - component: {fileID: 446828357} + - component: {fileID: 446828356} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &446828355 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446828354} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2100827391} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &446828356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446828354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Straight + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &446828357 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446828354} + m_CullTransparentMesh: 1 --- !u!1 &449176920 GameObject: m_ObjectHideFlags: 0 @@ -12009,7 +12349,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 291.18695, y: -20} + m_AnchoredPosition: {x: 291.18692, y: -20} m_SizeDelta: {x: 200, y: 40} m_Pivot: {x: 0, y: 0.5} --- !u!114 &467708509 @@ -13155,7 +13495,7 @@ MonoBehaviour: m_TargetGraphic: {fileID: 171581557} m_HandleRect: {fileID: 171581556} m_Direction: 2 - m_Value: 0 + m_Value: 1 m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: @@ -16369,16 +16709,16 @@ RectTransform: m_GameObject: {fileID: 590691359} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 0.9999999} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 923757708} + m_Father: {fileID: 336909615} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -20} - m_SizeDelta: {x: 50, y: 50} + m_AnchoredPosition: {x: 32, y: -25} + m_SizeDelta: {x: 64, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &590691361 MonoBehaviour: @@ -16400,7 +16740,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0% + m_text: 50% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4810e200fa0cb24438bac52343d7674b, type: 2} m_sharedMaterial: {fileID: 8580487687356851718, guid: 4810e200fa0cb24438bac52343d7674b, type: 2} @@ -19772,12 +20112,12 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 981306209} - m_Father: {fileID: 923757708} - m_RootOrder: 3 + m_Father: {fileID: 1922212788} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 436, y: -20} + m_AnchoredPosition: {x: 323.18692, y: -20} m_SizeDelta: {x: 64, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &704808992 @@ -19844,7 +20184,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 788904139} m_TargetAssemblyTypeName: TempoDialog, Assembly-CSharp - m_MethodName: SetSwing + m_MethodName: SwingManualUpdate m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} @@ -19878,7 +20218,7 @@ MonoBehaviour: m_CaretColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} m_CustomCaretColor: 0 m_SelectionColor: {r: 0.65882355, g: 0.80784315, b: 1, a: 0.7529412} - m_Text: 100 + m_Text: 50 m_CaretBlinkRate: 0.85 m_CaretWidth: 1 m_ReadOnly: 0 @@ -25186,18 +25526,18 @@ RectTransform: m_GameObject: {fileID: 907963051} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 0.9999999} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2092926359} - {fileID: 1711155737} - {fileID: 2062943138} - m_Father: {fileID: 923757708} + m_Father: {fileID: 336909615} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 178, y: -20} + m_AnchoredPosition: {x: 192, y: -25} m_SizeDelta: {x: 256, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &907963053 @@ -25415,7 +25755,7 @@ MonoBehaviour: m_HandleRect: {fileID: 1589389271} m_Direction: 2 m_Value: 0 - m_Size: 0.99392056 + m_Size: 0.99999326 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -26051,82 +26391,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 921541685} m_CullTransparentMesh: 1 ---- !u!1 &923757707 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 923757708} - - component: {fileID: 923757710} - - component: {fileID: 923757709} - m_Layer: 5 - m_Name: Holder - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &923757708 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 923757707} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 1 - m_Children: - - {fileID: 590691360} - - {fileID: 907963052} - - {fileID: 2073774546} - - {fileID: 704808991} - m_Father: {fileID: 1922212788} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 935.187, y: -20} - m_SizeDelta: {x: 1288.0001, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &923757709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 923757707} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 3 - m_Spacing: 0 - m_ChildForceExpandWidth: 0 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 0 - m_ChildControlHeight: 0 - m_ChildScaleWidth: 0 - m_ChildScaleHeight: 0 - m_ReverseArrangement: 0 ---- !u!222 &923757710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 923757707} - m_CullTransparentMesh: 1 --- !u!1 &924634313 GameObject: m_ObjectHideFlags: 0 @@ -31580,7 +31844,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: 199.0612} + m_AnchoredPosition: {x: 0, y: 122.12247} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 1} --- !u!222 &1154875945 @@ -32340,6 +32604,140 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 +--- !u!1 &1186036659 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1186036660} + - component: {fileID: 1186036663} + - component: {fileID: 1186036662} + - component: {fileID: 1186036661} + m_Layer: 5 + m_Name: Heavy + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1186036660 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186036659} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9996659, y: 0.9996659, z: 0.9996659} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1710362883} + m_Father: {fileID: 1922212788} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1310.796, y: -20} + m_SizeDelta: {x: 103.316925, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1186036661 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186036659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1186036662} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 788904139} + m_TargetAssemblyTypeName: TempoDialog, Assembly-CSharp + m_MethodName: SetHeavySwing + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1186036662 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186036659} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1186036663 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1186036659} + m_CullTransparentMesh: 1 --- !u!1 &1186810248 GameObject: m_ObjectHideFlags: 0 @@ -37506,7 +37904,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "100\u200B" + m_text: "50\u200B" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2} @@ -38317,6 +38715,140 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!1 &1472198527 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1472198528} + - component: {fileID: 1472198531} + - component: {fileID: 1472198530} + - component: {fileID: 1472198529} + m_Layer: 5 + m_Name: Light + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1472198528 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472198527} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9996659, y: 0.9996659, z: 0.9996659} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 438205293} + m_Father: {fileID: 1922212788} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1020.16223, y: -20} + m_SizeDelta: {x: 103.316925, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1472198529 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472198527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1472198530} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 788904139} + m_TargetAssemblyTypeName: TempoDialog, Assembly-CSharp + m_MethodName: SetLightSwing + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1472198530 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472198527} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1472198531 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1472198527} + m_CullTransparentMesh: 1 --- !u!1 &1478799964 GameObject: m_ObjectHideFlags: 0 @@ -41326,8 +41858,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1220118245} m_HandleRect: {fileID: 1220118244} m_Direction: 2 - m_Value: 1 - m_Size: 1 + m_Value: 1.0000005 + m_Size: 0.61358607 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -43154,6 +43686,143 @@ MonoBehaviour: m_FlexibleWidth: -1 m_FlexibleHeight: -1 m_LayoutPriority: 1 +--- !u!1 &1710362882 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1710362883} + - component: {fileID: 1710362885} + - component: {fileID: 1710362884} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1710362883 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710362882} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1186036660} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1710362884 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710362882} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Heavy + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1710362885 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1710362882} + m_CullTransparentMesh: 1 --- !u!1 &1711155736 GameObject: m_ObjectHideFlags: 0 @@ -46186,6 +46855,140 @@ MonoBehaviour: m_EditorClassIdentifier: EntityTemplate: {fileID: 798021450} BlockDeleteFXTemplate: {fileID: 1806429020} +--- !u!1 &1863388557 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1863388558} + - component: {fileID: 1863388561} + - component: {fileID: 1863388560} + - component: {fileID: 1863388559} + m_Layer: 5 + m_Name: Standard + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1863388558 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1863388557} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9996659, y: 0.9996659, z: 0.9996659} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1917317881} + m_Father: {fileID: 1922212788} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 1165.4791, y: -20} + m_SizeDelta: {x: 103.316925, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1863388559 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1863388557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1863388560} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 788904139} + m_TargetAssemblyTypeName: TempoDialog, Assembly-CSharp + m_MethodName: SetNormalSwing + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &1863388560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1863388557} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1863388561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1863388557} + m_CullTransparentMesh: 1 --- !u!1 &1863600390 GameObject: m_ObjectHideFlags: 0 @@ -46365,7 +47168,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 1182.0001, y: -25} + m_AnchoredPosition: {x: 1278.9999, y: -25} m_SizeDelta: {x: 360, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1876126829 @@ -47730,6 +48533,143 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: TooltipText: Zoom Reset +--- !u!1 &1917317880 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1917317881} + - component: {fileID: 1917317883} + - component: {fileID: 1917317882} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1917317881 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917317880} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1863388558} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1917317882 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917317880} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Standard + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_sharedMaterial: {fileID: -6562250930271150993, guid: 8597c35f18a008c428fc5870aec75766, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4281479730 + m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 16 + m_fontSizeBase: 16 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_TextWrappingMode: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 0 + m_ActiveFontFeatures: 6e72656b + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_EmojiFallbackSupport: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1917317883 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1917317880} + m_CullTransparentMesh: 1 --- !u!1 &1918556255 GameObject: m_ObjectHideFlags: 0 @@ -47912,14 +48852,19 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 924634314} - - {fileID: 923757708} + - {fileID: 704808991} + - {fileID: 336909615} + - {fileID: 2100827391} + - {fileID: 1472198528} + - {fileID: 1863388558} + - {fileID: 1186036660} m_Father: {fileID: 980212093} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 809.5935, y: -69} - m_SizeDelta: {x: 1595.187, y: 40} + m_AnchoredPosition: {x: 704.49994, y: -69} + m_SizeDelta: {x: 1384.9999, y: 40} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1922212789 MonoBehaviour: @@ -51731,16 +52676,16 @@ RectTransform: m_GameObject: {fileID: 2073774545} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 0.9999999} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 923757708} + m_Father: {fileID: 336909615} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 355, y: -20} - m_SizeDelta: {x: 98, y: 50} + m_AnchoredPosition: {x: 352, y: -25} + m_SizeDelta: {x: 64, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2073774547 MonoBehaviour: @@ -51762,7 +52707,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 100% + m_text: 75% m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 4810e200fa0cb24438bac52343d7674b, type: 2} m_sharedMaterial: {fileID: 8580487687356851718, guid: 4810e200fa0cb24438bac52343d7674b, type: 2} @@ -52627,6 +53572,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2098678239} m_CullTransparentMesh: 1 +--- !u!1 &2100827390 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2100827391} + - component: {fileID: 2100827394} + - component: {fileID: 2100827393} + - component: {fileID: 2100827392} + m_Layer: 5 + m_Name: Straight + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2100827391 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2100827390} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.9996659, y: 0.9996659, z: 0.9996659} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 446828355} + m_Father: {fileID: 1922212788} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 874.84534, y: -20} + m_SizeDelta: {x: 103.316925, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2100827392 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2100827390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2100827393} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 788904139} + m_TargetAssemblyTypeName: TempoDialog, Assembly-CSharp + m_MethodName: SetStraightSwing + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &2100827393 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2100827390} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &2100827394 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2100827390} + m_CullTransparentMesh: 1 --- !u!1 &2107887118 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs index e04971361..d31565d3f 100644 --- a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs +++ b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/SpecialTimeline.cs @@ -243,7 +243,7 @@ namespace HeavenStudio.Editor.Track if (create) { - RiqEntity sectionC = GameManager.instance.Beatmap.AddNewSectionMarker(Timeline.instance.MousePos2BeatSnap, "New Section"); + RiqEntity sectionC = GameManager.instance.Beatmap.AddNewSectionMarker(Timeline.instance.MousePos2BeatSnap, ""); sectionC.CreateProperty("startPerfect", false); sectionC.CreateProperty("weight", 1f); diff --git a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs index fe2dd3c35..3305dcdd5 100644 --- a/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs +++ b/Assets/Scripts/LevelEditor/Timeline/SpecialTmeline/TempoDialog.cs @@ -51,7 +51,7 @@ public class TempoDialog : Dialog deleteButton.gameObject.SetActive(!tempoObj.first); tempoInput.text = tempoObj.chartEntity["tempo"].ToString("F"); - swingInput.text = (tempoObj.chartEntity["swing"] * 400).ToString("F"); + swingInput.text = (tempoObj.chartEntity["swing"] * 100 + 50).ToString("F"); swingSlider.value = tempoObj.chartEntity["swing"]; swingDivisionToggle.isOn = tempoObj.chartEntity["swingDivision"] != 1f; @@ -97,24 +97,81 @@ public class TempoDialog : Dialog } } + public void RefreshSwingUI() + { + swingInput.text = (tempoObj.chartEntity["swing"] * 100 + 50).ToString("F"); + swingSlider.value = tempoObj.chartEntity["swing"]; + } + public void SwingSliderUpdate() { if (tempoObj != null) { tempoObj.SetSwing(System.MathF.Round(swingSlider.value, 4)); - swingInput.text = (tempoObj.chartEntity["swing"] * 400).ToString("F"); - swingSlider.value = tempoObj.chartEntity["swing"]; + RefreshSwingUI(); } } - public void SetSwing() + public void SwingManualUpdate() { if (tempoObj != null) { float swing = float.Parse(swingInput.text); - tempoObj.SetSwing(swing * 0.25f / 100f); - swingInput.text = (tempoObj.chartEntity["swing"] * 400).ToString("F"); - swingSlider.value = tempoObj.chartEntity["swing"]; + tempoObj.SetSwing(swing / 100f - 0.5f); + RefreshSwingUI(); + } + } + + /* + a note for future reference: + + all stored swing values (like ones in remix.json) are the SWING RATIO - 0.5 + for example, a swing ratio of 50% would be 0.5 - 0.5 = 0 + and a ratio of 66.67% would be 0.6667 - 0.5 = 0.1667 + + you put that final value into tempoObj.SetSwing() to set it, + hence why the above functions use that weird formula and the below functions set it directly + + in addition, you can get the swing ratio (as a percentage) from this value by + multiplying the value by 100, then adding 50 + + this is really stupid lol + minenice why didnt you write any of this down lmao - zeo + */ + + public void SetStraightSwing() + { + if (tempoObj != null) + { + tempoObj.SetSwing(0f); + RefreshSwingUI(); + } + } + + public void SetLightSwing() + { + if (tempoObj != null) + { + tempoObj.SetSwing(0.1f); + RefreshSwingUI(); + } + } + + public void SetNormalSwing() + { + if (tempoObj != null) + { + tempoObj.SetSwing(0.1667f); + RefreshSwingUI(); + } + } + + public void SetHeavySwing() + { + if (tempoObj != null) + { + tempoObj.SetSwing(0.25f); + RefreshSwingUI(); } }