Skip to content

Commit

Permalink
complete
Browse files Browse the repository at this point in the history
  • Loading branch information
Lee-jongeun committed Sep 18, 2023
1 parent cee46e0 commit 7415249
Show file tree
Hide file tree
Showing 19 changed files with 129 additions and 307 deletions.
83 changes: 0 additions & 83 deletions Assets/Resources/Materials/KaleidoIcon_Material.mat

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Resources/Materials/KaleidoIcon_Material.mat.meta

This file was deleted.

8 changes: 4 additions & 4 deletions Assets/Resources/Meshes/GlassesCase_Mesh.asset

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/Resources/Meshes/GlassesCase_Mesh.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

167 changes: 0 additions & 167 deletions Assets/Resources/Meshes/KaleidoIconModel.asset

This file was deleted.

8 changes: 0 additions & 8 deletions Assets/Resources/Meshes/KaleidoIconModel.asset.meta

This file was deleted.

12 changes: 6 additions & 6 deletions Assets/Resources/Meshes/Letter_Mesh.asset
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ Mesh:
firstVertex: 0
vertexCount: 24
localAABB:
m_Center: {x: 0, y: -0.00000471808, z: 0.000008547271}
m_Extent: {x: 0.002, y: 0.0025, z: 0.0015}
m_Center: {x: 0, y: -0.00047180802, z: 0.00085472316}
m_Extent: {x: 0.2, y: 0.25, z: 0.15}
m_Shapes:
vertices: []
shapes: []
Expand Down Expand Up @@ -97,7 +97,7 @@ Mesh:
format: 0
dimension: 0
m_DataSize: 1152
_typelessdata: 6f1203bbe28723bbd97cc3ba00000000305703bf6ebd5b3f0000803f00000000000000000000803f00000000000000006f12033be28723bbd97cc3ba00000000305703bf6ebd5b3f0000803f00000000000000000000803f0000803f000000006f12033be287233bd97cc33a00000000305703bf6ebd5b3f0000803f00000000000000000000803f0000803f0000803f6f1203bbe287233bd97cc33a00000000305703bf6ebd5b3f0000803f00000000000000000000803f000000000000803f6f1203bb322624bb413fc1ba000000003057033f6ebd5bbf0000803f0000000000000000000080bf00000000000000006f1203bb91e9223b72bac53a000000003057033f6ebd5bbf0000803f0000000000000000000080bf000000000000803f6f12033b91e9223b72bac53a000000003057033f6ebd5bbf0000803f0000000000000000000080bf0000803f0000803f6f12033b322624bb413fc1ba000000003057033f6ebd5bbf0000803f0000000000000000000080bf0000803f000000006f12033be287233bd97cc33a00000000f91e60bfdf6ef7be0000803f0000000000000000000080bf0000803f0000803f6f12033b91e9223b72bac53a00000000f91e60bfdf6ef7be0000803f0000000000000000000080bf0000803f0000803f6f1203bb91e9223b72bac53a00000000f91e60bfdf6ef7be0000803f0000000000000000000080bf000000000000803f6f1203bbe287233bd97cc33a00000000f91e60bfdf6ef7be0000803f0000000000000000000080bf000000000000803f6f1203bbe28723bbd97cc3ba000000001d1f603f606ef73e0000803f0000000000000000000080bf00000000000000006f1203bb322624bb413fc1ba000000001d1f603f606ef73e0000803f0000000000000000000080bf00000000000000006f12033b322624bb413fc1ba000000001d1f603f606ef73e0000803f0000000000000000000080bf0000803f000000006f12033be28723bbd97cc3ba000000001d1f603f606ef73e0000803f0000000000000000000080bf0000803f000000006f12033be28723bbd97cc3ba000080bf000000005658dcb60000803f0000000000000000000080bf0000803f000000006f12033b322624bb413fc1ba000080bf000000005658dcb60000803f0000000000000000000080bf0000803f000000006f12033b91e9223b72bac53a000080bf000000005658dcb60000803f0000000000000000000080bf0000803f0000803f6f12033be287233bd97cc33a000080bf000000005658dcb60000803f0000000000000000000080bf0000803f0000803f6f1203bbe287233bd97cc33a0000803f000000005658dcb60000803f0000000000000000000080bf000000000000803f6f1203bb91e9223b72bac53a0000803f000000005658dcb60000803f0000000000000000000080bf000000000000803f6f1203bb322624bb413fc1ba0000803f000000005658dcb60000803f0000000000000000000080bf00000000000000006f1203bbe28723bbd97cc3ba0000803f000000005658dcb60000803f0000000000000000000080bf0000000000000000
_typelessdata: cdcc4cbe51847fbe8ab918be00000000305703bf6ebd5b3f0000803f00000000000000000000803f0000000000000000cdcc4c3e51847fbe8ab918be00000000305703bf6ebd5b3f0000803f00000000000000000000803f0000803f00000000cdcc4c3e51847f3e8ab9183e00000000305703bf6ebd5b3f0000803f00000000000000000000803f0000803f0000803fcdcc4cbe51847f3e8ab9183e00000000305703bf6ebd5b3f0000803f00000000000000000000803f000000000000803fcdcc4cbed73d80be6bf916be000000003057033f6ebd5bbf0000803f0000000000000000000080bf0000000000000000cdcc4cbef38c7e3ea9791a3e000000003057033f6ebd5bbf0000803f0000000000000000000080bf000000000000803fcdcc4c3ef38c7e3ea9791a3e000000003057033f6ebd5bbf0000803f0000000000000000000080bf0000803f0000803fcdcc4c3ed73d80be6bf916be000000003057033f6ebd5bbf0000803f0000000000000000000080bf0000803f00000000cdcc4c3e51847f3e8ab9183e00000000f81e60bfe06ef7be0000803f0000000000000000000080bf0000803f0000803fcdcc4c3ef38c7e3ea9791a3e00000000f81e60bfe06ef7be0000803f0000000000000000000080bf0000803f0000803fcdcc4cbef38c7e3ea9791a3e00000000f81e60bfe06ef7be0000803f0000000000000000000080bf000000000000803fcdcc4cbe51847f3e8ab9183e00000000f81e60bfe06ef7be0000803f0000000000000000000080bf000000000000803fcdcc4cbe51847fbe8ab918be000000001d1f603f606ef73e0000803f0000000000000000000080bf0000000000000000cdcc4cbed73d80be6bf916be000000001d1f603f606ef73e0000803f0000000000000000000080bf0000000000000000cdcc4c3ed73d80be6bf916be000000001d1f603f606ef73e0000803f0000000000000000000080bf0000803f00000000cdcc4c3e51847fbe8ab918be000000001d1f603f606ef73e0000803f0000000000000000000080bf0000803f00000000cdcc4c3e51847fbe8ab918be000080bf00000000000000000000803f0000000000000000000080bf0000803f00000000cdcc4c3ed73d80be6bf916be000080bf00000000000000000000803f0000000000000000000080bf0000803f00000000cdcc4c3ef38c7e3ea9791a3e000080bf00000000000000000000803f0000000000000000000080bf0000803f0000803fcdcc4c3e51847f3e8ab9183e000080bf00000000000000000000803f0000000000000000000080bf0000803f0000803fcdcc4cbe51847f3e8ab9183e0000803f00000000000000000000803f0000000000000000000080bf000000000000803fcdcc4cbef38c7e3ea9791a3e0000803f00000000000000000000803f0000000000000000000080bf000000000000803fcdcc4cbed73d80be6bf916be0000803f00000000000000000000803f0000000000000000000080bf0000000000000000cdcc4cbe51847fbe8ab918be0000803f00000000000000000000803f0000000000000000000080bf0000000000000000
m_CompressedMesh:
m_Vertices:
m_NumItems: 0
Expand Down Expand Up @@ -151,13 +151,13 @@ Mesh:
m_BitSize: 0
m_UVInfo: 0
m_LocalAABB:
m_Center: {x: 0, y: -0.00000471808, z: 0.000008547271}
m_Extent: {x: 0.002, y: 0.0025, z: 0.0015}
m_Center: {x: 0, y: -0.00047180802, z: 0.00085472316}
m_Extent: {x: 0.2, y: 0.25, z: 0.15}
m_MeshUsageFlags: 0
m_CookingOptions: 30
m_BakedConvexCollisionMesh:
m_BakedTriangleCollisionMesh:
m_MeshMetrics[0]: 1
m_MeshMetrics[0]: 0.23256296
m_MeshMetrics[1]: 1
m_MeshOptimizationFlags: -1
m_StreamData:
Expand Down
2 changes: 1 addition & 1 deletion Assets/Resources/Meshes/Letter_Mesh.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 6 additions & 6 deletions Assets/Resources/Meshes/MediBottle_Mesh.asset

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/Resources/Meshes/MediBottle_Mesh.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 9 additions & 9 deletions Assets/Resources/Meshes/RubberGlove_Mesh.asset

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/Resources/Meshes/RubberGlove_Mesh.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions Assets/Resources/Meshes/Syringe_Mesh.asset

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion Assets/Resources/Meshes/Syringe_Mesh.asset.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Assets/Resources/Prefabs/RenderTextureCamera.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ Camera:
m_GameObject: {fileID: 8090065090188810480}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 4
m_ClearFlags: 3
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
Expand Down
83 changes: 83 additions & 0 deletions Assets/Scenes/StartScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,89 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &405036844
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 405036847}
- component: {fileID: 405036846}
- component: {fileID: 405036845}
m_Layer: 0
m_Name: GameObject
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!23 &405036845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 405036844}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 2100000, guid: 948e176e11f6e2b4d83d062c330b3333, 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_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &405036846
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 405036844}
m_Mesh: {fileID: 4300000, guid: ef2e6e48459fd4a4ab9c0dd224840d55, type: 2}
--- !u!4 &405036847
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 405036844}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.21426742, y: 0.3656631, z: 0.27061126}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &603924102
GameObject:
m_ObjectHideFlags: 0
Expand Down
1 change: 0 additions & 1 deletion Assets/Scripts/Ingame/AREvidenceHolder.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,6 @@ public void TouchControlEvidence()
{
if (isNowSwiping)
{
Debug.Log("Swiping!");
Vector3 deltaPos = inputTouch.deltaPosition;
Vector3 rotationAxis = mainCamera.transform.right * deltaPos.y - mainCamera.transform.up * deltaPos.x;
HoldingEvidence.transform.Rotate(rotationAxis, Space.World);
Expand Down
2 changes: 1 addition & 1 deletion Assets/Scripts/Ingame/FilenameLoader.cs
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ public FilenameLoader()
{ "단속봉", "진행요원들이 몰려드는 인파를 통제하기 위해 지급 받은 단속봉입니다. 일반적으로 지급되는 것보다 크고 무거워 흉기로 사용할 수 있을 것 같습니다." },
{ "메스", "용의자들이 어렵지 않게 입수할 수 있는 날붙이입니다. 살아 있는 사람을 이 물건으로 해부하는 상상은 무섭지만, 가능성을 배제할 수는 없습니다." },
{ "송곳", "다양한 목적을 위해 배치된 평범한 송곳입니다. 흔한 물건이라고 살상력이 떨어지진 않습니다." },
{ "원형 전기톱", "주로 석고 깁스를 자르는 용도로 사용하는 전기톱입니다. 대부분의 경우 매우 안전하지만, 악의를 지닌 사람의 손에 들렸을 때에는 그렇지 않습니다." },
{ "", "주로 석고 깁스를 자르는 용도로 사용하는 전기톱입니다. 대부분의 경우 매우 안전하지만, 악의를 지닌 사람의 손에 들렸을 때에는 그렇지 않습니다." },
{ "양날칼", "외과 수술에서 주로 뼈와 주변 조직을 자를 때 쓰는 도구입니다. 본래 보관 장소가 아닌 바깥에 배치되어 있던 사실을 확인했습니다." },
{ "주사기", "간호 작업 중에 유실된 주사기입니다. 이런 주사기가 있다면 병원 내에 흔히 존재하는 각종 독극물을 잠든 누군가에게 주사할 수 있을 것입니다." },
{ "포르말린", "해부 실습실에서 사용하는 방부제 겸 소독제입니다. 매우 독한 냄새를 풍기며, 인체에 매우 치명적입니다." },
Expand Down
8 changes: 7 additions & 1 deletion ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,13 @@ PlayerSettings:
vulkanEnableCommandBufferRecycling: 1
loadStoreDebugModeEnabled: 0
bundleVersion: 0.9
preloadedAssets: []
preloadedAssets:
- {fileID: 11400000, guid: 1eb95d77acb39444e8cf44313496a874, type: 2}
- {fileID: -906990648198499217, guid: 58f40b12bbc864f3c96c6505a9a1e1e3, type: 2}
- {fileID: 11400000, guid: 2b359b089f450924f8d3896497ad918c, type: 2}
- {fileID: 6518821882106802215, guid: 6bb381a8ba31f114d9724357633b4625, type: 2}
- {fileID: 4800000, guid: e7c77f6eaab324a819efdc13b8125a39, type: 3}
- {fileID: 4800000, guid: 6743a50a812740be8c0aa3fccc46fae9, type: 3}
metroInputSource: 0
wsaTransparentSwapchain: 0
m_HolographicPauseOnTrackingLoss: 1
Expand Down

0 comments on commit 7415249

Please sign in to comment.