Merge pull request #131 from LingFeng-bbben/more-beautiful-slide

Slide disappear animation by touch area
LingFeng-bbben · Dec 31, 2023 · 6bf1342 · 6bf1342
2 parents e302f60 + 8f331ac
commit 6bf1342
Show file tree

Hide file tree

Showing 66 changed files with 19,552 additions and 15,867 deletions.
diff --git a/Assets/Prefab/Just_curv.prefab b/Assets/Prefab/Just_curv.prefab
@@ -27,12 +27,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9006129424700068006}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.03766048, y: 4.6582947, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &2475977991462650878
 SpriteRenderer:
@@ -45,10 +46,12 @@ SpriteRenderer:
   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:
@@ -86,7 +89,7 @@ SpriteRenderer:
   m_SpriteSortPoint: 0
 --- !u!95 &7381869810983028850
 Animator:
-  serializedVersion: 3
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -99,10 +102,12 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!114 &5703177854819787050
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -116,6 +121,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ifDestroy: 0
+  ifStopRecording: 0
 --- !u!114 &-1893411426434260203
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -128,3 +134,5 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: f6edbf0e2c317614c9224783e8d8c101, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
+  _0curv1str2wifi: 0
+  indexOffset: 0
diff --git a/Assets/Prefab/Just_str.prefab b/Assets/Prefab/Just_str.prefab
@@ -27,12 +27,13 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5096008454062299820}
+  serializedVersion: 2
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 2.437452, y: 1.72, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!212 &548578996992170818
 SpriteRenderer:
@@ -45,10 +46,12 @@ SpriteRenderer:
   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:
@@ -86,7 +89,7 @@ SpriteRenderer:
   m_SpriteSortPoint: 0
 --- !u!95 &4084572716065402907
 Animator:
-  serializedVersion: 3
+  serializedVersion: 5
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
@@ -99,10 +102,12 @@ Animator:
   m_UpdateMode: 0
   m_ApplyRootMotion: 0
   m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
   m_WarningMessage: 
   m_HasTransformHierarchy: 1
   m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
 --- !u!114 &7559728760609664144
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -116,6 +121,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ifDestroy: 0
+  ifStopRecording: 0
 --- !u!114 &1122872627157435716
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -129,3 +135,4 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   _0curv1str2wifi: 1
+  indexOffset: 0
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
@@ -1631,42 +1631,42 @@ MonoBehaviour:
   - {fileID: 162252113955721592, guid: 1ea29cbac73cd0d408306300d9b06366, type: 3}
   - {fileID: 4063889838514241290, guid: fec3da107d2fb3c4d99e0dd64929b6e1, type: 3}
   - {fileID: 4385958340107344272, guid: 093889ff0ec93e9448b4ffe5c377be6b, type: 3}
-  - {fileID: 4125151124977096013, guid: f8470b144a956a54fb43c8d82d40fba8, type: 3}
-  - {fileID: 9001182523399631281, guid: e22b55efc8edd10448252ad1306c8926, type: 3}
-  - {fileID: 2992351113950774994, guid: 3886e6a6f2a2bb34b9e9d260283ef199, type: 3}
-  - {fileID: 121813153075295048, guid: 14a3f4a3f776d9b4d9f1ed5b55cedac3, type: 3}
-  - {fileID: 4306064419093750065, guid: 1a2c6c6c041d44e409643ec84a593c21, type: 3}
-  - {fileID: 3057629014842811028, guid: 765b207a86951d444b7bc93da70fdf81, type: 3}
-  - {fileID: 6752330046725891878, guid: f900612e74432684599272fa969c5ab0, type: 3}
-  - {fileID: 5602004533935139661, guid: 970bb9c5af8c9c7498a6bf7bbb36b664, type: 3}
+  - {fileID: 3811942671679594881, guid: e2a79d876af8eec46a830ccae393ab6a, type: 3}
+  - {fileID: 4771184315770581227, guid: f5f7af0567e6f394f80e70c964546f39, type: 3}
+  - {fileID: 3779266362854166925, guid: 172567737fd6e7c47a7b079c25acbdf6, type: 3}
+  - {fileID: 8390738787376868268, guid: f2ceddc6242b2b249ba67357cbb1dc8e, type: 3}
+  - {fileID: 8385692067622607824, guid: e5169727320db694ca5b6fc99e0ebfa3, type: 3}
+  - {fileID: 5756437215818999019, guid: 96668829e7509e147864549fa4e693dd, type: 3}
+  - {fileID: 1523015595177315187, guid: 209955fc2907f9a4ba8640fcbaa932bc, type: 3}
+  - {fileID: 1147044652582484651, guid: 3da3cb9272b855346b60391d19a2a710, type: 3}
   - {fileID: 349982270078930302, guid: 0bb5a6f278c782c4eaa6e0f411859530, type: 3}
   - {fileID: 8949524144708029665, guid: d43804f639525da458468f8d5a0f4207, type: 3}
   - {fileID: 8856240846847104426, guid: d9832e41a940c0a49b00a67e930a4d8e, type: 3}
   - {fileID: 2115498022132103969, guid: 724b45437934fda4aa7334fb35205078, type: 3}
   - {fileID: 7402194249673173763, guid: 6c881c6281d14c9499e98bc0fc948c7a, type: 3}
   - {fileID: 2992700185771566843, guid: 5f02ccf3fa8c1544593ba0c5c0544ab8, type: 3}
