Skip to content

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

중간발표

parent f2d98d0a
Show whitespace changes
Inline Side-by-side
Showing with 881 additions and 282 deletions
RhythmKata/Assets/Prefabs/DefaultNote.prefab
View file @ 194f76df
...@@ -121,7 +121,7 @@ Transform: ...@@ -121,7 +121,7 @@ Transform:
m_GameObject: {fileID: 8354046899824507571} m_GameObject: {fileID: 8354046899824507571}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalPosition: {x: 0, y: 0, z: 10}
m_LocalScale: {x: 5, y: 5, z: 5} m_LocalScale: {x: 10, y: 10, z: 10}
m_Children: m_Children:
- {fileID: 2824711142497691445} - {fileID: 2824711142497691445}
m_Father: {fileID: 0} m_Father: {fileID: 0}
......
RhythmKata/Assets/Prefabs/EdgeNote_Down.prefab
View file @ 194f76df
...@@ -27,13 +27,13 @@ Transform: ...@@ -27,13 +27,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4640709078173886784} m_GameObject: {fileID: 4640709078173886784}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 10, y: 10, z: 1} m_LocalScale: {x: 3, y: 10, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90}
--- !u!33 &4640709078173886787 --- !u!33 &4640709078173886787
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
RhythmKata/Assets/Prefabs/EdgeNote_Left.prefab
View file @ 194f76df
...@@ -27,13 +27,13 @@ Transform: ...@@ -27,13 +27,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4734231541000158423} m_GameObject: {fileID: 4734231541000158423}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 10, y: 10, z: 1} m_LocalScale: {x: 3, y: 10, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!33 &4734231541000158424 --- !u!33 &4734231541000158424
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
RhythmKata/Assets/Prefabs/EdgeNote_Right.prefab
View file @ 194f76df
...@@ -27,13 +27,13 @@ Transform: ...@@ -27,13 +27,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1476454008853626150} m_GameObject: {fileID: 1476454008853626150}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 10, y: 10, z: 1} m_LocalScale: {x: 3, y: 10, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!33 &1476454008853626155 --- !u!33 &1476454008853626155
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
RhythmKata/Assets/Prefabs/EdgeNote_Up.prefab
View file @ 194f76df
...@@ -27,13 +27,13 @@ Transform: ...@@ -27,13 +27,13 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4081910931583206819} m_GameObject: {fileID: 4081910931583206819}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0.5, y: -0.5, z: 0.5, w: 0.5}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 10, y: 10, z: 1} m_LocalScale: {x: 3, y: 10, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 90, y: 0, z: 90}
--- !u!33 &4081910931583206814 --- !u!33 &4081910931583206814
MeshFilter: MeshFilter:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
RhythmKata/Assets/Prefabs/Gun Hand 1.prefab 0 → 100644
View file @ 194f76df
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &498661526374351754
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7146509756885100364}
m_Layer: 0
m_Name: Root.004
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7146509756885100364
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 498661526374351754}
m_LocalRotation: {x: 1.0554825e-21, y: -3.552718e-15, z: -3.3306689e-15, w: 1}
m_LocalPosition: {x: 1.9245465e-13, y: 0.016269717, z: 2.809725e-10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4016496810639371130}
m_Father: {fileID: 8736220886843068902}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1521143242905699669
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1369659905466621693}
m_Layer: 0
m_Name: Up1.005_end
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1369659905466621693
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1521143242905699669}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0.015336686, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 6372266714935097235}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1957846734370040657
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 864800827208892061}
m_Layer: 0
m_Name: Root.003
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &864800827208892061
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1957846734370040657}
m_LocalRotation: {x: 0.06322898, y: 0.5605726, z: 0.8216356, w: -0.08170337}
m_LocalPosition: {x: -3.352761e-10, y: 0.012674857, z: -0.0000000010430813}
m_LocalScale: {x: 1.0000001, y: 1, z: 1}
m_Children:
- {fileID: 8736220886843068902}
m_Father: {fileID: 2497179935335490908}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &3145579070109668085
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6032679763793247741}
m_Layer: 0
m_Name: Armature
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6032679763793247741
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3145579070109668085}
m_LocalRotation: {x: 0.4957057, y: 0.4957057, z: 0.50425774, w: -0.50425774}
m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_Children:
- {fileID: 4168023236793435463}
m_Father: {fileID: 8004700759934727795}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90.98, y: 180, z: 90}
--- !u!1 &3544202024608014537
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8736220886843068902}
m_Layer: 0
m_Name: Root.005
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8736220886843068902
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3544202024608014537}
m_LocalRotation: {x: 0.000000014901158, y: 0.00000004842878, z: 0.000000014901186,
w: 1}
m_LocalPosition: {x: -2.4176359e-11, y: 0.016269721, z: 0.0000000010315545}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 7146509756885100364}
m_Father: {fileID: 864800827208892061}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &4323607481689171280
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5559553495877387631}
m_Layer: 0
m_Name: Gun Hand 1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5559553495877387631
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4323607481689171280}
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: 8004700759934727795}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5320353821702187631
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6372266714935097235}
m_Layer: 0
m_Name: Up1.005
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6372266714935097235
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5320353821702187631}
m_LocalRotation: {x: -0.0070452616, y: 0.9895959, z: 0.06423177, w: -0.1285485}
m_LocalPosition: {x: 0.00000692375, y: -0.03049975, z: -0.0023366436}
m_LocalScale: {x: 1, y: 1.0000004, z: 1}
m_Children:
- {fileID: 1369659905466621693}
m_Father: {fileID: 2497179935335490908}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &6195634577605626057
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6944302838222521118}
- component: {fileID: 1538255553353109432}
m_Layer: 0
m_Name: Glock
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6944302838222521118
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6195634577605626057}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.00999885, y: -0.0013105178, z: 0.0010001289}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8004700759934727795}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!137 &1538255553353109432
SkinnedMeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6195634577605626057}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 7b939e5e799d98a469f594828ebab52e, type: 2}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 9b01d7c0e4dfa854eb5dfe2624e27c0f, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
serializedVersion: 2
m_Quality: 0
m_UpdateWhenOffscreen: 0
m_SkinnedMotionVectors: 1
m_Mesh: {fileID: 669696258820236782, guid: f90eec587b051f74d9f6fe7febae32f5, type: 3}
m_Bones:
- {fileID: 4168023236793435463}
- {fileID: 2497179935335490908}
- {fileID: 6372266714935097235}
- {fileID: 864800827208892061}
- {fileID: 8736220886843068902}
- {fileID: 7146509756885100364}
- {fileID: 4016496810639371130}
m_BlendShapeWeights: []
m_RootBone: {fileID: 4168023236793435463}
m_AABB:
m_Center: {x: 0.0071992525, y: -0.0040474907, z: 0.032780834}
m_Extent: {x: 0.01674547, y: 0.036941227, z: 0.056377895}
m_DirtyAABB: 0
--- !u!1 &6434853554315560032
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8004700759934727795}
- component: {fileID: 116085542682221321}
m_Layer: 0
m_Name: gun
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8004700759934727795
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6434853554315560032}
m_LocalRotation: {x: 0.23912664, y: 0, z: 0, w: 0.9709884}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6032679763793247741}
- {fileID: 6944302838222521118}
- {fileID: 2903384417594384234}
m_Father: {fileID: 5559553495877387631}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 27.67, y: 0, z: 0}
--- !u!95 &116085542682221321
Animator:
serializedVersion: 3
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6434853554315560032}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: f90eec587b051f74d9f6fe7febae32f5, type: 3}
m_Controller: {fileID: 0}
m_CullingMode: 1
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!1 &7053477854940205950
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4168023236793435463}
m_Layer: 0
m_Name: Up1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4168023236793435463
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7053477854940205950}
m_LocalRotation: {x: 0.44222113, y: 0.36541265, z: 0.52587134, w: 0.62799156}
m_LocalPosition: {x: -0.027513694, y: 0.000228871, z: -0.010947611}
m_LocalScale: {x: 1, y: 0.99999976, z: 0.9999998}
m_Children:
- {fileID: 2497179935335490908}
m_Father: {fileID: 6032679763793247741}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7204036589021857813
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4016496810639371130}
m_Layer: 0
m_Name: Root.006
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4016496810639371130
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7204036589021857813}
m_LocalRotation: {x: 7.549519e-15, y: -2.8521188e-21, z: -3.3306689e-15, w: 1}
m_LocalPosition: {x: 5.0704017e-11, y: 0.022248875, z: 2.809704e-10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 9077875141111139755}
m_Father: {fileID: 7146509756885100364}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &7953974935499187055
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9077875141111139755}
m_Layer: 0
m_Name: Root.006_end
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9077875141111139755
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7953974935499187055}
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0, y: 0.022248868, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4016496810639371130}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8345233313672621229
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2497179935335490908}
m_Layer: 0
m_Name: Up2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2497179935335490908
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8345233313672621229}
m_LocalRotation: {x: -0.011720461, y: -0.013144849, z: -0.0016689937, w: 0.99984354}
m_LocalPosition: {x: -2.7939677e-11, y: 0.015295422, z: -0.0000000018253922}
m_LocalScale: {x: 0.99999994, y: 1, z: 1}
m_Children:
- {fileID: 864800827208892061}
- {fileID: 6372266714935097235}
m_Father: {fileID: 4168023236793435463}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8719247719020841660
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2903384417594384234}
- component: {fileID: 2936670206978590435}
m_Layer: 0
m_Name: Laser
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2903384417594384234
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8719247719020841660}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.023, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8004700759934727795}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &2936670206978590435
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8719247719020841660}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 753a9b80e714a8a43a0c1ff5a89d0bc9, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 10}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.029125214
value: 0.00746727
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.30744338
value: 0.47014925
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 0, g: 1, b: 0.9218221, a: 1}
key1: {r: 0, g: 1, b: 0.979579, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 40
alignment: 0
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_UseWorldSpace: 0
m_Loop: 0
RhythmKata/Assets/Prefabs/Gun Hand 1.prefab.meta 0 → 100644
View file @ 194f76df
fileFormatVersion: 2
guid: e3f9757e6febe094f82a40085b363ff5
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
RhythmKata/Assets/Prefabs/Gun Hand.prefab
View file @ 194f76df
...@@ -115,14 +115,14 @@ Transform: ...@@ -115,14 +115,14 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3145579070109668085} m_GameObject: {fileID: 3145579070109668085}
m_LocalRotation: {x: 1, y: -0, z: 0, w: 0.000024367924} m_LocalRotation: {x: 0.4957057, y: 0.4957057, z: 0.50425774, w: -0.50425774}
m_LocalPosition: {x: -0, y: 0, z: 0} m_LocalPosition: {x: -0, y: 0, z: 0}
m_LocalScale: {x: 100, y: 100, z: 100} m_LocalScale: {x: 3, y: 3, z: 3}
m_Children: m_Children:
- {fileID: 4168023236793435463} - {fileID: 4168023236793435463}
m_Father: {fileID: 8004700759934727795} m_Father: {fileID: 8004700759934727795}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: -90.98, y: 180, z: 90}
--- !u!1 &3544202024608014537 --- !u!1 &3544202024608014537
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -178,8 +178,8 @@ Transform: ...@@ -178,8 +178,8 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4323607481689171280} m_GameObject: {fileID: 4323607481689171280}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.4, y: -7.7, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 8004700759934727795} - {fileID: 8004700759934727795}
...@@ -241,9 +241,9 @@ Transform: ...@@ -241,9 +241,9 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6195634577605626057} m_GameObject: {fileID: 6195634577605626057}
m_LocalRotation: {x: -0.70712405, y: 0, z: -0, w: 0.70708954} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.00999885, y: -0.0013105178, z: 0.0010001289} m_LocalPosition: {x: 0.00999885, y: -0.0013105178, z: 0.0010001289}
m_LocalScale: {x: 100, y: 100, z: 100} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 8004700759934727795} m_Father: {fileID: 8004700759934727795}
m_RootOrder: 1 m_RootOrder: 1
...@@ -332,15 +332,16 @@ Transform: ...@@ -332,15 +332,16 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6434853554315560032} m_GameObject: {fileID: 6434853554315560032}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: 0.23912664, y: 0, z: 0, w: 0.9709884}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 6032679763793247741} - {fileID: 6032679763793247741}
- {fileID: 6944302838222521118} - {fileID: 6944302838222521118}
- {fileID: 2903384417594384234}
m_Father: {fileID: 5559553495877387631} m_Father: {fileID: 5559553495877387631}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 27.67, y: 0, z: 0}
--- !u!95 &116085542682221321 --- !u!95 &116085542682221321
Animator: Animator:
serializedVersion: 3 serializedVersion: 3
...@@ -484,3 +485,139 @@ Transform: ...@@ -484,3 +485,139 @@ Transform:
m_Father: {fileID: 4168023236793435463} m_Father: {fileID: 4168023236793435463}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8719247719020841660
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2903384417594384234}
- component: {fileID: 2936670206978590435}
m_Layer: 0
m_Name: Laser
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2903384417594384234
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8719247719020841660}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.023, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 8004700759934727795}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &2936670206978590435
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8719247719020841660}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 753a9b80e714a8a43a0c1ff5a89d0bc9, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 10}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0.029125214
value: 0.00746727
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 0.30744338
value: 0.47014925
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0
outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 1, g: 0, b: 0.8258381, a: 1}
key1: {r: 1, g: 0, b: 0.8094106, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 40
alignment: 0
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_UseWorldSpace: 0
m_Loop: 0
RhythmKata/Assets/Prefabs/Ring.prefab
View file @ 194f76df
...@@ -27,7 +27,7 @@ RectTransform: ...@@ -27,7 +27,7 @@ RectTransform:
m_GameObject: {fileID: 8100479809720507869} m_GameObject: {fileID: 8100479809720507869}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 5, y: 5, z: 1} m_LocalScale: {x: 10, y: 10, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
...@@ -35,7 +35,7 @@ RectTransform: ...@@ -35,7 +35,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 3.3, y: 3.3} m_SizeDelta: {x: 6.6, y: 6.6}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8100479809720507870 --- !u!222 &8100479809720507870
CanvasRenderer: CanvasRenderer:
......
RhythmKata/Assets/Prefabs/gun.prefab
View file @ 194f76df
...@@ -394,7 +394,7 @@ Transform: ...@@ -394,7 +394,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7988148489419422301} m_GameObject: {fileID: 7988148489419422301}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
...@@ -402,7 +402,7 @@ Transform: ...@@ -402,7 +402,7 @@ Transform:
- {fileID: 6325786366004493603} - {fileID: 6325786366004493603}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!95 &3894136634755032372 --- !u!95 &3894136634755032372
Animator: Animator:
serializedVersion: 3 serializedVersion: 3
......
RhythmKata/Assets/Scenes/gun.unity
View file @ 194f76df
...@@ -683,10 +683,11 @@ MonoBehaviour: ...@@ -683,10 +683,11 @@ MonoBehaviour:
gunSfx: {fileID: 8300000, guid: 7eb98e62c3fbe5344aa72ecad87ce5cc, type: 3} gunSfx: {fileID: 8300000, guid: 7eb98e62c3fbe5344aa72ecad87ce5cc, type: 3}
explosion: {fileID: 0} explosion: {fileID: 0}
fire: fire:
actionPath: actionPath: /actions/default/in/GrabPinch
needsReinit: 0 needsReinit: 0
leftHand: 1 leftHand: 1
rightHand: 2 rightHand: 2
player: {fileID: 1838822467}
--- !u!4 &1011486260 --- !u!4 &1011486260
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1003,6 +1004,12 @@ RectTransform: ...@@ -1003,6 +1004,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!1 &1838822467 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 107946, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
m_PrefabInstance: {fileID: 1988354649}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1988354649 --- !u!1001 &1988354649
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1071,6 +1078,11 @@ PrefabInstance: ...@@ -1071,6 +1078,11 @@ PrefabInstance:
propertyPath: inputSource propertyPath: inputSource
value: 2 value: 2
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 11401046, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
propertyPath: renderModelPrefab
value:
objectReference: {fileID: 4323607481689171280, guid: e3f9757e6febe094f82a40085b363ff5,
type: 3}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3} m_SourcePrefab: {fileID: 100100000, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
--- !u!1 &2112533737 stripped --- !u!1 &2112533737 stripped
...@@ -1092,72 +1104,3 @@ MonoBehaviour: ...@@ -1092,72 +1104,3 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
incr: 1 incr: 1
--- !u!1001 &2160170553380165745
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 7988148489419422301, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_Name
value: gun
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 552978e18fd475d44a20b08bee06ddc0, type: 3}
RhythmKata/Assets/Scripts/Core/Level.cs
View file @ 194f76df
...@@ -21,10 +21,11 @@ class Level ...@@ -21,10 +21,11 @@ class Level
if (judge.type != JudgeType.Ignore) if (judge.type != JudgeType.Ignore)
{ {
note.HandleJudge(judge);
note.Deactivate(); note.Deactivate();
break;
} }
note.HandleJudge(judge);
} }
} }
} }
......
RhythmKata/Assets/Scripts/EdgeNoteObject.cs
View file @ 194f76df
...@@ -6,7 +6,7 @@ public class EdgeNoteObject : NoteObject ...@@ -6,7 +6,7 @@ public class EdgeNoteObject : NoteObject
{ {
[SerializeField] [SerializeField]
private Vector3 direction; private Vector3 direction;
private const float radius = 100f; private const float radius = 10f;
public void Init(HandType hand) public void Init(HandType hand)
{ {
...@@ -31,21 +31,17 @@ public class EdgeNoteObject : NoteObject ...@@ -31,21 +31,17 @@ public class EdgeNoteObject : NoteObject
public override void SetPosition(float remainedTime) public override void SetPosition(float remainedTime)
{ {
//if (remainedTime > 0.5f)
//{
if (remainedTime > 0.5f) // transform.position = new Vector3(0, 0, Mathf.Lerp(radius, 500, (remainedTime - 0.5f) * 2));
{ //}
transform.position = new Vector3(0, 0, Mathf.Lerp(radius, 500, (remainedTime - 0.5f) * 2)); //else
} //{
else // float angle = Mathf.Lerp(0, 90, Mathf.Pow(remainedTime * 2 - 1, 2));
{ // transform.position = Quaternion.Euler(direction.x * angle, direction.y * angle, 0) * new Vector3(0, 0, radius);
float angle = Mathf.Lerp(0, 90, Mathf.Pow(remainedTime * 2 - 1, 2)); // transform.LookAt(Vector3.zero);
transform.position = Quaternion.Euler(direction.x * angle, direction.y * angle, 0) * new Vector3(0, 0, radius); //}
transform.LookAt(Vector3.zero); transform.position = endPoint + new Vector3(0, 0, 200) * remainedTime;
}
//transform.position = Vector3.Lerp(endPoint, endPoint + new Vector3(0, 0, 200), remainedTime);
} }
public override bool IsHit(Ray ray) public override bool IsHit(Ray ray)
......
RhythmKata/Assets/Scripts/ForwardNoteObject.cs
View file @ 194f76df
...@@ -16,9 +16,9 @@ public class ForwardNoteObject : NoteObject ...@@ -16,9 +16,9 @@ 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(-7.5f + 15 * x, -7.5f + 15 * y, perfectZ); endPoint = new Vector3(-20f + 40 * x, -20.0f + 40 * y, perfectZ);
transform.position = endPoint + new Vector3(0, 0, 50); transform.position = endPoint + new Vector3(0, 0, 15);
ring = IngameUIManager.inst.AddNoteRingUI(); ring = IngameUIManager.inst.AddNoteRingUI();
ring.position = endPoint; ring.position = endPoint;
...@@ -89,6 +89,6 @@ public class ForwardNoteObject : NoteObject ...@@ -89,6 +89,6 @@ public class ForwardNoteObject : NoteObject
public override bool IsHit(Ray ray) public override bool IsHit(Ray ray)
{ {
RaycastHit hit; RaycastHit hit;
return GetComponent<Collider>().Raycast(ray, out hit, 40); return GetComponent<Collider>().Raycast(ray, out hit, 400);
} }
} }
RhythmKata/Assets/Scripts/NoteObject.cs
View file @ 194f76df
...@@ -65,11 +65,13 @@ public abstract class NoteObject : MonoBehaviour ...@@ -65,11 +65,13 @@ public abstract class NoteObject : MonoBehaviour
/* /*
var meshRenderer = gameObject.GetComponent<MeshRenderer>(); var meshRenderer = gameObject.GetComponent<MeshRenderer>();
var trailRenderer = gameObject.GetComponent<TrailRenderer>();
if (meshRenderer) meshRenderer.enabled = false; if (meshRenderer) meshRenderer.enabled = false;
if (trailRenderer) trailRenderer.enabled = false;
*/ */
var trailRenderer = gameObject.GetComponent<TrailRenderer>();
if (trailRenderer) trailRenderer.enabled = false;
PlayEngine.inst.HandleNoteJudge(judge.type); PlayEngine.inst.HandleNoteJudge(judge.type);
} }
} }
......
RhythmKata/Assets/Scripts/PlayEngine.cs
View file @ 194f76df
...@@ -32,6 +32,8 @@ public class PlayEngine : SingletonBehaviour<PlayEngine> ...@@ -32,6 +32,8 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
public SteamVR_Input_Sources leftHand; public SteamVR_Input_Sources leftHand;
public SteamVR_Input_Sources rightHand; public SteamVR_Input_Sources rightHand;
public GameObject player;
private int combo; private int combo;
private int score; private int score;
...@@ -73,11 +75,28 @@ public class PlayEngine : SingletonBehaviour<PlayEngine> ...@@ -73,11 +75,28 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
if (level != null) if (level != null)
{ {
var playbackTime = AudioSettings.dspTime - startDspTime; var playbackTime = AudioSettings.dspTime - startDspTime;
level.UpdateNotes(playbackTime);
PlayerInput input = new PlayerInput(); PlayerInput input = new PlayerInput();
input.time = playbackTime; input.time = playbackTime;
//get laser
var handObjects = player.GetComponent<Valve.VR.InteractionSystem.Player>().hands;
var leftHandObject = handObjects[0];
var rightHandObject = handObjects[1];
var leftLaser = leftHandObject.gameObject.GetComponentInChildren<LineRenderer>();
var rightLaser = rightHandObject.gameObject.GetComponentInChildren<LineRenderer>();
if(leftLaser)
{
var p1 = leftLaser.transform.TransformPoint(leftLaser.GetPosition(0));
var p2 = leftLaser.transform.TransformPoint(leftLaser.GetPosition(1));
input.ray = new Ray(p1, p2-p1);
Debug.DrawRay(input.ray.origin, input.ray.direction, Color.red);
}
level.UpdateNotes(playbackTime);
if (Input.GetKeyDown(KeyCode.Alpha1)) if (Input.GetKeyDown(KeyCode.Alpha1))
{ {
input.ray = Camera.main.ScreenPointToRay(Input.mousePosition); input.ray = Camera.main.ScreenPointToRay(Input.mousePosition);
...@@ -98,9 +117,32 @@ public class PlayEngine : SingletonBehaviour<PlayEngine> ...@@ -98,9 +117,32 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
if (fire.GetStateDown(leftHand)) if (fire.GetStateDown(leftHand))
{ {
input.hand = HandType.Left;
if (leftLaser)
{
var p1 = leftLaser.transform.TransformPoint(leftLaser.GetPosition(0));
var p2 = leftLaser.transform.TransformPoint(leftLaser.GetPosition(1));
input.ray = new Ray(p1, p2-p1);
Debug.DrawRay(input.ray.origin, input.ray.direction, Color.magenta, 1);
level.HandleInput(input);
}
} }
if (fire.GetStateDown(rightHand)) if (fire.GetStateDown(rightHand))
{ {
input.hand = HandType.Right;
if (rightLaser)
{
var p1 = rightLaser.transform.TransformPoint(rightLaser.GetPosition(0));
var p2 = rightLaser.transform.TransformPoint(rightLaser.GetPosition(1));
input.ray = new Ray(p1, p2 - p1);
Debug.DrawRay(input.ray.origin, input.ray.direction, Color.cyan, 1);
level.HandleInput(input);
}
} }
} }
catch (NullReferenceException e) catch (NullReferenceException e)
......
RhythmKata/Assets/SteamVR/InteractionSystem/Core/Prefabs/Player.prefab
View file @ 194f76df
...@@ -28,7 +28,7 @@ Transform: ...@@ -28,7 +28,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: 485514} m_Father: {fileID: 485514}
m_RootOrder: 2 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 135, y: 170, z: 90} m_LocalEulerAnglesHint: {x: 135, y: 170, z: 90}
--- !u!1 &101548 --- !u!1 &101548
GameObject: GameObject:
...@@ -673,7 +673,7 @@ Transform: ...@@ -673,7 +673,7 @@ Transform:
m_LocalScale: {x: 1.0099999, y: 1.01, z: 1.0099999} m_LocalScale: {x: 1.0099999, y: 1.01, z: 1.0099999}
m_Children: [] m_Children: []
m_Father: {fileID: 485514} m_Father: {fileID: 485514}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11405908 --- !u!114 &11405908
MonoBehaviour: MonoBehaviour:
...@@ -898,7 +898,6 @@ Transform: ...@@ -898,7 +898,6 @@ Transform:
m_LocalPosition: {x: -0.25, y: 1, z: 0} m_LocalPosition: {x: -0.25, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 3315847632698384166}
- {fileID: 4000012325712216} - {fileID: 4000012325712216}
- {fileID: 4000011474053580} - {fileID: 4000011474053580}
- {fileID: 451882} - {fileID: 451882}
...@@ -950,7 +949,7 @@ MonoBehaviour: ...@@ -950,7 +949,7 @@ MonoBehaviour:
noSteamVRFallbackCamera: {fileID: 0} noSteamVRFallbackCamera: {fileID: 0}
noSteamVRFallbackMaxDistanceNoItem: 10 noSteamVRFallbackMaxDistanceNoItem: 10
noSteamVRFallbackMaxDistanceWithItem: 0.5 noSteamVRFallbackMaxDistanceWithItem: 0.5
renderModelPrefab: {fileID: 1000011547835092, guid: d5082f7d9f947374197e0a97786f4e40, renderModelPrefab: {fileID: 4323607481689171280, guid: 558045d2a2630cf428328893396ef21c,
type: 3} type: 3}
renderModels: [] renderModels: []
mainRenderModel: {fileID: 0} mainRenderModel: {fileID: 0}
...@@ -1050,7 +1049,6 @@ Transform: ...@@ -1050,7 +1049,6 @@ Transform:
m_LocalPosition: {x: 0.25, y: 1, z: 0} m_LocalPosition: {x: 0.25, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 6035716701327093889}
- {fileID: 480432} - {fileID: 480432}
- {fileID: 490018} - {fileID: 490018}
- {fileID: 495400} - {fileID: 495400}
...@@ -1102,7 +1100,7 @@ MonoBehaviour: ...@@ -1102,7 +1100,7 @@ MonoBehaviour:
noSteamVRFallbackCamera: {fileID: 0} noSteamVRFallbackCamera: {fileID: 0}
noSteamVRFallbackMaxDistanceNoItem: 10 noSteamVRFallbackMaxDistanceNoItem: 10
noSteamVRFallbackMaxDistanceWithItem: 0.5 noSteamVRFallbackMaxDistanceWithItem: 0.5
renderModelPrefab: {fileID: 1000012617731570, guid: 837f93beb9a614743ae3a2c0ada7c388, renderModelPrefab: {fileID: 4323607481689171280, guid: 558045d2a2630cf428328893396ef21c,
type: 3} type: 3}
renderModels: [] renderModels: []
mainRenderModel: {fileID: 0} mainRenderModel: {fileID: 0}
...@@ -1200,7 +1198,7 @@ Transform: ...@@ -1200,7 +1198,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: 485514} m_Father: {fileID: 485514}
m_RootOrder: 1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &167242 --- !u!1 &167242
GameObject: GameObject:
...@@ -1231,7 +1229,7 @@ Transform: ...@@ -1231,7 +1229,7 @@ Transform:
m_LocalScale: {x: 1.0100001, y: 1.01, z: 1.0100001} m_LocalScale: {x: 1.0100001, y: 1.01, z: 1.0100001}
m_Children: [] m_Children: []
m_Father: {fileID: 476540} m_Father: {fileID: 476540}
m_RootOrder: 3 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11461284 --- !u!114 &11461284
MonoBehaviour: MonoBehaviour:
...@@ -1356,7 +1354,7 @@ Transform: ...@@ -1356,7 +1354,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: 485514} m_Father: {fileID: 485514}
m_RootOrder: 4 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11489144 --- !u!114 &11489144
MonoBehaviour: MonoBehaviour:
...@@ -1407,7 +1405,7 @@ Transform: ...@@ -1407,7 +1405,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: 476540} m_Father: {fileID: 476540}
m_RootOrder: 4 m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &11494192 --- !u!114 &11494192
MonoBehaviour: MonoBehaviour:
...@@ -2559,7 +2557,7 @@ Transform: ...@@ -2559,7 +2557,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: 476540} m_Father: {fileID: 476540}
m_RootOrder: 1 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1000013804283954 --- !u!1 &1000013804283954
GameObject: GameObject:
...@@ -2683,155 +2681,5 @@ Transform: ...@@ -2683,155 +2681,5 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 476540} m_Father: {fileID: 476540}
m_RootOrder: 2 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 135, y: -170, z: -90} m_LocalEulerAnglesHint: {x: 135, y: -170, z: -90}
--- !u!1001 &811755411450525903
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 485514}
m_Modifications:
- target: {fileID: 7988148489419422301, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_Name
value: gun
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.25
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalPosition.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 552978e18fd475d44a20b08bee06ddc0, type: 3}
--- !u!4 &6035716701327093889 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
m_PrefabInstance: {fileID: 811755411450525903}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8540094520710305640
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 476540}
m_Modifications:
- target: {fileID: 7988148489419422301, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_Name
value: gun
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.25
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalPosition.y
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 552978e18fd475d44a20b08bee06ddc0, type: 3}
--- !u!4 &3315847632698384166 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6377311900370995278, guid: 552978e18fd475d44a20b08bee06ddc0,
type: 3}
m_PrefabInstance: {fileID: 8540094520710305640}
m_PrefabAsset: {fileID: 0}
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