Skip to content

R
RhythmKata
Commit 39b775a6 authored by 13정준영's avatar 13정준영
Browse files
Options

채보 조정 및 전방노트 더 잘보이게 조정

parent f4ec1461
Hide whitespace changes
Inline Side-by-side
Showing with 206 additions and 209 deletions
RhythmKata/Assets/Prefabs/DefaultNote.prefab
View file @ 39b775a6
......@@ -184,7 +184,7 @@ SphereCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 1
m_Radius: 2
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &8354046899824507576
MonoBehaviour:
......@@ -218,8 +218,8 @@ MonoBehaviour:
inWeight: 0
outWeight: 0.269653
- serializedVersion: 3
time: 0
value: -0.006500244
time: -0.06536031
value: 0.3794575
inSlope: 1.3432946
outSlope: 1.3432946
tangentMode: 0
......@@ -227,23 +227,14 @@ MonoBehaviour:
inWeight: 0.079797246
outWeight: 0.08074485
- serializedVersion: 3
time: 0.33710623
value: 1.201772
inSlope: 4.044134
outSlope: 4.044134
time: 1.0000314
value: 1.0028753
inSlope: -0.3086618
outSlope: -0.3086618
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.10573776
- serializedVersion: 3
time: 1.0062561
value: 0.99053955
inSlope: -2.978137
outSlope: -2.978137
tangentMode: 0
weightedMode: 0
inWeight: 0.17391804
outWeight: 0.24592306
inWeight: 0.15004615
outWeight: 0.48310092
- serializedVersion: 3
time: 1.5
value: 0.17175293
......
RhythmKata/Assets/Resources/Level/Precision Strike.bms
View file @ 39b775a6
......@@ -36,7 +36,7 @@
#00812:35
#00911:53000073
#00911:23000073
#00912:57570000
#01011:00000033
......@@ -45,11 +45,11 @@
#01111:00000058
#01112:00370000
#01211:00000052
#01211:00000032
#01212:00530000
#01311:52770000
#01312:58000073
#01311:52580000
#01312:73000073
#01411:00370000
#01412:00000033
......@@ -60,75 +60,71 @@
#01611:00550000
#01612:00000055
#01713:E0
#01714:E2
#01716:E0
#02111:88680000
#02112:82002242
#02111:78680000
#02112:00003442
#02211:66640000
#02212:00004446
#02311:8822
#02312:00820028
#02311:5353
#02312:00570057
#02411:00000015
#02412:00000055
#02413:E00000E100000000
#02414:E20000E300000000
#02413:E00000E10000E000
#02414:E20000E30000E200
#02511:55000055
#02512:00550000
#02511:00000077
#02512:00730000
#02611:00000055
#02612:00550000
#02611:00000048
#02612:00420000
#02711:5500000000005555
#02712:00555500
#02711:3400000000006343
#02712:00665500
#02811:00550055
#02812:0055
#02811:00230022
#02812:0028
#02911:00555500
#02912:00550055
#02911:00474500
#02912:00750077
#03011:00000055
#03012:00550000
#03011:00000073
#03012:00370000
#03111:5500000000000055
#03112:00555555
#03111:7200000000000053
#03112:00747678
#03212:00550000
#03311:00550000
#03312:00550055
#03311:00230077
#03312:00460000
#03411:00550000
#03412:00000055
#03411:00000048
#03412:00420000
#03511:5500000000000055
#03512:00555555
#03511:3400000000006343
#03512:00665500
#03611:00550055
#03612:0055
#03611:00230022
#03612:0028
#03711:00550000
#03712:00550055
#03711:00254500
#03712:00450077
#03811:00550000
#03812:00000055
#03811:00000073
#03812:00370000
#03911:0000005500005500
#03912:0000000055000055
#03911:7200004400002400
#03912:0000000046000026
#04011:0055000000000000
#04012:0000005500550000
#04011:0043000000000000
#04012:0000007700750000
#04113:E1
#04114:E3
#04116:02
......@@ -136,104 +132,98 @@
#04513:E1000000000000E1
#04514:E3000000000000E3
#04613:E1000000000000E1
#04614:E3000000000000E3
#04613:E1000000000000E3
#04614:E3000000000000E1
#04713:E1E1
#04714:E3E3
#04713:E3E0
#04714:E1E2
#04811:1T00001T00001T00
#04812:0000001T00000000001T000000000000
#04811:8800008400006200
#04812:00000086000000000082000000000000
#04911:001T0000
#04912:00001T1T
#04913:E1
#04914:E3
#04911:00640000
#04912:00006666
#04913:E2
#04914:E0
#05011:1T1T0000
#05012:00001T1T
#05011:33330000
#05012:00003737
#05111:1T1T0000
#05112:00001T1T
#05111:63630000
#05112:00006767
#05211:1T1T
#05212:001T001T
#05211:4444
#05212:00660066
#05311:00000000000000E00000000000000000
#05312:000000E000000000000000E000000000
#05313:E1
#05314:E3
#05411:0002
#05412:00020002
#05413:E1
#05414:E3
#05413:E3
#05414:E1
#05513:E1
#05514:E3
#05613:E1E1
#05614:E3E3
#05613:E0E2
#05614:E2E0
#05711:02020000
#05712:00000202
#05711:11130000
#05712:00001719
#05811:0002001T
#05812:001T0000
#05812:00000035
#05813:E1
#05814:E3
#05816:00E10000
#05911:00020200
#05912:001T0002
#05911:00000064
#05912:00830000
#06011:000002000000001T
#06012:001T1T00
#06011:0000340000000023
#06012:0056
#06111:0000001T00001T00
#06112:001T000000020000
#06111:0000002400003500
#06112:0053000000540000
#06211:001T
#06212:0000021T
#06213:00E10000
#06214:00E30000
#06211:00450000
#06212:00000067
#06311:0002001T
#06312:00020200
#06311:00450000
#06312:00000047
#06411:0000001T00001T00
#06412:000000001T00001T
#06411:0000002300003500
#06412:0000000043000056
#06511:0000001T001T0000
#06512:001T000000000000
#06511:0000007700870000
#06512:0066000000000000
#06611:0002001T
#06612:001T0000
#06612:00000035
#06613:E1
#06614:E3
#06616:00020000
#06711:00020200
#06712:001T0002
#06711:00000064
#06712:00830000
#06811:000002000000001T
#06812:001T1T00
#06811:0000340000000023
#06812:0056
#06911:0000001T00001T00
#06912:001T000000020000
#06911:0000002400003500
#06912:0053000000540000
#07011:021T
#07012:0002001T
#07011:11120000
#07012:00002122
#07111:02020000
#07112:00000202
#07111:53520000
#07112:00006564
#07211:0202021T
#07212:000200020002001T
#07211:71727374
#07212:0081008200830084
#07311:0202021T
#07312:000200020002001T
#07311:52535455
#07312:0072007300740075
#07411:02
#07413:00E10000
#07414:00E30000
#07413:E1
#07414:E3
#07416:00580000
RhythmKata/Assets/Resources/Level/___TempBMS.bms
View file @ 39b775a6
......@@ -36,7 +36,7 @@
#00812:35
#00911:53000073
#00911:23000073
#00912:57570000
#01011:00000033
......@@ -45,11 +45,11 @@
#01111:00000058
#01112:00370000
#01211:00000052
#01211:00000032
#01212:00530000
#01311:52770000
#01312:58000073
#01311:52580000
#01312:73000073
#01411:00370000
#01412:00000033
......@@ -60,75 +60,71 @@
#01611:00550000
#01612:00000055
#01713:E0
#01714:E2
#01716:E0
#02111:88680000
#02112:82002242
#02111:78680000
#02112:00003442
#02211:66640000
#02212:00004446
#02311:8822
#02312:00820028
#02311:5353
#02312:00570057
#02411:00000055
#02412:00000055
#02413:E00000E100000000
#02414:E20000E300000000
#02413:E00000E10000E000
#02414:E20000E30000E200
#02511:55000055
#02512:00550000
#02511:00000077
#02512:00730000
#02611:00000055
#02612:00550000
#02611:00000048
#02612:00420000
#02711:5500000000005555
#02712:00555500
#02711:3400000000006343
#02712:00665500
#02811:00550055
#02812:0055
#02811:00230022
#02812:0028
#02911:00555500
#02912:00550055
#02911:00474500
#02912:00750077
#03011:00000055
#03012:00550000
#03011:00000073
#03012:00370000
#03111:5500000000000055
#03112:00555555
#03111:7200000000000053
#03112:00747678
#03212:00550000
#03311:00550000
#03312:00550055
#03311:00230077
#03312:00460000
#03411:00550000
#03412:00000055
#03411:00000048
#03412:00420000
#03511:5500000000000055
#03512:00555555
#03511:3400000000006343
#03512:00665500
#03611:00550055
#03612:0055
#03611:00230022
#03612:0028
#03711:00550000
#03712:00550055
#03711:00254500
#03712:00450077
#03811:00550000
#03812:00000055
#03811:00000073
#03812:00370000
#03911:0000005500005500
#03912:0000000055000055
#03911:7200004400002400
#03912:0000000046000026
#04011:0055000000000000
#04012:0000005500550000
#04011:0043000000000000
#04012:0000007700750000
#04113:E1
#04114:E3
#04116:02
......@@ -136,52 +132,51 @@
#04513:E1000000000000E1
#04514:E3000000000000E3
#04613:E1000000000000E1
#04614:E3000000000000E3
#04613:E1000000000000E3
#04614:E3000000000000E1
#04713:E1E1
#04714:E3E3
#04713:E3E0
#04714:E1E2
#04811:1T00001T00001T00
#04812:0000001T00000000001T000000000000
#04811:8800008400006200
#04812:00000086000000000082000000000000
#04911:001T0000
#04912:00001T1T
#04913:E1
#04914:E3
#04911:00640000
#04912:00006666
#04913:E2
#04914:E0
#05011:1T1T0000
#05012:00001T1T
#05011:33330000
#05012:00003737
#05111:1T1T0000
#05112:00001T1T
#05111:63630000
#05112:00006767
#05211:1T1T
#05212:001T001T
#05211:4444
#05212:00660066
#05311:00000000000000E00000000000000000
#05312:000000E000000000000000E000000000
#05311:00000000000000540000000000000000
#05312:00000056000000000000005600000000
#05313:E1
#05314:E3
#05411:0002
#05412:00020002
#05413:E1
#05414:E3
#05411:0066
#05412:00640064
#05413:E3
#05414:E1
#05513:E1
#05514:E3
#05613:E1E1
#05614:E3E3
#05613:E0E2
#05614:E2E0
#05711:02020000
#05712:00000202
#05711:11130000
#05712:00001719
#05811:0002001T
#05812:001T0000
#05813:E1
#05814:E3
#05816:E1
#05911:00020200
#05912:001T0002
......
RhythmKata/Assets/Resources/Level/___TempBMS.bms.meta
View file @ 39b775a6
......@@ -7,4 +7,4 @@ ScriptedImporter:
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: ee6f618bc43a08e44b3b2906bfdcf282, type: 3}
script: {fileID: 11500000, guid: 0c4f1437c5bc6ba40b27bb82b1967307, type: 3}
RhythmKata/Assets/Resources/SFX/SFX Project/sfx Project/Samples/Recorded.meta 0 → 100644
View file @ 39b775a6
fileFormatVersion: 2
guid: d9a533cec04e2124e9c31541b4f63e72
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
RhythmKata/Assets/Scripts/EdgeNoteObject.cs
View file @ 39b775a6
......@@ -26,6 +26,8 @@ public class EdgeNoteObject : NoteObject
public override void NoteHit(JudgeResult type)
{
PlayJudgeSfx(type);
PlayEngine.inst.HandleNoteJudge(type.type);
BlinkLight light = Instantiate(PlayEngine.inst.edgeHitEffectPrefab, -5 * direction, Quaternion.identity);
light.transform.LookAt(Vector3.zero);
......
RhythmKata/Assets/Scripts/ForwardNoteObject.cs
View file @ 39b775a6
......@@ -7,6 +7,7 @@ public class ForwardNoteObject : NoteObject
public RectTransform ring;
public AnimationCurve curve;
private Material mat;
private Vector3 targetScale;
// 각 노트별 개별 함수이기 때문에 상속 관계 유지 불필요.
public void Init(float x, float y, HandType handType)
......@@ -49,7 +50,7 @@ public class ForwardNoteObject : NoteObject
}
private void Start()
{
targetScale = transform.localScale;
}
private void OnDisable()
......@@ -78,17 +79,22 @@ public class ForwardNoteObject : NoteObject
public override void SetPosition(float remainedTime)
{
//base.SetPosition(remainedTime);
float z = 250 * remainedTime;
//base.SetPosition(remainedTime);
float z = 300 * Mathf.Pow(Mathf.Abs(remainedTime), 2f) * Mathf.Sign(remainedTime);
//float t = Mathf.Pow(1 - z / 250, 3);
float t = 1 - remainedTime;
transform.position = new Vector3(curve.Evaluate(t) * endPoint.x, curve.Evaluate(t) * endPoint.y, endPoint.z + z);
//transform.position = new Vector3(t * endPoint.x, t * endPoint.y, endPoint.z + z);
//transform.position = new Vector3(t * endPoint.x, t * endPoint.y, endPoint.z + z);
float s = Mathf.Pow(Mathf.Abs(t), 2f) * Mathf.Sign(t);
transform.localScale = targetScale * Mathf.Clamp(t, 0.2f, 1);
var showRing = remainedTime < 0.3f;
var showRing = remainedTime < 0.3f;
ring.localScale = Mathf.Max((1 + 20 * remainedTime), 0) * new Vector3(1, 1, 1);
// change ring alpha
var img = ring.gameObject.GetComponent<UnityEngine.UI.Image>();
......
RhythmKata/Assets/Scripts/NoteObject.cs
View file @ 39b775a6
......@@ -28,7 +28,7 @@ public abstract class NoteObject : MonoBehaviour
remainedTime = maxRemainedTime;
}
public virtual void NoteHit(JudgeResult judge)
public void PlayJudgeSfx(JudgeResult judge)
{
AudioClip hitClip = null;
// play hit sound
......@@ -41,6 +41,11 @@ public abstract class NoteObject : MonoBehaviour
{
AudioSource.PlayClipAtPoint(hitClip, Vector3.zero);
}
}
public virtual void NoteHit(JudgeResult judge)
{
PlayJudgeSfx(judge);
GameObject hitEffect = null;
// hit effect
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment