머지

RhythmKata/Assets/Prefabs/DefaultNote.prefab

@@ -121,7 +121,7 @@ Transform:
   m_GameObject: {fileID: 8354046899824507571}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 10}
-  m_LocalScale: {x: 10, y: 10, z: 10}
+  m_LocalScale: {x: 15, y: 15, z: 15}
   m_Children:
   - {fileID: 2824711142497691445}
   m_Father: {fileID: 0}

RhythmKata/Assets/Prefabs/Ring.prefab

@@ -35,7 +35,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 6.6, y: 6.6}
+  m_SizeDelta: {x: 9.9, y: 9.9}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8100479809720507870
 CanvasRenderer:

RhythmKata/Assets/Resources/SFX/SFX Project/sfx Project/Samples/Recorded.meta

+fileFormatVersion: 2
+guid: d9a533cec04e2124e9c31541b4f63e72
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

RhythmKata/Assets/Scenes/mergescene.unity

@@ -1279,84 +1279,6 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &911070631
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 911070634}
-  - component: {fileID: 911070633}
-  - component: {fileID: 911070632}
-  m_Layer: 0
-  m_Name: Stage Bottom
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!23 &911070632
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 911070631}
-  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: abd8ab022744118478ca452fd7495d16, 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
---- !u!33 &911070633
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 911070631}
-  m_Mesh: {fileID: 6827258281919849101, guid: a3c5b3100cd73a44c83544a242c61596, type: 3}
---- !u!4 &911070634
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 911070631}
-  m_LocalRotation: {x: -0.5, y: -0.5, z: -0.5, w: 0.5}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 500, y: 500, z: 500}
-  m_Children: []
-  m_Father: {fileID: 0}
-  m_RootOrder: 5
-  m_LocalEulerAnglesHint: {x: -90, y: -90, z: 0}
 --- !u!1 &912178581
 GameObject:
   m_ObjectHideFlags: 0
@@ -1646,7 +1568,7 @@ Transform:
   - {fileID: 12416112}
   - {fileID: 70244438}
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1113431734
 GameObject:
@@ -2034,7 +1956,10 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: cb855524a23a32a43a730dbccc41c251, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  levelList: {fileID: 11400000, guid: 8aef72256133e3c479e5255c254cf80e, type: 2}
+  levelList:
+  - {fileID: 11400000, guid: ccbc7c89d2b01a9469123e252cc2ecd6, type: 2}
+  - {fileID: 0}
+  - {fileID: 0}
   ForwardNoteObject: {fileID: 8354046899824507576, guid: a13dadc44404fcd4f8cfb986339b1507,
     type: 3}
   EdgeNoteObjects:
@@ -2050,7 +1975,7 @@ MonoBehaviour:
   gunSfx: {fileID: 8300000, guid: 7eb98e62c3fbe5344aa72ecad87ce5cc, type: 3}
   explosion: {fileID: 0}
   fire:
-    actionPath: 
+    actionPath: /actions/default/in/GrabPinch
     needsReinit: 0
   leftHand: 1
   rightHand: 2
@@ -2142,6 +2067,16 @@ PrefabInstance:
       propertyPath: m_Materials.Array.data[0]
       value: 
       objectReference: {fileID: 2100000, guid: 1c2c060529a24f64a85c9b7dd58bed12, type: 2}
+    - target: {fileID: 6056639706327950656, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
+        type: 3}
+      propertyPath: m_ReceiveShadows
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6056639706327950656, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
+        type: 3}
+      propertyPath: m_DynamicOccludee
+      value: 1
+      objectReference: {fileID: 0}
     - target: {fileID: 875452231674394315, guid: 2c9c1e84d44b6f04e9fb51294090c1b2,
         type: 3}
       propertyPath: m_Materials.Array.data[0]