diff --git a/Assets/Resources/Games/loveLab.prefab b/Assets/Resources/Games/loveLab.prefab index 1cb1b3f4..aebc47b7 100644 --- a/Assets/Resources/Games/loveLab.prefab +++ b/Assets/Resources/Games/loveLab.prefab @@ -217,7 +217,7 @@ Transform: - {fileID: 7256173676385752080} - {fileID: 8811559774279914714} m_Father: {fileID: 878409105178889012} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &205224907812932483 GameObject: @@ -584,7 +584,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 158041266922703769} - {fileID: 3903276360714043343} - {fileID: 7826985892732635723} - {fileID: 4674094147555684652} @@ -686,7 +685,7 @@ MonoBehaviour: completeHearts: [] currentHearts: endPoint: {fileID: 7492619980896112047} - spawnPoint: {x: 2.7, y: 0} + spawnPoint: {x: 2.7, y: 0, z: 0} shaderColorsDebug: - _ColorAlpha - _ColorBravo @@ -1339,7 +1338,7 @@ Transform: - {fileID: 1203776432095807270} - {fileID: 6383943109312877973} m_Father: {fileID: 878409105178889012} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &753038344855408072 GameObject: @@ -6463,90 +6462,6 @@ ParticleSystemRenderer: m_MeshWeighting2: 1 m_MeshWeighting3: 1 m_MaskInteraction: 0 ---- !u!1 &842596389330147302 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 158041266922703769} - - component: {fileID: 7022934440721002885} - m_Layer: 0 - m_Name: lovelabtest - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &158041266922703769 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 842596389330147302} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.04, y: -0.09, z: 0} - m_LocalScale: {x: 0.47851, y: 0.47851, z: 0.47851} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 878409105178889012} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &7022934440721002885 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 842596389330147302} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 1090 - m_Sprite: {fileID: 21300000, guid: b95fc0382f7f27d45aa3700282ce3605, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 38.36, y: 21.54004} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &902626869248920787 GameObject: m_ObjectHideFlags: 0 @@ -13785,7 +13700,7 @@ Transform: - {fileID: 8380959935094053506} - {fileID: 6921272146124063076} m_Father: {fileID: 878409105178889012} - m_RootOrder: 5 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &2071272534245185769 Animator: @@ -14163,7 +14078,7 @@ Transform: - {fileID: 9158456448347328387} - {fileID: 4345889365010825124} m_Father: {fileID: 878409105178889012} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &4056063042128174322 Animator: @@ -19087,7 +19002,7 @@ Transform: - {fileID: 8875270146038147344} - {fileID: 930037580571553143} m_Father: {fileID: 878409105178889012} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2801754847648881029 GameObject: @@ -19490,7 +19405,7 @@ Transform: - {fileID: 7766427145776930279} - {fileID: 7492619980896112047} m_Father: {fileID: 878409105178889012} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &6043310135498338089 Animator: @@ -29531,7 +29446,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3399768485951550432} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.16, y: 2.54, z: 0} + m_LocalPosition: {x: -0.16, y: 2.51, z: 0} m_LocalScale: {x: 0.6145831, y: 0.6145831, z: 0.6145831} m_ConstrainProportionsScale: 0 m_Children: [] @@ -31219,7 +31134,7 @@ Transform: - {fileID: 3181055819505295525} - {fileID: 605755663413265918} m_Father: {fileID: 878409105178889012} - m_RootOrder: 7 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &4485288482261619232 GameObject: @@ -31422,7 +31337,7 @@ Transform: - {fileID: 9023725056155168413} - {fileID: 4908437287645588744} m_Father: {fileID: 878409105178889012} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &7144185182759799523 Animator: @@ -32721,7 +32636,7 @@ Transform: - {fileID: 7673906202509288830} - {fileID: 3963398826742134519} m_Father: {fileID: 878409105178889012} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &5823692234228302871 GameObject: @@ -39810,7 +39725,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7383114071657625087} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.16, y: 2.54, z: 0} + m_LocalPosition: {x: -0.16, y: 2.51, z: 0} m_LocalScale: {x: 0.6145831, y: 0.6145831, z: 0.6145831} m_ConstrainProportionsScale: 0 m_Children: [] @@ -45989,7 +45904,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 878409105178889012} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &8858862843781676607 GameObject: @@ -51157,7 +51072,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9042125118129025228} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.094852, y: 0.085157, z: 0} + m_LocalPosition: {x: -0.094852, y: 0.08, z: 0} m_LocalScale: {x: 1.0360237, y: 1.0360237, z: 1.0360237} m_ConstrainProportionsScale: 0 m_Children: [] @@ -51429,7 +51344,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8871027978808917837, guid: 244bc2a5d46d4134b94f01fb62251a6f, type: 3} propertyPath: m_RootOrder - value: 10 + value: 9 objectReference: {fileID: 0} - target: {fileID: 8871027978808917837, guid: 244bc2a5d46d4134b94f01fb62251a6f, type: 3} propertyPath: m_LocalPosition.x @@ -51492,7 +51407,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 424226343647273410, guid: 04209494c0eb4ee4c90cce6ecbdfed46, type: 3} propertyPath: m_RootOrder - value: 11 + value: 10 objectReference: {fileID: 0} - target: {fileID: 424226343647273410, guid: 04209494c0eb4ee4c90cce6ecbdfed46, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Resources/Sprites/Games/LoveLab/lovelabtest.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/loveLab.png.meta similarity index 98% rename from Assets/Resources/Sprites/Games/LoveLab/lovelabtest.png.meta rename to Assets/Resources/Sprites/Editor/GameIcons/loveLab.png.meta index e1d8c844..611f1a80 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/lovelabtest.png.meta +++ b/Assets/Resources/Sprites/Editor/GameIcons/loveLab.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b95fc0382f7f27d45aa3700282ce3605 +guid: 1bfd3d67b73c73247b90d81dd6227e8e TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Resources/Sprites/Editor/GameIcons/loveLab_mask.png.meta b/Assets/Resources/Sprites/Editor/GameIcons/loveLab_mask.png.meta new file mode 100644 index 00000000..bea4f65b --- /dev/null +++ b/Assets/Resources/Sprites/Editor/GameIcons/loveLab_mask.png.meta @@ -0,0 +1,123 @@ +fileFormatVersion: 2 +guid: a5b39d29d73bb194e94fef35fd1ab37f +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/Sprites/Games/LoveLab/Animations/GirlBopLeft.anim b/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlBopLeft.anim index b5411e27..2298cb9a 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlBopLeft.anim +++ b/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlBopLeft.anim @@ -88,7 +88,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.544, y: -1.452, z: 0} + value: {x: -0.571, y: -1.474, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -480,7 +480,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.544 + value: -0.571 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -517,7 +517,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.452 + value: -1.474 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlBopRight.anim b/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlBopRight.anim index 8894f4fe..33ff9553 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlBopRight.anim +++ b/Assets/Resources/Sprites/Games/LoveLab/Animations/GirlBopRight.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.594, y: -1.486, z: 0} + value: {x: -0.598, y: -1.478, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: -0.582, y: -1.411, z: 0} + value: {x: -0.564, y: -1.393, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -258,7 +258,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.594 + value: -0.598 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -267,7 +267,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -0.582 + value: -0.564 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -295,7 +295,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -1.486 + value: -1.478 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -304,7 +304,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -1.411 + value: -1.393 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/LoveLab/Animations/GuyRightFace.anim b/Assets/Resources/Sprites/Games/LoveLab/Animations/GuyRightFace.anim index ac2f0b73..61367da5 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/Animations/GuyRightFace.anim +++ b/Assets/Resources/Sprites/Games/LoveLab/Animations/GuyRightFace.anim @@ -19,7 +19,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.033333335 + time: 0 value: {x: -0.007, y: 0.047, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} @@ -35,14 +35,14 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.033333335 - value: {x: -0.041000023, y: 0.06600003, z: 0} + time: 0 + value: {x: -0.032, y: 0.06600003, z: 0} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: Infinity, y: 0, z: 0} tangentMode: 0 weightedMode: 0 - inWeight: {x: 0, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -51,14 +51,14 @@ AnimationClip: m_FloatCurves: [] m_PPtrCurves: - curve: - - time: 0.033333335 + - time: 0 value: {fileID: -2127009915, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3} attribute: m_Sprite path: HeadSprite classID: 212 script: {fileID: 0} - curve: - - time: 0.033333335 + - time: 0 value: {fileID: -159048702, guid: 32b8969086bedeb45b1cb9a4a9c5cddb, type: 3} attribute: m_Sprite path: Shading @@ -107,7 +107,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.06666667 + m_StopTime: 0.033333335 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -127,7 +127,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.033333335 + time: 0 value: -0.007 inSlope: Infinity outSlope: Infinity @@ -146,7 +146,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.033333335 + time: 0 value: 0.047 inSlope: Infinity outSlope: Infinity @@ -165,7 +165,7 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.033333335 + time: 0 value: 0 inSlope: Infinity outSlope: Infinity @@ -184,14 +184,14 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.033333335 - value: -0.041000023 + time: 0 + value: -0.032 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -203,14 +203,14 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.033333335 + time: 0 value: 0.06600003 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -222,14 +222,14 @@ AnimationClip: serializedVersion: 2 m_Curve: - serializedVersion: 3 - time: 0.033333335 + time: 0 value: 0 inSlope: Infinity outSlope: Infinity tangentMode: 103 weightedMode: 0 - inWeight: 0 - outWeight: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Resources/Sprites/Games/LoveLab/Animations/ShakeFlaskUp.anim b/Assets/Resources/Sprites/Games/LoveLab/Animations/ShakeFlaskUp.anim index bf9817c1..16fda78d 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/Animations/ShakeFlaskUp.anim +++ b/Assets/Resources/Sprites/Games/LoveLab/Animations/ShakeFlaskUp.anim @@ -122,7 +122,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.661, y: 0.529, z: 0} + value: {x: -0.632, y: 0.529, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -131,7 +131,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.033333335 - value: {x: -0.643, y: 0.547, z: 0} + value: {x: -0.614, y: 0.547, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -140,7 +140,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: -0.643, y: 0.547, z: 0} + value: {x: -0.614, y: 0.547, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -788,7 +788,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.661 + value: -0.632 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -797,7 +797,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: -0.643 + value: -0.614 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -806,7 +806,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -0.643 + value: -0.614 inSlope: Infinity outSlope: Infinity tangentMode: 103 diff --git a/Assets/Resources/Sprites/Games/LoveLab/Animations/ThrowFlask.anim b/Assets/Resources/Sprites/Games/LoveLab/Animations/ThrowFlask.anim index 2aad6800..ad4cfab2 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/Animations/ThrowFlask.anim +++ b/Assets/Resources/Sprites/Games/LoveLab/Animations/ThrowFlask.anim @@ -53,7 +53,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 1.476} + value: {x: 0, y: 0, z: 4.377} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -79,7 +79,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.4, y: 0.861, z: 0} + value: {x: -0.44, y: 0.828, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -88,7 +88,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.033333335 - value: {x: -0.329, y: 0.939, z: 0} + value: {x: -0.349, y: 0.966, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: -0.329, y: 0.939, z: 0} + value: {x: -0.348, y: 0.965, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -334,7 +334,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.4 + value: -0.44 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -343,7 +343,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: -0.329 + value: -0.349 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -352,7 +352,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -0.329 + value: -0.348 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -371,7 +371,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.861 + value: 0.828 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -380,7 +380,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.033333335 - value: 0.939 + value: 0.966 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -389,7 +389,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: 0.939 + value: 0.965 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -817,7 +817,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1.476 + value: 4.377 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -848,7 +848,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Sleeve + path: Hand classID: 4 script: {fileID: 0} - curve: @@ -858,17 +858,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Sleeve - classID: 4 - script: {fileID: 0} - - curve: - serializedVersion: 2 - m_Curve: [] - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - attribute: m_LocalEulerAngles.x - path: Sleeve + path: Hand classID: 4 script: {fileID: 0} - curve: @@ -881,6 +871,16 @@ AnimationClip: path: Hand classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: [] + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalEulerAngles.x + path: Sleeve + classID: 4 + script: {fileID: 0} - curve: serializedVersion: 2 m_Curve: [] @@ -888,7 +888,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.y - path: Hand + path: Sleeve classID: 4 script: {fileID: 0} - curve: @@ -898,7 +898,7 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 attribute: m_LocalEulerAngles.z - path: Hand + path: Sleeve classID: 4 script: {fileID: 0} m_HasGenericRootTransform: 0 diff --git a/Assets/Resources/Sprites/Games/LoveLab/Flask.mat b/Assets/Resources/Sprites/Games/LoveLab/Flask.mat index 61af3ec7..cf6395c0 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/Flask.mat +++ b/Assets/Resources/Sprites/Games/LoveLab/Flask.mat @@ -84,7 +84,7 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 0.043137245, g: 0.074509725, b: 0.34901962, a: 1} + - _ColorAlpha: {r: 0.02909997, g: 0.4054601, b: 0.97, a: 1} - _ColorBravo: {r: 1, g: 1, b: 1, a: 1} - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Resources/Sprites/Games/LoveLab/GirlFlask.mat b/Assets/Resources/Sprites/Games/LoveLab/GirlFlask.mat index 8d637520..ba5e6a56 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/GirlFlask.mat +++ b/Assets/Resources/Sprites/Games/LoveLab/GirlFlask.mat @@ -84,7 +84,7 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 0.91611767, g: 0.86906433, b: 0.16539083, a: 1} + - _ColorAlpha: {r: 0.972549, g: 0.3764706, b: 0.03137255, a: 1} - _ColorBravo: {r: 1, g: 1, b: 1, a: 1} - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Resources/Sprites/Games/LoveLab/GirlShading.mat b/Assets/Resources/Sprites/Games/LoveLab/GirlShading.mat index 9a8687dc..c911c43f 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/GirlShading.mat +++ b/Assets/Resources/Sprites/Games/LoveLab/GirlShading.mat @@ -84,8 +84,8 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 1, g: 0.937255, b: 0.3529412, a: 1} + - _ColorAlpha: {r: 0.8470589, g: 0.9725491, b: 0.8784314, a: 1} - _ColorBravo: {r: 0.01176471, g: 0.7686275, b: 0.2431373, a: 1} - - _ColorDelta: {r: 0.9960785, g: 0.6588235, b: 0.5176471, a: 1} + - _ColorDelta: {r: 0.9686275, g: 0.7529413, b: 0.654902, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/LoveLab/GuyShading.mat b/Assets/Resources/Sprites/Games/LoveLab/GuyShading.mat index 17e116de..175eb314 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/GuyShading.mat +++ b/Assets/Resources/Sprites/Games/LoveLab/GuyShading.mat @@ -84,8 +84,8 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 1, g: 0.8392158, b: 0.4196079, a: 1} - - _ColorBravo: {r: 0.6862745, g: 0.4078432, b: 0.4196079, a: 1} - - _ColorDelta: {r: 0.8901961, g: 0.4627451, b: 0.2039216, a: 1} + - _ColorAlpha: {r: 1, g: 1, b: 1, a: 1} + - _ColorBravo: {r: 0.3921569, g: 0.4039216, b: 0.3921569, a: 1} + - _ColorDelta: {r: 0.9686275, g: 0.7254902, b: 0.5686275, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Resources/Sprites/Games/LoveLab/WeirdFlask.mat b/Assets/Resources/Sprites/Games/LoveLab/WeirdFlask.mat index 0e22bfad..8f990f3c 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/WeirdFlask.mat +++ b/Assets/Resources/Sprites/Games/LoveLab/WeirdFlask.mat @@ -84,7 +84,7 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 0, g: 0.6472839, b: 0.03720841, a: 1} + - _ColorAlpha: {r: 0.8313726, g: 0.2039216, b: 0.5058824, a: 1} - _ColorBravo: {r: 1, g: 1, b: 1, a: 1} - _ColorDelta: {r: 1, g: 1, b: 1, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Resources/Sprites/Games/LoveLab/WeirdShading.mat b/Assets/Resources/Sprites/Games/LoveLab/WeirdShading.mat index ea6ac066..12729a59 100644 --- a/Assets/Resources/Sprites/Games/LoveLab/WeirdShading.mat +++ b/Assets/Resources/Sprites/Games/LoveLab/WeirdShading.mat @@ -84,8 +84,8 @@ Material: m_Colors: - _AddColor: {r: 0, g: 0, b: 0, a: 0} - _Color: {r: 1, g: 1, b: 1, a: 1} - - _ColorAlpha: {r: 0.9725491, g: 0.7843138, b: 0.4078432, a: 1} - - _ColorBravo: {r: 0.972549, g: 0.7529412, b: 0.03137255, a: 1} - - _ColorDelta: {r: 0.8941177, g: 0.1882353, b: 0, a: 1} + - _ColorAlpha: {r: 1, g: 1, b: 1, a: 1} + - _ColorBravo: {r: 0.754717, g: 0.5786163, b: 0, a: 1} + - _ColorDelta: {r: 0.9686275, g: 0.3803922, b: 0.03137255, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: []