Skip to content

R
RhythmKata
Commit c79c553d authored by 15박보승's avatar 15박보승
Browse files
Options

ForwardNote 움직임 변경

parent 07054fb5
Show whitespace changes
Inline Side-by-side
Showing with 202 additions and 214 deletions
RhythmKata/Assets/Materials/Skybox.mat
View file @ c79c553d
...@@ -48,7 +48,7 @@ Material: ...@@ -48,7 +48,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _FrontTex: - _FrontTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: d6f0e028c1244404eb2d02959b9f8f60, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _LeftTex: - _LeftTex:
......
RhythmKata/Assets/Prefabs/DefaultNote.prefab
View file @ c79c553d
...@@ -205,6 +205,48 @@ MonoBehaviour: ...@@ -205,6 +205,48 @@ MonoBehaviour:
- {fileID: 8300000, guid: c2f12704acf658247b2140ac0cf42ba5, type: 3} - {fileID: 8300000, guid: c2f12704acf658247b2140ac0cf42ba5, type: 3}
- {fileID: 8300000, guid: 555197e3a8315ad44844278d16b1e3fb, type: 3} - {fileID: 8300000, guid: 555197e3a8315ad44844278d16b1e3fb, type: 3}
ring: {fileID: 0} ring: {fileID: 0}
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: -0.006500244
inSlope: 5.2741838
outSlope: 5.2741838
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0.074386515
- serializedVersion: 3
time: 0.75
value: 2
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.096423134
outWeight: 1
- serializedVersion: 3
time: 1
value: 1
inSlope: -4.2210984
outSlope: -4.2210984
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.13715482
- serializedVersion: 3
time: 1.5
value: 0.17175293
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.6662333
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!96 &3626977960969211900 --- !u!96 &3626977960969211900
TrailRenderer: TrailRenderer:
serializedVersion: 2 serializedVersion: 2
......
RhythmKata/Assets/Scenes/mergescene.unity
View file @ c79c553d
...@@ -132,6 +132,11 @@ PrefabInstance: ...@@ -132,6 +132,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Tunnel value: Tunnel
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8, - target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
...@@ -190,12 +195,12 @@ PrefabInstance: ...@@ -190,12 +195,12 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8, - target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3} type: 3}
propertyPath: m_LocalScale.y propertyPath: m_LocalScale.y
value: 18 value: 45
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8, - target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3} type: 3}
propertyPath: m_LocalScale.z propertyPath: m_LocalScale.z
value: 18 value: 45
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -1504981713932161579, guid: 183d1d3e655e0294c8f38c5b687642a8, - target: {fileID: -1504981713932161579, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3} type: 3}
...@@ -362,37 +367,6 @@ CanvasRenderer: ...@@ -362,37 +367,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 150320121} m_GameObject: {fileID: 150320121}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &161512836
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 341502039}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 161512837}
m_Layer: 0
m_Name: Tunnel (1) (Missing Prefab)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &161512837
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 341502039}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 161512836}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2112533739}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &248867246 --- !u!1 &248867246
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -430,6 +404,87 @@ RectTransform: ...@@ -430,6 +404,87 @@ RectTransform:
m_AnchoredPosition: {x: -200, y: 0} m_AnchoredPosition: {x: -200, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &313073069
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1081480033}
m_Modifications:
- target: {fileID: 107946, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000011957598740, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
propertyPath: inputSource
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2083460, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: far clip plane
value: 600
objectReference: {fileID: 0}
- target: {fileID: 2014920, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: far clip plane
value: 600
objectReference: {fileID: 0}
- target: {fileID: 11401046, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: renderModelPrefab
value:
objectReference: {fileID: 4323607481689171280, guid: e3f9757e6febe094f82a40085b363ff5,
type: 3}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
--- !u!4 &313073070 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
m_PrefabInstance: {fileID: 313073069}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &341502039 --- !u!1001 &341502039
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -442,6 +497,11 @@ PrefabInstance: ...@@ -442,6 +497,11 @@ PrefabInstance:
propertyPath: m_Name propertyPath: m_Name
value: Tunnel (1) value: Tunnel (1)
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8, - target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
...@@ -500,12 +560,12 @@ PrefabInstance: ...@@ -500,12 +560,12 @@ PrefabInstance:
- target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8, - target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3} type: 3}
propertyPath: m_LocalScale.y propertyPath: m_LocalScale.y
value: 20 value: 50
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8, - target: {fileID: -4216859302048453862, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3} type: 3}
propertyPath: m_LocalScale.z propertyPath: m_LocalScale.z
value: 20 value: 50
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: -1504981713932161579, guid: 183d1d3e655e0294c8f38c5b687642a8, - target: {fileID: -1504981713932161579, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3} type: 3}
...@@ -631,43 +691,12 @@ MonoBehaviour: ...@@ -631,43 +691,12 @@ MonoBehaviour:
type: 3} type: 3}
scoreText: {fileID: 1245177463} scoreText: {fileID: 1245177463}
comboText: {fileID: 150320123} comboText: {fileID: 150320123}
--- !u!4 &571765379 stripped --- !u!1 &857018376 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
m_PrefabInstance: {fileID: 1988354649}
m_PrefabAsset: {fileID: 0}
--- !u!1 &941293480
GameObject: GameObject:
m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 107946, guid: dc06161b6d97feb419f45f03b62e14b9,
m_CorrespondingSourceObject: {fileID: 0} type: 3}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 313073069}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 941293481}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &941293481
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 941293480}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 571765379}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1011486258 --- !u!1 &1011486258
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -718,6 +747,7 @@ MonoBehaviour: ...@@ -718,6 +747,7 @@ MonoBehaviour:
needsReinit: 0 needsReinit: 0
leftHand: 1 leftHand: 1
rightHand: 2 rightHand: 2
player: {fileID: 857018376}
--- !u!4 &1011486260 --- !u!4 &1011486260
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -730,7 +760,7 @@ Transform: ...@@ -730,7 +760,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 5 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &1011486261 --- !u!82 &1011486261
AudioSource: AudioSource:
...@@ -828,6 +858,37 @@ AudioSource: ...@@ -828,6 +858,37 @@ AudioSource:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
--- !u!1 &1081480032
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1081480033}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1081480033
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1081480032}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 313073070}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1245177461 --- !u!1 &1245177461
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -907,36 +968,6 @@ CanvasRenderer: ...@@ -907,36 +968,6 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1245177461} m_GameObject: {fileID: 1245177461}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &1371036545
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 23206332}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1371036546}
m_Layer: 0
m_Name: Tunnel (Missing Prefab)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1371036546
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 23206332}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1371036545}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1568604744 --- !u!1 &1568604744
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1064,94 +1095,12 @@ RectTransform: ...@@ -1064,94 +1095,12 @@ RectTransform:
m_AnchoredPosition: {x: 200, y: 0} m_AnchoredPosition: {x: 200, y: 0}
m_SizeDelta: {x: 100, y: 100} m_SizeDelta: {x: 100, y: 100}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!1001 &1988354649 --- !u!1 &2112533737 stripped
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 941293481}
m_Modifications:
- target: {fileID: 107946, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114000011957598740, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
propertyPath: inputSource
value: 2
objectReference: {fileID: 0}
- target: {fileID: 2083460, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: far clip plane
value: 600
objectReference: {fileID: 0}
- target: {fileID: 2014920, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: far clip plane
value: 600
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
--- !u!1 &2112533737
GameObject: GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 183d1d3e655e0294c8f38c5b687642a8, m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 183d1d3e655e0294c8f38c5b687642a8,
type: 3} type: 3}
m_PrefabInstance: {fileID: 341502039} m_PrefabInstance: {fileID: 341502039}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2112533739}
- component: {fileID: 2112533738}
m_Layer: 0
m_Name: Missing Prefab (Dummy)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!114 &2112533738 --- !u!114 &2112533738
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1165,17 +1114,3 @@ MonoBehaviour: ...@@ -1165,17 +1114,3 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
incr: 1 incr: 1
--- !u!4 &2112533739
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 341502039}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2112533737}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 161512837}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
RhythmKata/Assets/Scripts/Core/Note.cs
View file @ c79c553d
...@@ -98,7 +98,7 @@ abstract class Note ...@@ -98,7 +98,7 @@ abstract class Note
private static readonly float NOTE_POSITION_MULTIPLIER = 2; private static readonly float NOTE_POSITION_MULTIPLIER = 2;
public void Update(float remainingTime) public void Update(float remainingTime)
{ {
if (remainingTime < NOTE_HIDE_TIMING || remainingTime > NOTE_SHOW_TIMING) if (remainingTime < NOTE_HIDE_TIMING * NOTE_POSITION_MULTIPLIER || remainingTime > NOTE_SHOW_TIMING)
{ {
noteObject.gameObject.SetActive(false); noteObject.gameObject.SetActive(false);
isVisible = false; isVisible = false;
......
RhythmKata/Assets/Scripts/ForwardNoteObject.cs
View file @ c79c553d
...@@ -5,6 +5,8 @@ using UnityEngine.UI; ...@@ -5,6 +5,8 @@ using UnityEngine.UI;
public class ForwardNoteObject : NoteObject public class ForwardNoteObject : NoteObject
{ {
public RectTransform ring; public RectTransform ring;
public AnimationCurve curve;
private Material mat;
// 각 노트별 개별 함수이기 때문에 상속 관계 유지 불필요. // 각 노트별 개별 함수이기 때문에 상속 관계 유지 불필요.
public void Init(float x, float y, HandType handType) public void Init(float x, float y, HandType handType)
...@@ -16,13 +18,18 @@ public class ForwardNoteObject : NoteObject ...@@ -16,13 +18,18 @@ public class ForwardNoteObject : NoteObject
//Ray ray = Camera.main.ScreenPointToRay(new Vector3(Screen.width * x, Screen.height * y, 0)); //Ray ray = Camera.main.ScreenPointToRay(new Vector3(Screen.width * x, Screen.height * y, 0));
//endPoint = ray.GetPoint(perfectZ); //endPoint = ray.GetPoint(perfectZ);
endPoint = new Vector3(-20f + 40 * x, -20.0f + 40 * y, perfectZ);
transform.position = endPoint + new Vector3(0, 0, 15); endPoint = new Vector3(-100f + 200 * x, -100.0f + 200 * y, perfectZ);
Ray ray = new Ray(Vector3.zero, endPoint.normalized);
endPoint = ray.GetPoint(perfectZ);
Debug.Log(endPoint);
ring = IngameUIManager.inst.AddNoteRingUI(); ring = IngameUIManager.inst.AddNoteRingUI();
ring.position = endPoint; ring.position = endPoint;
ring.LookAt(Vector3.zero);
Material mat = GetComponent<Renderer>().material; mat = GetComponent<Renderer>().material;
switch (handType) switch (handType)
{ {
...@@ -38,8 +45,6 @@ public class ForwardNoteObject : NoteObject ...@@ -38,8 +45,6 @@ public class ForwardNoteObject : NoteObject
GetComponentInChildren<Light>().color = Color.cyan; GetComponentInChildren<Light>().color = Color.cyan;
ring.GetComponent<Image>().color = Color.cyan; ring.GetComponent<Image>().color = Color.cyan;
break; break;
} }
} }
private void Start() private void Start()
...@@ -73,7 +78,13 @@ public class ForwardNoteObject : NoteObject ...@@ -73,7 +78,13 @@ public class ForwardNoteObject : NoteObject
public override void SetPosition(float remainedTime) public override void SetPosition(float remainedTime)
{ {
base.SetPosition(remainedTime); //base.SetPosition(remainedTime);
float z = 250 * 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);
var showRing = remainedTime < 0.3f; var showRing = remainedTime < 0.3f;
ring.localScale = Mathf.Max((1 + 20 * remainedTime), 0) * new Vector3(1, 1, 1); ring.localScale = Mathf.Max((1 + 20 * remainedTime), 0) * new Vector3(1, 1, 1);
......
RhythmKata/Assets/Scripts/NoteObject.cs
View file @ c79c553d
...@@ -111,8 +111,8 @@ public abstract class NoteObject : MonoBehaviour ...@@ -111,8 +111,8 @@ public abstract class NoteObject : MonoBehaviour
for (float t = 0; t < time; t += Time.deltaTime) for (float t = 0; t < time; t += Time.deltaTime)
{ {
//print(t / time);
mat.SetFloat("_Threshold", t / time); mat.SetFloat("_Threshold", t / time);
mat.SetColor("_Color", mat.color - new Color(0,0,0,2) * Time.deltaTime);
yield return null; yield return null;
} }
mat.SetFloat("_Threshold", 1); mat.SetFloat("_Threshold", 1);
......
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