Commit 7ed14ee0 authored by 15박보승's avatar 15박보승

첫번째 중간발표 버전

parent 55eaf7fa
......@@ -376,7 +376,7 @@ RectTransform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 554573582}
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: 20}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
......@@ -402,7 +402,13 @@ MonoBehaviour:
ringUIPrefab: {fileID: 8100479809720507869, guid: 13fc3a8405d796e4e87e099e870cc446,
type: 3}
hitEffectPrefabs: []
--- !u!1 &615417178
--- !u!4 &571765379 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 447954, guid: dc06161b6d97feb419f45f03b62e14b9,
type: 3}
m_PrefabInstance: {fileID: 1988354649}
m_PrefabAsset: {fileID: 0}
--- !u!1 &941293480
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
......@@ -410,78 +416,26 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 615417181}
- component: {fileID: 615417180}
- component: {fileID: 615417179}
- component: {fileID: 941293481}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &615417179
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 615417178}
m_Enabled: 1
--- !u!20 &615417180
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 615417178}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &615417181
--- !u!4 &941293481
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 615417178}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
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: []
m_Children:
- {fileID: 571765379}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
......@@ -725,6 +679,63 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!1001 &1988354649
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: 1
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}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: dc06161b6d97feb419f45f03b62e14b9, type: 3}
--- !u!1 &2112533737 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 183d1d3e655e0294c8f38c5b687642a8,
......
......@@ -13,9 +13,10 @@ public class ForwardNoteObject : NoteObject
//
perfectZ = IngameUIManager.inst.transform.position.z;
Ray ray = Camera.main.ScreenPointToRay(new Vector3(Screen.width * x, Screen.height * y, 0));
endPoint = ray.GetPoint(perfectZ);
endPoint = new Vector3(endPoint.x, endPoint.y, perfectZ);
//Ray ray = Camera.main.ScreenPointToRay(new Vector3(Screen.width * x, Screen.height * y, 0));
//endPoint = ray.GetPoint(perfectZ);
endPoint = new Vector3(-7.5f + 15 * x, -7.5f + 15 * y, perfectZ);
transform.position = endPoint + new Vector3(0, 0, 50);
ring = IngameUIManager.inst.AddNoteRingUI();
......@@ -26,16 +27,16 @@ public class ForwardNoteObject : NoteObject
switch (handType)
{
case HandType.Left:
mat.SetColor("_EmissionColor", Color.red);
mat.color = Color.red;
GetComponentInChildren<Light>().color = Color.red;
ring.GetComponent<Image>().color = Color.red;
mat.SetColor("_EmissionColor", Color.magenta);
mat.color = Color.magenta;
GetComponentInChildren<Light>().color = Color.magenta;
ring.GetComponent<Image>().color = Color.magenta;
break;
case HandType.Right:
mat.SetColor("_EmissionColor", Color.blue);
mat.color = Color.blue;
GetComponentInChildren<Light>().color = Color.blue;
ring.GetComponent<Image>().color = Color.blue;
mat.SetColor("_EmissionColor", Color.cyan);
mat.color = Color.cyan;
GetComponentInChildren<Light>().color = Color.cyan;
ring.GetComponent<Image>().color = Color.cyan;
break;
......
......@@ -5,7 +5,7 @@
"app_key": "application.generated.unity.rhythmkata.exe",
"launch_type": "url",
"url": "steam://launch/",
"action_manifest_path": "D:\\git\\RhythmKata\\RhythmKata\\Assets\\StreamingAssets\\SteamVR\\actions.json",
"action_manifest_path": "D:\\Git\\rhythmkata\\RhythmKata\\Assets\\StreamingAssets\\SteamVR\\actions.json",
"strings": {
"en_us": {
"name": "RhythmKata [Testing]"
......
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