diff --git a/Assets/Resources/Sprites/Games/FanClub/Animations/Fan/FanJump.anim b/Assets/Resources/Sprites/Games/FanClub/Animations/Fan/FanJump.anim index 67f6571aa..8f87ea399 100644 --- a/Assets/Resources/Sprites/Games/FanClub/Animations/Fan/FanJump.anim +++ b/Assets/Resources/Sprites/Games/FanClub/Animations/Fan/FanJump.anim @@ -100,6 +100,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.5 + value: {x: -0.521, y: 2.32, 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} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -141,6 +150,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.5 + value: {x: 0.521, y: 2.32, 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} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -198,6 +216,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.5 + value: {x: 0, y: 1.63, 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} m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -333,6 +360,8 @@ AnimationClip: value: {fileID: -198993962868910611, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - time: 0.033333335 value: {fileID: 1143994186590036386, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} + - time: 0.5 + value: {fileID: 1143994186590036386, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} attribute: m_Sprite path: root_motion/Body/fan_Body00 classID: 212 @@ -491,12 +520,13 @@ AnimationClip: - {fileID: 3272263371775538141, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: -198993962868910611, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} - {fileID: 1143994186590036386, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} + - {fileID: 1143994186590036386, guid: 3ceb27c8c676e7a428cf6e15cd11b7ef, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.050000004 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0.05 @@ -533,6 +563,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -0.521 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -561,6 +600,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 2.32 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -589,6 +637,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -807,6 +864,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0.521 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -835,6 +901,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 2.32 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -863,6 +938,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1157,6 +1241,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1185,6 +1278,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 1.63 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -1213,6 +1315,15 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Scripts/Games/FanClub/NtrIdolFan.cs b/Assets/Scripts/Games/FanClub/NtrIdolFan.cs index a71e043ec..dda8cdafc 100644 --- a/Assets/Scripts/Games/FanClub/NtrIdolFan.cs +++ b/Assets/Scripts/Games/FanClub/NtrIdolFan.cs @@ -108,6 +108,7 @@ namespace HeavenStudio.Games.Scripts_FanClub { if (clappingStartTime != Single.MinValue && cond.songPositionInBeats > clappingStartTime + 2f && !stopCharge) { + animator.speed = 1f; animator.Play("FanClapCharge", -1, 0); stopCharge = true; } @@ -120,6 +121,7 @@ namespace HeavenStudio.Games.Scripts_FanClub } else { + animator.speed = 1f; animator.Play("FanFree", -1, 0); stopBeat = false; clappingStartTime = Single.MinValue; @@ -135,7 +137,7 @@ namespace HeavenStudio.Games.Scripts_FanClub float yWeight = -(yMul*yMul) + 1f; motionRoot.transform.localPosition = new Vector3(0, 3f * yWeight); shadow.transform.localScale = new Vector3((1f-yWeight*0.8f) * 1.4f, (1f-yWeight*0.8f) * 1.4f, 1f); - animator.Play("FanJump", -1, 0); + animator.DoScaledAnimation("FanJump", jumpStartTime); } else { @@ -150,6 +152,7 @@ namespace HeavenStudio.Games.Scripts_FanClub stopBeat = false; } } + animator.speed = 1f; hasJumped = false; } } @@ -165,6 +168,7 @@ namespace HeavenStudio.Games.Scripts_FanClub hasJumped = false; stopBeat = true; jumpStartTime = -99f; + animator.speed = 1f; animator.Play("FanClap", -1, 0); Jukebox.PlayOneShotGame("fanClub/play_clap"); Jukebox.PlayOneShotGame("fanClub/crap_impact"); @@ -219,7 +223,10 @@ namespace HeavenStudio.Games.Scripts_FanClub public void Bop() { if (!stopBeat) + { + animator.speed = 1f; animator.Play("FanBeat"); + } } public void ClapParticle() diff --git a/Assets/StreamingAssets/StreamingAssets b/Assets/StreamingAssets/StreamingAssets index 16c75032a..024b9ab46 100644 Binary files a/Assets/StreamingAssets/StreamingAssets and b/Assets/StreamingAssets/StreamingAssets differ diff --git a/Assets/StreamingAssets/StreamingAssets.manifest b/Assets/StreamingAssets/StreamingAssets.manifest index 01a4f57ed..02a1e402e 100644 --- a/Assets/StreamingAssets/StreamingAssets.manifest +++ b/Assets/StreamingAssets/StreamingAssets.manifest @@ -1,5 +1,5 @@ ManifestFileVersion: 0 -CRC: 1516953164 +CRC: 2362860034 AssetBundleManifest: AssetBundleInfos: Info_0: diff --git a/Assets/StreamingAssets/karate/common b/Assets/StreamingAssets/karate/common index 63f06ec45..a2eb531f1 100644 Binary files a/Assets/StreamingAssets/karate/common and b/Assets/StreamingAssets/karate/common differ diff --git a/Assets/StreamingAssets/karate/common.manifest b/Assets/StreamingAssets/karate/common.manifest index d1dbd8e6f..5077cc2ca 100644 --- a/Assets/StreamingAssets/karate/common.manifest +++ b/Assets/StreamingAssets/karate/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 1091441775 +CRC: 1499416464 Hashes: AssetFileHash: serializedVersion: 2 - Hash: f85b652eadac4ff300c579adfa67313b + Hash: 7dbbb737179d1cc7db1edb0a31c7e1ab TypeTreeHash: serializedVersion: 2 Hash: 2b92e6f111bbb24dabe3a2c56ea02b28 diff --git a/Assets/StreamingAssets/ntrcoin/common b/Assets/StreamingAssets/ntrcoin/common index 3baecb5db..be4dab67d 100644 Binary files a/Assets/StreamingAssets/ntrcoin/common and b/Assets/StreamingAssets/ntrcoin/common differ diff --git a/Assets/StreamingAssets/ntrcoin/common.manifest b/Assets/StreamingAssets/ntrcoin/common.manifest index c642f5191..92af2b011 100644 --- a/Assets/StreamingAssets/ntrcoin/common.manifest +++ b/Assets/StreamingAssets/ntrcoin/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 3145129048 +CRC: 3719062968 Hashes: AssetFileHash: serializedVersion: 2 - Hash: accf70966bae19a4dbcad02679a20b19 + Hash: eee37f302cb3e8cbe079bb5500cb45ed TypeTreeHash: serializedVersion: 2 Hash: 1341d321cd8444a4f78a51a8a0c6daff diff --git a/Assets/StreamingAssets/ntridol/common b/Assets/StreamingAssets/ntridol/common index 7867e03f7..1c115535a 100644 Binary files a/Assets/StreamingAssets/ntridol/common and b/Assets/StreamingAssets/ntridol/common differ diff --git a/Assets/StreamingAssets/ntridol/common.manifest b/Assets/StreamingAssets/ntridol/common.manifest index a70f82838..53c576154 100644 --- a/Assets/StreamingAssets/ntridol/common.manifest +++ b/Assets/StreamingAssets/ntridol/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 2094393231 +CRC: 2386252366 Hashes: AssetFileHash: serializedVersion: 2 - Hash: a425cbbebe1a8006a4fc4fe6127c84fa + Hash: 6f57f7727dc4903488ea4956307caac1 TypeTreeHash: serializedVersion: 2 Hash: 6f0c5ebd30d7d3be8aad1c86837b5cc9 diff --git a/Assets/StreamingAssets/ntrsamurai/common b/Assets/StreamingAssets/ntrsamurai/common index 302ce5e2b..f4e9f1e13 100644 Binary files a/Assets/StreamingAssets/ntrsamurai/common and b/Assets/StreamingAssets/ntrsamurai/common differ diff --git a/Assets/StreamingAssets/ntrsamurai/common.manifest b/Assets/StreamingAssets/ntrsamurai/common.manifest index e7156ddcf..5491e2369 100644 --- a/Assets/StreamingAssets/ntrsamurai/common.manifest +++ b/Assets/StreamingAssets/ntrsamurai/common.manifest @@ -1,9 +1,9 @@ ManifestFileVersion: 0 -CRC: 3054716629 +CRC: 1695511499 Hashes: AssetFileHash: serializedVersion: 2 - Hash: 7de7ed1ceb30a914c04951332a09f02e + Hash: 24892cdb3bebaf86064204efdc197727 TypeTreeHash: serializedVersion: 2 Hash: 788d5843115df613774b9a4b273d2334