-  - {fileID: 4014940065651341871, guid: 6ad8684790a7b68488e8852783d2b72c, type: 3}
-  - {fileID: 3409116930091585953, guid: ec6582e4a3b7eed42bf369b53d5962a2, type: 3}
-  - {fileID: 4580283965360441347, guid: 742d26a7f652fbb4eb21196a5b29cae4, type: 3}
-  - {fileID: 999434989236348730, guid: c1857a69de2aa7741a0fbf906ccfc8be, type: 3}
-  - {fileID: 5304006197532183632, guid: e2e0f4bf77910334192d0c8514ab2b59, type: 3}
-  - {fileID: 418469715185488083, guid: f71784000b7598f4cb4258ba1c16738f, type: 3}
-  - {fileID: 7608952264254280982, guid: 9148e75cde688ab47b0b310b54e8ee7e, type: 3}
-  - {fileID: 7682295707190504532, guid: fa6be73ec39937743a030c38852bb77d, type: 3}
-  - {fileID: 7800910404881618253, guid: 2fffd11165fe5814d853e7f26341cd22, type: 3}
-  - {fileID: 131814635453113638, guid: f71b84d291e756844b77e85dc4788aa6, type: 3}
-  - {fileID: 4659939359899609035, guid: da16b8175d91a40438a232b268919b9c, type: 3}
-  - {fileID: 8793444252662824099, guid: 57a905904c53ac94da1331217620cfad, type: 3}
-  - {fileID: 4486606147045406768, guid: 99c9feecb02650640898bf79ab3b8b2d, type: 3}
-  - {fileID: 2622931659329942415, guid: af380bce85a40464e80353dab2b1a512, type: 3}
-  - {fileID: 7870154507283588631, guid: bcd14d8d697b6c1479c6599a2e1c761e, type: 3}
-  - {fileID: 447700677058471490, guid: b867a791bc85b5f449394d5f9ca1dde0, type: 3}
+  - {fileID: 4481343721486563910, guid: eaa6e34748cacf8499b3a84cdd6ae4ff, type: 3}
+  - {fileID: 8395920848427136886, guid: 3b766972bf7e9034bbf487a9b6832fe8, type: 3}
+  - {fileID: 7073340198924737011, guid: ca6b531a1dd411645bf12cb585420af1, type: 3}
+  - {fileID: 69623090116495014, guid: 6ac090300791d2240843ae2b5a05d5bf, type: 3}
+  - {fileID: 994777228038712772, guid: 881af3071c9291c4b870764a29a7ffb8, type: 3}
+  - {fileID: 4833279577871880707, guid: 2ce5531cf943064479144f1e9813f479, type: 3}
+  - {fileID: 8514205390634160081, guid: 230a2d441876f554d9026e875e46c8e5, type: 3}
+  - {fileID: 3845287763176181976, guid: dbff6d0116666534d9c03d7e194186f0, type: 3}
+  - {fileID: 6967555913822829999, guid: 8c30b717117b5d8469c21293e7d60878, type: 3}
+  - {fileID: 7220423140814551699, guid: 873128d84d354594ba18a5a953a479ca, type: 3}
+  - {fileID: 5598722730420239630, guid: 7df113c2472524c42a35971690f67c3c, type: 3}
+  - {fileID: 7695249693278585890, guid: b54a1ed26ab230a45a27f0262d42f3e4, type: 3}
+  - {fileID: 2255730539399038605, guid: 049bb882b8b98034db879e6367063f4f, type: 3}
+  - {fileID: 8323648564071886062, guid: c346d9a2081ddad4e9507f89705c907e, type: 3}
+  - {fileID: 6285532811684223671, guid: 2081b5c87d9866b4ea5ac562dc15a5fb, type: 3}
+  - {fileID: 1520358378427187981, guid: 70ba2c5f34c9ef140a09fdd12592f445, type: 3}
   - {fileID: 5436578077489055471, guid: 8355858bf77206a488ab986cc26b65b1, type: 3}
