diff --git a/Assets/Resources/Games/doubleDate.prefab b/Assets/Resources/Games/doubleDate.prefab index 0e2633e98..f26b0d933 100644 --- a/Assets/Resources/Games/doubleDate.prefab +++ b/Assets/Resources/Games/doubleDate.prefab @@ -486,7 +486,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &5057601987836241533 Transform: m_ObjectHideFlags: 0 @@ -880,7 +880,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 3 + m_SortingOrder: 5 m_Sprite: {fileID: -8241388437142500833, guid: e69d8631bbd6b4047b0cd9d9d78be671, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -13502,7 +13502,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 4 + m_SortingOrder: 6 m_Sprite: {fileID: -2886052291205970805, guid: e69d8631bbd6b4047b0cd9d9d78be671, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -17588,8 +17588,8 @@ Transform: m_LocalScale: {x: 0.92045, y: 0.92045, z: 0.92045} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 4287718705053222288} - {fileID: 2602257268473603279} + - {fileID: 4287718705053222288} - {fileID: 2886270264316386320} - {fileID: 7529215513594783899} - {fileID: 5057601987836241533} @@ -18129,7 +18129,7 @@ Transform: - {fileID: 8284843346833121454} - {fileID: 3196070111010031696} m_Father: {fileID: 3114857684828203505} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &6268125902584026029 SortingGroup: @@ -18176,7 +18176,7 @@ Transform: - {fileID: 4165868219261623941} - {fileID: 8615252329958160817} m_Father: {fileID: 3114857684828203505} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!210 &3469472890315857684 SortingGroup: diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim index 552d158b6..d210119c3 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHappy.anim @@ -399,6 +399,25 @@ AnimationClip: path: WeaselGirl/WeaselGirlArm classID: 212 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: WeaselGirl/WeaselGirlArm + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -539,6 +558,13 @@ AnimationClip: typeID: 212 customType: 26 isPPtrCurve: 0 + - serializedVersion: 2 + path: 2314837333 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3018599444 attribute: 0 @@ -1707,6 +1733,25 @@ AnimationClip: path: WeaselGirl/WeaselGirlBody classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: WeaselGirl/WeaselGirlArm + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim index 68ad7e5e2..53580af79 100644 --- a/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim +++ b/Assets/Resources/Sprites/Games/DoubleDate/Animations/WeaselsHide.anim @@ -498,6 +498,52 @@ AnimationClip: path: WeaselBoy classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Shock2 + classID: 1 + script: {fileID: 0} m_PPtrCurves: - curve: - time: 0 @@ -672,6 +718,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 4119893686 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 3484930362 attribute: 0 @@ -1991,6 +2044,52 @@ AnimationClip: path: WeaselGirl classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.033333335 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.2 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.3 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Shock2 + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/Assets/Resources/Sprites/Games/TapTroupe/Animations/HitStepReadyTap.anim b/Assets/Resources/Sprites/Games/TapTroupe/Animations/HitStepReadyTap.anim index da56d8545..6ba68c889 100644 --- a/Assets/Resources/Sprites/Games/TapTroupe/Animations/HitStepReadyTap.anim +++ b/Assets/Resources/Sprites/Games/TapTroupe/Animations/HitStepReadyTap.anim @@ -44,6 +44,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: 0} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 value: {x: 0, y: 0, z: 0} @@ -139,6 +148,15 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.16666667 + value: {x: 0, y: 0, z: 3.134} + inSlope: {x: Infinity, y: Infinity, z: Infinity} + outSlope: {x: Infinity, y: Infinity, z: Infinity} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 value: {x: 0, y: 0, z: 3.134} @@ -185,7 +203,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: -0.75, y: -2.756, z: 9.178155} + value: {x: -0.734, y: -2.756, z: 9.178155} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -194,7 +212,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: -0.75, y: -2.756, z: 9.178155} + value: {x: -0.718, y: -2.756, z: 9.178155} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -341,7 +359,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.16666667 - value: {x: -0.49, y: 0.686, z: 9.178155} + value: {x: -0.47399998, y: 0.686, z: 9.178155} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -350,7 +368,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.2 - value: {x: -0.49, y: 0.686, z: 9.178155} + value: {x: -0.453, y: 0.686, z: 9.178155} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: Infinity, y: Infinity, z: Infinity} tangentMode: 0 @@ -549,6 +567,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 0.2 value: 0 @@ -573,6 +600,8 @@ AnimationClip: value: {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} - time: 0.1 value: {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} + - time: 0.16666667 + value: {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} - time: 0.2 value: {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} attribute: m_Sprite @@ -785,6 +814,7 @@ AnimationClip: - {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} - {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} - {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} + - {fileID: 846812011896355152, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} - {fileID: -4641733496002515713, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} - {fileID: -4641733496002515713, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} - {fileID: -4641733496002515713, guid: 04e0d6d4bb4d17e43bcc11a96e3eb35b, type: 3} @@ -863,7 +893,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -0.75 + value: -0.734 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -872,7 +902,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: -0.75 + value: -0.718 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1026,6 +1056,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: 0 @@ -1072,6 +1111,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: 0 @@ -1118,6 +1166,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: 0 @@ -1329,6 +1386,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 - serializedVersion: 3 time: 0.2 value: 0 @@ -1707,7 +1773,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.16666667 - value: -0.49 + value: -0.47399998 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -1716,7 +1782,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 - value: -0.49 + value: -0.453 inSlope: Infinity outSlope: Infinity tangentMode: 103 @@ -2365,6 +2431,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: 0 @@ -2411,6 +2486,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: 0 @@ -2457,6 +2541,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.16666667 + value: 3.134 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 - serializedVersion: 3 time: 0.2 value: 3.134 diff --git a/Assets/Resources/Sprites/Games/TapTroupe/Animations/HitTapFeet.anim b/Assets/Resources/Sprites/Games/TapTroupe/Animations/HitTapFeet.anim index 077bd1a02..160101467 100644 --- a/Assets/Resources/Sprites/Games/TapTroupe/Animations/HitTapFeet.anim +++ b/Assets/Resources/Sprites/Games/TapTroupe/Animations/HitTapFeet.anim @@ -79,7 +79,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0.711, y: -2.786, z: 9.178155} + value: {x: 0.714, y: -2.76, z: 9.178155} inSlope: {x: Infinity, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -238,7 +238,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: -0.57, y: -8.02, z: 0} + value: {x: -0.5, y: -7.93, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -247,7 +247,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.06666667 - value: {x: -0.57, y: -8.08, z: 0} + value: {x: -0.5, y: -8, z: 0} inSlope: {x: Infinity, y: Infinity, z: Infinity} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -617,7 +617,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0.711 + value: 0.714 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -636,7 +636,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -2.786 + value: -2.76 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -1252,7 +1252,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -0.57 + value: -0.5 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -1261,7 +1261,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -0.57 + value: -0.5 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -1280,7 +1280,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: -8.02 + value: -7.93 inSlope: Infinity outSlope: 0 tangentMode: 7 @@ -1289,7 +1289,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.06666667 - value: -8.08 + value: -8 inSlope: Infinity outSlope: 0 tangentMode: 7 diff --git a/Assets/Resources/Sprites/Games/TapTroupe/Corner Dudes (No Box).png.meta b/Assets/Resources/Sprites/Games/TapTroupe/Corner Dudes (No Box).png.meta index e3fbc8ce5..c096de6c4 100644 --- a/Assets/Resources/Sprites/Games/TapTroupe/Corner Dudes (No Box).png.meta +++ b/Assets/Resources/Sprites/Games/TapTroupe/Corner Dudes (No Box).png.meta @@ -184,7 +184,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1 diff --git a/Assets/Resources/Sprites/Games/TapTroupe/Legs Sprites (No Box).png.meta b/Assets/Resources/Sprites/Games/TapTroupe/Legs Sprites (No Box).png.meta index 9bf6623a3..f0bccba8a 100644 --- a/Assets/Resources/Sprites/Games/TapTroupe/Legs Sprites (No Box).png.meta +++ b/Assets/Resources/Sprites/Games/TapTroupe/Legs Sprites (No Box).png.meta @@ -121,7 +121,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 4096 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 1