From e0e721c56407ceada92773f994f0057ffd7ad5bf Mon Sep 17 00:00:00 2001 From: JLChnToZ Date: Sun, 9 Oct 2016 23:47:04 +0800 Subject: [PATCH] Change appearance --- Assets/Scenes/ClassicGameScene.unity | 62 ++++++++++--------- Assets/Scenes/GameScene.unity | 52 ++++++++-------- Assets/Scripts/Handlers/ClassicNoteHandler.cs | 4 +- Assets/Scripts/Handlers/NoteSpawnerClassic.cs | 2 + Assets/Scripts/Loader.cs | 2 +- 5 files changed, 64 insertions(+), 58 deletions(-) diff --git a/Assets/Scenes/ClassicGameScene.unity b/Assets/Scenes/ClassicGameScene.unity index 7092ca2..18157b8 100644 --- a/Assets/Scenes/ClassicGameScene.unity +++ b/Assets/Scenes/ClassicGameScene.unity @@ -241,6 +241,7 @@ RectTransform: m_Children: - {fileID: 1956387429} - {fileID: 156314638} + - {fileID: 1305263416} - {fileID: 184944853} - {fileID: 1663607441} - {fileID: 1671102499} @@ -665,15 +666,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1305263416} + m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 2 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 20} + m_RootOrder: 3 + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -45} m_SizeDelta: {x: 100, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &184944854 MonoBehaviour: m_ObjectHideFlags: 0 @@ -700,7 +700,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 60 - m_Alignment: 4 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1190,7 +1190,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 5 + m_RootOrder: 6 m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -1638,9 +1638,10 @@ MonoBehaviour: spawnerId: 1 clampRangeStart: -1.6 clampRangeEnd: 1.6 - startDistance: 30 + startDistance: 60 targetDistance: 0.1 offset: 0.8 + startOffset: -0.8 maxNoteDistance: 0.25 centroid: {x: 0, y: 0, z: 0} scoreDisplayPack: {fileID: 11400000, guid: 3f88466b5221e754baf9e743bf54c732, type: 2} @@ -1693,7 +1694,7 @@ RectTransform: - {fileID: 205253431} - {fileID: 462639664} m_Father: {fileID: 92738949} - m_RootOrder: 10 + m_RootOrder: 11 m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -1840,7 +1841,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 7 + m_RootOrder: 8 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 10} @@ -3100,7 +3101,7 @@ RectTransform: m_Children: - {fileID: 1158903701} m_Father: {fileID: 92738949} - m_RootOrder: 9 + m_RootOrder: 10 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -3192,9 +3193,10 @@ MonoBehaviour: spawnerId: 0 clampRangeStart: -1.6 clampRangeEnd: 1.6 - startDistance: 30 + startDistance: 60 targetDistance: 0.1 offset: -0.8 + startOffset: -0.8 maxNoteDistance: 0.25 centroid: {x: 0, y: 0, z: 0} scoreDisplayPack: {fileID: 11400000, guid: 3f88466b5221e754baf9e743bf54c732, type: 2} @@ -3639,8 +3641,8 @@ RectTransform: m_RootOrder: 0 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -5} - m_SizeDelta: {x: 0, y: -10} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1140749596 MonoBehaviour: @@ -3888,10 +3890,10 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1258345985} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -6.25} + m_LocalRotation: {x: 0.043619405, y: 0, z: 0, w: 0.9990483} + m_LocalPosition: {x: 0, y: 0.55, z: -6.25} m_LocalScale: {x: 1, y: 1, z: 1} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 5, y: 0, z: 0} m_Children: [] m_Father: {fileID: 1050942001} m_RootOrder: 0 @@ -4098,12 +4100,12 @@ RectTransform: m_Children: - {fileID: 1546044196} - {fileID: 1561228372} - m_Father: {fileID: 184944853} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 10} + m_Father: {fileID: 92738949} + m_RootOrder: 2 + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: -50, y: -130} + m_SizeDelta: {x: 100, y: 10} m_Pivot: {x: 0, y: 1} --- !u!1 &1318587001 GameObject: @@ -4566,7 +4568,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 8 + m_RootOrder: 9 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -4652,7 +4654,7 @@ RectTransform: - {fileID: 2073731827} - {fileID: 1922579743} m_Father: {fileID: 92738949} - m_RootOrder: 11 + m_RootOrder: 12 m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -4757,7 +4759,7 @@ RectTransform: m_Children: - {fileID: 106329898} m_Father: {fileID: 92738949} - m_RootOrder: 6 + m_RootOrder: 7 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 10} @@ -5163,7 +5165,7 @@ RectTransform: m_Children: - {fileID: 1791410178} m_Father: {fileID: 92738949} - m_RootOrder: 3 + m_RootOrder: 4 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5303,7 +5305,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 4 + m_RootOrder: 5 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 2a697ef..c9072cc 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -330,6 +330,7 @@ RectTransform: m_Children: - {fileID: 1956387429} - {fileID: 156314638} + - {fileID: 1867011416} - {fileID: 184944853} - {fileID: 1663607441} - {fileID: 1671102499} @@ -686,15 +687,14 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_Children: - - {fileID: 1867011416} + m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 2 - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 20} + m_RootOrder: 3 + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 20, y: -45} m_SizeDelta: {x: 100, y: 50} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 0, y: 1} --- !u!114 &184944854 MonoBehaviour: m_ObjectHideFlags: 0 @@ -721,7 +721,7 @@ MonoBehaviour: m_BestFit: 0 m_MinSize: 0 m_MaxSize: 60 - m_Alignment: 4 + m_Alignment: 0 m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 1 @@ -1142,7 +1142,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 5 + m_RootOrder: 6 m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -1522,7 +1522,7 @@ MonoBehaviour: spawnerId: 1 clampRangeStart: 70 clampRangeEnd: 110 - startDistance: 30 + startDistance: 60 targetDistance: 0.1 offset: 1.9 maxNoteDistance: 360 @@ -1577,7 +1577,7 @@ RectTransform: - {fileID: 205253431} - {fileID: 462639664} m_Father: {fileID: 92738949} - m_RootOrder: 10 + m_RootOrder: 11 m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -1724,7 +1724,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 7 + m_RootOrder: 8 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 10} @@ -2984,7 +2984,7 @@ RectTransform: m_Children: - {fileID: 1158903701} m_Father: {fileID: 92738949} - m_RootOrder: 9 + m_RootOrder: 10 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -3076,7 +3076,7 @@ MonoBehaviour: spawnerId: 0 clampRangeStart: 210 clampRangeEnd: 330 - startDistance: 30 + startDistance: 60 targetDistance: 0.1 offset: 1.9 maxNoteDistance: 15 @@ -3831,7 +3831,7 @@ Camera: width: 1 height: 1 near clip plane: 0.3 - far clip plane: 50 + far clip plane: 100 field of view: 20 orthographic: 0 orthographic size: 1.1 @@ -4518,7 +4518,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 8 + m_RootOrder: 9 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -4604,7 +4604,7 @@ RectTransform: - {fileID: 2073731827} - {fileID: 1922579743} m_Father: {fileID: 92738949} - m_RootOrder: 11 + m_RootOrder: 12 m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 0} @@ -4709,7 +4709,7 @@ RectTransform: m_Children: - {fileID: 1203970544} m_Father: {fileID: 92738949} - m_RootOrder: 6 + m_RootOrder: 7 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 10} @@ -5115,7 +5115,7 @@ RectTransform: m_Children: - {fileID: 1791410178} m_Father: {fileID: 92738949} - m_RootOrder: 3 + m_RootOrder: 4 m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} @@ -5166,7 +5166,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_Children: [] m_Father: {fileID: 92738949} - m_RootOrder: 4 + m_RootOrder: 5 m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 0} m_AnchoredPosition: {x: 0, y: 0} @@ -5527,12 +5527,12 @@ RectTransform: m_Children: - {fileID: 1524913367} - {fileID: 1558397903} - m_Father: {fileID: 184944853} - m_RootOrder: 0 - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 10} + m_Father: {fileID: 92738949} + m_RootOrder: 2 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -50, y: -5} + m_SizeDelta: {x: 100, y: 10} m_Pivot: {x: 0, y: 1} --- !u!1 &1922579742 GameObject: diff --git a/Assets/Scripts/Handlers/ClassicNoteHandler.cs b/Assets/Scripts/Handlers/ClassicNoteHandler.cs index b07a312..60aefa9 100644 --- a/Assets/Scripts/Handlers/ClassicNoteHandler.cs +++ b/Assets/Scripts/Handlers/ClassicNoteHandler.cs @@ -15,6 +15,8 @@ public class ClassicNoteHandler: NoteHandler { public float clampRangeStart, clampRangeEnd; [NonSerialized] public float startDistance, targetDistance, offset; + [NonSerialized] + public float startOffset; float delta1 = 0, delta2 = 0; @@ -129,7 +131,7 @@ public class ClassicNoteHandler: NoteHandler { } else if(overTime) { handler.transform.localPosition = Vector3.up * offset + Vector3.back * (targetDistance + Mathf.Abs(targetDistance - startDistance) * Mathf.Pow(delta, 0.5F) / 16); } else { - handler.transform.localPosition = Vector3.up * offset + Vector3.forward * Mathf.Lerp(startDistance, targetDistance, 1 - delta); + handler.transform.localPosition = Vector3.up * Mathf.Lerp(startOffset, offset, 1 - delta) + Vector3.forward * Mathf.Lerp(startDistance, targetDistance, 1 - delta); } } diff --git a/Assets/Scripts/Handlers/NoteSpawnerClassic.cs b/Assets/Scripts/Handlers/NoteSpawnerClassic.cs index 456b1fc..7dbcbbe 100644 --- a/Assets/Scripts/Handlers/NoteSpawnerClassic.cs +++ b/Assets/Scripts/Handlers/NoteSpawnerClassic.cs @@ -10,6 +10,7 @@ public class NoteSpawnerClassic: NoteSpawner { public float clampRangeStart = -1, clampRangeEnd = 1; public float startDistance = 0F, targetDistance = 1F, offset; + public float startOffset; public float maxNoteDistance = 360F; public Vector3 centroid; public ScoreDisplayPack scoreDisplayPack; @@ -36,6 +37,7 @@ public class NoteSpawnerClassic: NoteSpawner { noteHandler.clampRangeEnd = clampRangeEnd; noteHandler.startDistance = startDistance; noteHandler.targetDistance = targetDistance; + noteHandler.startOffset = startOffset; noteHandler.offset = offset; noteHandler.scoreDisplayPack = scoreDisplayPack; return noteHandler; diff --git a/Assets/Scripts/Loader.cs b/Assets/Scripts/Loader.cs index 59e4482..134d7ee 100644 --- a/Assets/Scripts/Loader.cs +++ b/Assets/Scripts/Loader.cs @@ -47,7 +47,7 @@ public class Loader : SingletonBehaviour { bmsManager.DetuneEnabled = enableDetune; bmsManager.BGAEnabled = enableBGA; bmsManager.DynamicPreEventOffset = dynamicSpeed; - bmsManager.PreEventOffset = TimeSpan.FromSeconds(2 - speed); + bmsManager.PreEventOffset = TimeSpan.FromSeconds((2 - speed) * 2); bmsManager.LoadBMS(bmsContent, fileInfo.Directory.FullName, fileInfo.Extension); while(!bmsManager.BMSLoaded) yield return null;