-  - {fileID: 5120502090728662693, guid: 92425230f2e396e48b7fb081a6f3353b, type: 3}
-  - {fileID: 5307894230337610284, guid: dbda2694a1771db4a9468c5aa42e4521, type: 3}
-  - {fileID: 796092474901863576, guid: fe567d9733d824344ac702ea96d93a93, type: 3}
-  - {fileID: 2695972272465249242, guid: 15779da816ed35141891224b0f894832, type: 3}
-  - {fileID: 3042661451837740866, guid: 266f7f21a3d83ef4593daba2c354d4c5, type: 3}
+  - {fileID: 6574093696964316734, guid: 460cd376e52d5fb40824e1ee8ccade3c, type: 3}
+  - {fileID: 4666287949468113778, guid: 45d5304e9c994a54ab89a4021c5d2e46, type: 3}
+  - {fileID: 3347333010027816482, guid: c0d7d240be289194bbbd0c7c849c7208, type: 3}
+  - {fileID: 8148946950682681393, guid: d050f65c3f52d524ab26963738702536, type: 3}
+  - {fileID: 8389343569395675099, guid: 32868e5f4fa463f4c905e870406abea5, type: 3}
   - {fileID: 349982270078930302, guid: d0fd46e58bee17740a889818d94c8816, type: 3}
   BreakShine: {fileID: 9100000, guid: c28f56116f6dc34408d6f0f544f1e2cc, type: 2}
   HoldShine: {fileID: 9100000, guid: 3fcb4587ef8c7f141969450782191592, type: 2}

diff --git a/Assets/Scripts/HttpHandler.cs b/Assets/Scripts/HttpHandler.cs
@@ -43,6 +43,7 @@ private void Update()
             timeProvider.SetStartTime(data.startAt, data.startTime, data.audioSpeed);
             loader.noteSpeed = (float)(107.25 / (71.4184491 * Mathf.Pow(data.noteSpeed + 0.9975f, -0.985558604f)));
             loader.touchSpeed = data.touchSpeed;
+            loader.smoothSlideAnime = data.smoothSlideAnime;
             objectCounter.ComboSetActive(data.comboStatusType);
             loader.LoadJson(File.ReadAllText(data.jsonPath), data.startTime);
             GameObject.Find("Notes").GetComponent<PlayAllPerfect>().enabled = false;
@@ -58,6 +59,7 @@ private void Update()
             timeProvider.SetStartTime(data.startAt, data.startTime, data.audioSpeed);
             loader.noteSpeed = (float)(107.25 / (71.4184491 * Mathf.Pow(data.noteSpeed + 0.9975f, -0.985558604f)));
             loader.touchSpeed = data.touchSpeed;
+            loader.smoothSlideAnime = data.smoothSlideAnime;
             objectCounter.ComboSetActive(data.comboStatusType);
             loader.LoadJson(File.ReadAllText(data.jsonPath), data.startTime);
             GameObject.Find("MultTouchHandler").GetComponent<MultTouchHandler>().clearSlots();
@@ -74,6 +76,7 @@ private void Update()
             timeProvider.SetStartTime(data.startAt, data.startTime, data.audioSpeed, true);
             loader.noteSpeed = (float)(107.25 / (71.4184491 * Mathf.Pow(data.noteSpeed + 0.9975f, -0.985558604f)));
             loader.touchSpeed = data.touchSpeed;
+            loader.smoothSlideAnime = data.smoothSlideAnime;
             objectCounter.ComboSetActive(data.comboStatusType);
             loader.LoadJson(File.ReadAllText(data.jsonPath), data.startTime);
             multTouchHandler.clearSlots();