Commit 55eaf7fa authored by 15박보승's avatar 15박보승

EdgeNote 구현, ForwardNoteObject 개선

parent 8e51f31e
...@@ -8,9 +8,9 @@ Material: ...@@ -8,9 +8,9 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: DefaultNote m_Name: DefaultNote
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: m_ShaderKeywords: _EMISSION _SPECULARHIGHLIGHTS_OFF
m_LightmapFlags: 4 m_LightmapFlags: 1
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
...@@ -76,14 +76,14 @@ Material: ...@@ -76,14 +76,14 @@ Material:
- _DstBlend: 0 - _DstBlend: 0
- _EnableExternalAlpha: 0 - _EnableExternalAlpha: 0
- _GlossMapScale: 1 - _GlossMapScale: 1
- _Glossiness: 0.5 - _Glossiness: 0
- _GlossyReflections: 1 - _GlossyReflections: 1
- _Metallic: 0 - _Metallic: 1
- _Mode: 0 - _Mode: 0
- _OcclusionStrength: 1 - _OcclusionStrength: 1
- _Parallax: 0.02 - _Parallax: 0.02
- _SmoothnessTextureChannel: 0 - _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 0
- _SrcBlend: 1 - _SrcBlend: 1
- _Stencil: 0 - _Stencil: 0
- _StencilComp: 8 - _StencilComp: 8
...@@ -95,7 +95,7 @@ Material: ...@@ -95,7 +95,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
...@@ -8,9 +8,9 @@ Material: ...@@ -8,9 +8,9 @@ Material:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: EdgeNote m_Name: EdgeNote
m_Shader: {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: m_ShaderKeywords: _EMISSION
m_LightmapFlags: 4 m_LightmapFlags: 1
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
...@@ -94,8 +94,8 @@ Material: ...@@ -94,8 +94,8 @@ Material:
- _UseUIAlphaClip: 0 - _UseUIAlphaClip: 0
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 1, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 1, g: 1, b: 0, a: 1}
- _Flip: {r: 1, g: 1, b: 1, a: 1} - _Flip: {r: 1, g: 1, b: 1, a: 1}
- _RendererColor: {r: 1, g: 1, b: 1, a: 1} - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
...@@ -42,8 +42,8 @@ Light: ...@@ -42,8 +42,8 @@ Light:
serializedVersion: 9 serializedVersion: 9
m_Type: 2 m_Type: 2
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 0.18 m_Intensity: 1
m_Range: 10 m_Range: 1
m_SpotAngle: 30 m_SpotAngle: 30
m_InnerSpotAngle: 21.80208 m_InnerSpotAngle: 21.80208
m_CookieSize: 10 m_CookieSize: 10
......
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4640709078173886784
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4640709078173886796}
- component: {fileID: 4640709078173886787}
- component: {fileID: 4640709078173886786}
- component: {fileID: 4640709078173886785}
- component: {fileID: 4640709078173886797}
m_Layer: 0
m_Name: EdgeNote_Down
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4640709078173886796
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4640709078173886784}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: -3, z: 50}
m_LocalScale: {x: 1, y: 10, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!33 &4640709078173886787
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4640709078173886784}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &4640709078173886786
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4640709078173886784}
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: c14b6a54d1736a94b94ac379f0cc3f76, 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!65 &4640709078173886785
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4640709078173886784}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4640709078173886797
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4640709078173886784}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d22c6dafddad8240b23e0f8364a5fd2, type: 3}
m_Name:
m_EditorClassIdentifier:
endPoint: {x: 0, y: -3, z: 0}
maxRemainedTime: 3
perfectZ: 0
fileFormatVersion: 2
guid: 578b592ddecefcb40961f3c98b2c3df7
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4734231541000158423
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4734231541000158427}
- component: {fileID: 4734231541000158424}
- component: {fileID: 4734231541000158425}
- component: {fileID: 4734231541000158422}
- component: {fileID: 4734231541000158426}
m_Layer: 0
m_Name: EdgeNote_Left
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4734231541000158427
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4734231541000158423}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5, y: 0, z: 50}
m_LocalScale: {x: 1, y: 7, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &4734231541000158424
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4734231541000158423}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &4734231541000158425
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4734231541000158423}
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: c14b6a54d1736a94b94ac379f0cc3f76, 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!65 &4734231541000158422
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4734231541000158423}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4734231541000158426
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4734231541000158423}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d22c6dafddad8240b23e0f8364a5fd2, type: 3}
m_Name:
m_EditorClassIdentifier:
endPoint: {x: -5, y: 0, z: 0}
maxRemainedTime: 3
perfectZ: 0
fileFormatVersion: 2
guid: 416e07754d262cc4d87d8a3525a57b3f
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1476454008853626150
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1476454008853626154}
- component: {fileID: 1476454008853626155}
- component: {fileID: 1476454008853626152}
- component: {fileID: 1476454008853626153}
- component: {fileID: 1476454008853626157}
m_Layer: 0
m_Name: EdgeNote_Right
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1476454008853626154
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1476454008853626150}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5, y: 0, z: 50}
m_LocalScale: {x: 1, y: 7, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1476454008853626155
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1476454008853626150}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1476454008853626152
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1476454008853626150}
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: c14b6a54d1736a94b94ac379f0cc3f76, 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!65 &1476454008853626153
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1476454008853626150}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &1476454008853626157
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1476454008853626150}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d22c6dafddad8240b23e0f8364a5fd2, type: 3}
m_Name:
m_EditorClassIdentifier:
endPoint: {x: 5, y: 0, z: 0}
maxRemainedTime: 3
perfectZ: 0
fileFormatVersion: 2
guid: e0e69648f23437c4394a4c865b081a3c
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &4081910931583206819
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4081910931583206815}
- component: {fileID: 4081910931583206814}
- component: {fileID: 4081910931583206817}
- component: {fileID: 4081910931583206816}
- component: {fileID: 4081910931583206812}
m_Layer: 0
m_Name: EdgeNote_Up
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4081910931583206815
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4081910931583206819}
m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 0, y: 3, z: 50}
m_LocalScale: {x: 1, y: 10, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
--- !u!33 &4081910931583206814
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4081910931583206819}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &4081910931583206817
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4081910931583206819}
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: c14b6a54d1736a94b94ac379f0cc3f76, 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!65 &4081910931583206816
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4081910931583206819}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &4081910931583206812
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4081910931583206819}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9d22c6dafddad8240b23e0f8364a5fd2, type: 3}
m_Name:
m_EditorClassIdentifier:
endPoint: {x: 0, y: 3, z: 0}
maxRemainedTime: 3
perfectZ: 0
fileFormatVersion: 2
guid: f6a8ec676165ce1479337b2502af3a33
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -57,7 +57,7 @@ MonoBehaviour: ...@@ -57,7 +57,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_Material: {fileID: 2100000, guid: e5126cfe2f1b13144a54b88b7c55be50, type: 2} m_Material: {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1 m_RaycastTarget: 1
m_OnCullStateChanged: m_OnCullStateChanged:
...@@ -65,7 +65,7 @@ MonoBehaviour: ...@@ -65,7 +65,7 @@ MonoBehaviour:
m_Calls: [] m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_Sprite: {fileID: 21300000, guid: ed5e85d6ad7b15842ae3af65f11a4b90, type: 3} m_Sprite: {fileID: 21300000, guid: ae0c369a6a7be174bb342026fa602942, type: 3}
m_Type: 0 m_Type: 0
m_PreserveAspect: 0 m_PreserveAspect: 0
m_FillCenter: 1 m_FillCenter: 1
......
...@@ -20,8 +20,8 @@ ...@@ -20,8 +20,8 @@
#00001:01 #00001:01
#00111:55 #00113:E1
#00112:Q5 #00114:E3
#00312:SS #00312:SS
...@@ -60,8 +60,8 @@ ...@@ -60,8 +60,8 @@
#01611:00FF0000 #01611:00FF0000
#01612:000000FF #01612:000000FF
#01711:XF #01713:E0
#01712:4F #01714:E2
...@@ -75,8 +75,10 @@ ...@@ -75,8 +75,10 @@
#02311:1T1T #02311:1T1T
#02312:001T001T #02312:001T001T
#02411:1T00001T00001T00001T00001T000000 #02411:0000003F
#02412:1T00001T00001T00001T00001T000000 #02412:000000XF
#02413:E00000E20000E10000E3000000000000
#02414:E20000E00000E30000E1000000000000
#02511:1T00001T #02511:1T00001T
#02512:001T0000 #02512:001T0000
......
This diff is collapsed.
This diff is collapsed.
...@@ -52,14 +52,16 @@ abstract class Note ...@@ -52,14 +52,16 @@ abstract class Note
note = new ForwardNote(); note = new ForwardNote();
handType = HandType.Right; handType = HandType.Right;
break; break;
//case "13": // 1p third lane: REAR LEFT HAND case "13": // 1p third lane: REAR LEFT HAND
// handType = HandType.Left; note = new EdgeNote();
handType = HandType.Left;
// break; break;
//case "14": // 1p forth lane: REAR RIGHT HAND case "14": // 1p forth lane: REAR RIGHT HAND
// handType = HandType.Right; note = new EdgeNote();
handType = HandType.Right;
// break; break;
//case "15": // 1p fifth lane: EDGE LEFT HAND //case "15": // 1p fifth lane: EDGE LEFT HAND
// handType = HandType.Left; // handType = HandType.Left;
...@@ -134,14 +136,37 @@ class RearNote : Note ...@@ -134,14 +136,37 @@ class RearNote : Note
class EdgeNote : Note class EdgeNote : Note
{ {
private int index;
protected override NoteObject CreateNoteObjectImpl() protected override NoteObject CreateNoteObjectImpl()
{ {
throw new NotImplementedException(); var obj = MonoBehaviour.Instantiate<EdgeNoteObject>(PlayEngine.inst.EdgeNoteObjects[index]);
obj.Init(HandType);
return obj;
} }
protected override void FromBmsNum(string num) protected override void FromBmsNum(string num)
{ {
throw new NotImplementedException(); index = charToIndex(num);
}
private int charToIndex(string hex)
{
if (hex[0] != 'E')
{
throw new ArgumentException("wrong data");
}
if (char.IsDigit(hex[1]))
{
return hex[1] - '0';
}
throw new ArgumentException("wrong data");
}
private int GetPrefabIndex()
{
return 1;
} }
} }
......
...@@ -5,9 +5,20 @@ using UnityEngine; ...@@ -5,9 +5,20 @@ using UnityEngine;
public class EdgeNoteObject : NoteObject public class EdgeNoteObject : NoteObject
{ {
Vector2 direction; Vector2 direction;
public void Init(float x, float y) public void Init(HandType hand)
{ {
direction = new Vector2(x, y); Material mat = GetComponent<Renderer>().material;
switch(hand)
{
case HandType.Left:
mat.color = Color.magenta;
mat.SetColor("_EmissionColor", Color.magenta);
break;
case HandType.Right:
mat.color = Color.cyan;
mat.SetColor("_EmissionColor", Color.cyan);
break;
}
} }
public override void NoteHit(NoteHitType type) public override void NoteHit(NoteHitType type)
...@@ -16,6 +27,6 @@ public class EdgeNoteObject : NoteObject ...@@ -16,6 +27,6 @@ public class EdgeNoteObject : NoteObject
public override void SetPosition(float remainedTime) public override void SetPosition(float remainedTime)
{ {
transform.position = (endPoint + new Vector3(0, 0, 200)) * remainedTime / maxRemainedTime; transform.position = Vector3.Lerp(endPoint, endPoint + new Vector3(0, 0, 200), remainedTime / maxRemainedTime);
} }
} }
\ No newline at end of file
using System.Collections; using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.UI;
public class ForwardNoteObject : NoteObject public class ForwardNoteObject : NoteObject
{ {
public RectTransform ring; public RectTransform ring;
...@@ -13,10 +13,9 @@ public class ForwardNoteObject : NoteObject ...@@ -13,10 +13,9 @@ public class ForwardNoteObject : NoteObject
// //
perfectZ = IngameUIManager.inst.transform.position.z; perfectZ = IngameUIManager.inst.transform.position.z;
Ray ray = Camera.main.ScreenPointToRay(new Vector3(Screen.width * x, Screen.height * y, Camera.main.nearClipPlane)); 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(endPoint.x, endPoint.y, perfectZ);
Debug.Log(endPoint);
transform.position = endPoint + new Vector3(0, 0, 50); transform.position = endPoint + new Vector3(0, 0, 50);
ring = IngameUIManager.inst.AddNoteRingUI(); ring = IngameUIManager.inst.AddNoteRingUI();
...@@ -27,10 +26,16 @@ public class ForwardNoteObject : NoteObject ...@@ -27,10 +26,16 @@ public class ForwardNoteObject : NoteObject
switch (handType) switch (handType)
{ {
case HandType.Left: case HandType.Left:
mat.SetColor("_EmissionColor", Color.red);
mat.color = Color.red; mat.color = Color.red;
GetComponentInChildren<Light>().color = Color.red;
ring.GetComponent<Image>().color = Color.red;
break; break;
case HandType.Right: case HandType.Right:
mat.SetColor("_EmissionColor", Color.blue);
mat.color = Color.blue; mat.color = Color.blue;
GetComponentInChildren<Light>().color = Color.blue;
ring.GetComponent<Image>().color = Color.blue;
break; break;
......
...@@ -7,6 +7,7 @@ public class PlayEngine : SingletonBehaviour<PlayEngine> ...@@ -7,6 +7,7 @@ public class PlayEngine : SingletonBehaviour<PlayEngine>
{ {
public LevelListscriptableObject levelList; public LevelListscriptableObject levelList;
public ForwardNoteObject ForwardNoteObject; public ForwardNoteObject ForwardNoteObject;
public EdgeNoteObject[] EdgeNoteObjects = new EdgeNoteObject[4];
private double startTime; private double startTime;
private Level level; private Level level;
......
RhythmKata/Assets/ring.png

28.5 KB | W: | H:

RhythmKata/Assets/ring.png

83 KB | W: | H:

RhythmKata/Assets/ring.png
RhythmKata/Assets/ring.png
RhythmKata/Assets/ring.png
RhythmKata/Assets/ring.png
  • 2-up
  • Swipe
  • Onion skin
fileFormatVersion: 2 fileFormatVersion: 2
guid: ed5e85d6ad7b15842ae3af65f11a4b90 guid: ae0c369a6a7be174bb342026fa602942
TextureImporter: TextureImporter:
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
......
...@@ -4,7 +4,10 @@ ...@@ -4,7 +4,10 @@
EditorBuildSettings: EditorBuildSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 2 serializedVersion: 2
m_Scenes: [] m_Scenes:
- enabled: 1
path: Assets/Scenes/mergescene.unity
guid: 557cfd2a8af176848908c5130bb83f27
m_configObjects: m_configObjects:
com.unity.input.settings: {fileID: 11400000, guid: 7d275036f0cb1e544ab7351089d34050, com.unity.input.settings: {fileID: 11400000, guid: 7d275036f0cb1e544ab7351089d34050,
type: 2} type: 2}
...@@ -35,6 +35,9 @@ GraphicsSettings: ...@@ -35,6 +35,9 @@ GraphicsSettings:
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: [] m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000, m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0} type: 0}
......
...@@ -121,7 +121,8 @@ PlayerSettings: ...@@ -121,7 +121,8 @@ PlayerSettings:
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 0.1 bundleVersion: 0.1
preloadedAssets: [] preloadedAssets:
- {fileID: 11400000, guid: 7d275036f0cb1e544ab7351089d34050, type: 2}
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1 m_HolographicPauseOnTrackingLoss: 1
......
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
UnityConnectSettings: UnityConnectSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
serializedVersion: 1 serializedVersion: 1
m_Enabled: 0 m_Enabled: 1
m_TestMode: 0 m_TestMode: 0
m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_EventUrl: https://cdp.cloud.unity3d.com/v1/events m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
......
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