2020-1-capstone-design1 / LSK_Project1

Go to a project
Toggle navigation Toggle navigation pinning
이상윤
42f7862f 2 parents 0e0d9d56 94fc5aed

Merge branch 'master' of http://khuhub.khu.ac.kr/2020-1-capstone-design1/LSK_Project1

Inline Side-by-side
Showing 8 changed files with 522 additions and 2 deletions
1 +fileFormatVersion: 2
2 +guid: 76fb87de9e80d3b45848ea48f70094cf
3 +TextureImporter:
4 + internalIDToNameTable: []
5 + externalObjects: {}
6 + serializedVersion: 11
7 + mipmaps:
8 + mipMapMode: 0
9 + enableMipMap: 1
10 + sRGBTexture: 1
11 + linearTexture: 0
12 + fadeOut: 0
13 + borderMipMap: 0
14 + mipMapsPreserveCoverage: 0
15 + alphaTestReferenceValue: 0.5
16 + mipMapFadeDistanceStart: 1
17 + mipMapFadeDistanceEnd: 3
18 + bumpmap:
19 + convertToNormalMap: 0
20 + externalNormalMap: 0
21 + heightScale: 0.25
22 + normalMapFilter: 0
23 + isReadable: 0
24 + streamingMipmaps: 0
25 + streamingMipmapsPriority: 0
26 + grayScaleToAlpha: 0
27 + generateCubemap: 6
28 + cubemapConvolution: 0
29 + seamlessCubemap: 0
30 + textureFormat: 1
31 + maxTextureSize: 2048
32 + textureSettings:
33 + serializedVersion: 2
34 + filterMode: -1
35 + aniso: -1
36 + mipBias: -100
37 + wrapU: -1
38 + wrapV: -1
39 + wrapW: -1
40 + nPOTScale: 1
41 + lightmap: 0
42 + compressionQuality: 50
43 + spriteMode: 0
44 + spriteExtrude: 1
45 + spriteMeshType: 1
46 + alignment: 0
47 + spritePivot: {x: 0.5, y: 0.5}
48 + spritePixelsToUnits: 100
49 + spriteBorder: {x: 0, y: 0, z: 0, w: 0}
50 + spriteGenerateFallbackPhysicsShape: 1
51 + alphaUsage: 1
52 + alphaIsTransparency: 0
53 + spriteTessellationDetail: -1
54 + textureType: 0
55 + textureShape: 1
56 + singleChannelComponent: 0
57 + maxTextureSizeSet: 0
58 + compressionQualitySet: 0
59 + textureFormatSet: 0
60 + applyGammaDecoding: 0
61 + platformSettings:
62 + - serializedVersion: 3
63 + buildTarget: DefaultTexturePlatform
64 + maxTextureSize: 2048
65 + resizeAlgorithm: 0
66 + textureFormat: -1
67 + textureCompression: 1
68 + compressionQuality: 50
69 + crunchedCompression: 0
70 + allowsAlphaSplitting: 0
71 + overridden: 0
72 + androidETC2FallbackOverride: 0
73 + forceMaximumCompressionQuality_BC6H_BC7: 0
74 + spriteSheet:
75 + serializedVersion: 2
76 + sprites: []
77 + outline: []
78 + physicsShape: []
79 + bones: []
80 + spriteID:
81 + internalID: 0
82 + vertices: []
83 + indices:
84 + edges: []
85 + weights: []
86 + secondaryTextures: []
87 + spritePackingTag:
88 + pSDRemoveMatte: 0
89 + pSDShowRemoveMatteOption: 0
90 + userData:
91 + assetBundleName:
92 + assetBundleVariant:
1 +fileFormatVersion: 2
2 +guid: 87f0ae4176851f4458480c9ddaf590bb
3 +TextureImporter:
4 + internalIDToNameTable: []
5 + externalObjects: {}
6 + serializedVersion: 11
7 + mipmaps:
8 + mipMapMode: 0
9 + enableMipMap: 1
10 + sRGBTexture: 1
11 + linearTexture: 0
12 + fadeOut: 0
13 + borderMipMap: 0
14 + mipMapsPreserveCoverage: 0
15 + alphaTestReferenceValue: 0.5
16 + mipMapFadeDistanceStart: 1
17 + mipMapFadeDistanceEnd: 3
18 + bumpmap:
19 + convertToNormalMap: 0
20 + externalNormalMap: 0
21 + heightScale: 0.25
22 + normalMapFilter: 0
23 + isReadable: 0
24 + streamingMipmaps: 0
25 + streamingMipmapsPriority: 0
26 + grayScaleToAlpha: 0
27 + generateCubemap: 6
28 + cubemapConvolution: 0
29 + seamlessCubemap: 0
30 + textureFormat: 1
31 + maxTextureSize: 2048
32 + textureSettings:
33 + serializedVersion: 2
34 + filterMode: -1
35 + aniso: -1
36 + mipBias: -100
37 + wrapU: -1
38 + wrapV: -1
39 + wrapW: -1
40 + nPOTScale: 1
41 + lightmap: 0
42 + compressionQuality: 50
43 + spriteMode: 0
44 + spriteExtrude: 1
45 + spriteMeshType: 1
46 + alignment: 0
47 + spritePivot: {x: 0.5, y: 0.5}
48 + spritePixelsToUnits: 100
49 + spriteBorder: {x: 0, y: 0, z: 0, w: 0}
50 + spriteGenerateFallbackPhysicsShape: 1
51 + alphaUsage: 1
52 + alphaIsTransparency: 0
53 + spriteTessellationDetail: -1
54 + textureType: 0
55 + textureShape: 1
56 + singleChannelComponent: 0
57 + maxTextureSizeSet: 0
58 + compressionQualitySet: 0
59 + textureFormatSet: 0
60 + applyGammaDecoding: 0
61 + platformSettings:
62 + - serializedVersion: 3
63 + buildTarget: DefaultTexturePlatform
64 + maxTextureSize: 2048
65 + resizeAlgorithm: 0
66 + textureFormat: -1
67 + textureCompression: 1
68 + compressionQuality: 50
69 + crunchedCompression: 0
70 + allowsAlphaSplitting: 0
71 + overridden: 0
72 + androidETC2FallbackOverride: 0
73 + forceMaximumCompressionQuality_BC6H_BC7: 0
74 + spriteSheet:
75 + serializedVersion: 2
76 + sprites: []
77 + outline: []
78 + physicsShape: []
79 + bones: []
80 + spriteID:
81 + internalID: 0
82 + vertices: []
83 + indices:
84 + edges: []
85 + weights: []
86 + secondaryTextures: []
87 + spritePackingTag:
88 + pSDRemoveMatte: 0
89 + pSDShowRemoveMatteOption: 0
90 + userData:
91 + assetBundleName:
92 + assetBundleVariant:
1 +fileFormatVersion: 2
2 +guid: 06e0016163894dd4a89a9cd677ad3795
3 +TextureImporter:
4 + internalIDToNameTable: []
5 + externalObjects: {}
6 + serializedVersion: 11
7 + mipmaps:
8 + mipMapMode: 0
9 + enableMipMap: 1
10 + sRGBTexture: 1
11 + linearTexture: 0
12 + fadeOut: 0
13 + borderMipMap: 0
14 + mipMapsPreserveCoverage: 0
15 + alphaTestReferenceValue: 0.5
16 + mipMapFadeDistanceStart: 1
17 + mipMapFadeDistanceEnd: 3
18 + bumpmap:
19 + convertToNormalMap: 0
20 + externalNormalMap: 0
21 + heightScale: 0.25
22 + normalMapFilter: 0
23 + isReadable: 0
24 + streamingMipmaps: 0
25 + streamingMipmapsPriority: 0
26 + grayScaleToAlpha: 0
27 + generateCubemap: 6
28 + cubemapConvolution: 0
29 + seamlessCubemap: 0
30 + textureFormat: 1
31 + maxTextureSize: 2048
32 + textureSettings:
33 + serializedVersion: 2
34 + filterMode: -1
35 + aniso: -1
36 + mipBias: -100
37 + wrapU: -1
38 + wrapV: -1
39 + wrapW: -1
40 + nPOTScale: 1
41 + lightmap: 0
42 + compressionQuality: 50
43 + spriteMode: 0
44 + spriteExtrude: 1
45 + spriteMeshType: 1
46 + alignment: 0
47 + spritePivot: {x: 0.5, y: 0.5}
48 + spritePixelsToUnits: 100
49 + spriteBorder: {x: 0, y: 0, z: 0, w: 0}
50 + spriteGenerateFallbackPhysicsShape: 1
51 + alphaUsage: 1
52 + alphaIsTransparency: 0
53 + spriteTessellationDetail: -1
54 + textureType: 0
55 + textureShape: 1
56 + singleChannelComponent: 0
57 + maxTextureSizeSet: 0
58 + compressionQualitySet: 0
59 + textureFormatSet: 0
60 + applyGammaDecoding: 0
61 + platformSettings:
62 + - serializedVersion: 3
63 + buildTarget: DefaultTexturePlatform
64 + maxTextureSize: 2048
65 + resizeAlgorithm: 0
66 + textureFormat: -1
67 + textureCompression: 1
68 + compressionQuality: 50
69 + crunchedCompression: 0
70 + allowsAlphaSplitting: 0
71 + overridden: 0
72 + androidETC2FallbackOverride: 0
73 + forceMaximumCompressionQuality_BC6H_BC7: 0
74 + spriteSheet:
75 + serializedVersion: 2
76 + sprites: []
77 + outline: []
78 + physicsShape: []
79 + bones: []
80 + spriteID:
81 + internalID: 0
82 + vertices: []
83 + indices:
84 + edges: []
85 + weights: []
86 + secondaryTextures: []
87 + spritePackingTag:
88 + pSDRemoveMatte: 0
89 + pSDShowRemoveMatteOption: 0
90 + userData:
91 + assetBundleName:
92 + assetBundleVariant:
...@@ -582,6 +582,77 @@ CanvasRenderer: ...@@ -582,6 +582,77 @@ CanvasRenderer:
582 m_PrefabAsset: {fileID: 0} 582 m_PrefabAsset: {fileID: 0}
583 m_GameObject: {fileID: 132265372} 583 m_GameObject: {fileID: 132265372}
584 m_CullTransparentMesh: 0 584 m_CullTransparentMesh: 0
585 +--- !u!1 &164441628
586 +GameObject:
587 + m_ObjectHideFlags: 0
588 + m_CorrespondingSourceObject: {fileID: 0}
589 + m_PrefabInstance: {fileID: 0}
590 + m_PrefabAsset: {fileID: 0}
591 + serializedVersion: 6
592 + m_Component:
593 + - component: {fileID: 164441629}
594 + - component: {fileID: 164441631}
595 + - component: {fileID: 164441630}
596 + m_Layer: 5
597 + m_Name: SquatTitle
598 + m_TagString: Untagged
599 + m_Icon: {fileID: 0}
600 + m_NavMeshLayer: 0
601 + m_StaticEditorFlags: 0
602 + m_IsActive: 0
603 +--- !u!224 &164441629
604 +RectTransform:
605 + m_ObjectHideFlags: 0
606 + m_CorrespondingSourceObject: {fileID: 0}
607 + m_PrefabInstance: {fileID: 0}
608 + m_PrefabAsset: {fileID: 0}
609 + m_GameObject: {fileID: 164441628}
610 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
611 + m_LocalPosition: {x: 0, y: 0, z: 0}
612 + m_LocalScale: {x: 1, y: 1, z: 1}
613 + m_Children: []
614 + m_Father: {fileID: 1679758666}
615 + m_RootOrder: 31
616 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
617 + m_AnchorMin: {x: 0.5, y: 0.5}
618 + m_AnchorMax: {x: 0.5, y: 0.5}
619 + m_AnchoredPosition: {x: 0, y: 270}
620 + m_SizeDelta: {x: 400, y: 100}
621 + m_Pivot: {x: 0.5, y: 0.5}
622 +--- !u!114 &164441630
623 +MonoBehaviour:
624 + m_ObjectHideFlags: 0
625 + m_CorrespondingSourceObject: {fileID: 0}
626 + m_PrefabInstance: {fileID: 0}
627 + m_PrefabAsset: {fileID: 0}
628 + m_GameObject: {fileID: 164441628}
629 + m_Enabled: 1
630 + m_EditorHideFlags: 0
631 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
632 + m_Name:
633 + m_EditorClassIdentifier:
634 + m_Material: {fileID: 0}
635 + m_Color: {r: 1, g: 1, b: 1, a: 1}
636 + m_RaycastTarget: 1
637 + m_Maskable: 1
638 + m_OnCullStateChanged:
639 + m_PersistentCalls:
640 + m_Calls: []
641 + m_Texture: {fileID: 2800000, guid: 06e0016163894dd4a89a9cd677ad3795, type: 3}
642 + m_UVRect:
643 + serializedVersion: 2
644 + x: 0
645 + y: 0
646 + width: 1
647 + height: 1
648 +--- !u!222 &164441631
649 +CanvasRenderer:
650 + m_ObjectHideFlags: 0
651 + m_CorrespondingSourceObject: {fileID: 0}
652 + m_PrefabInstance: {fileID: 0}
653 + m_PrefabAsset: {fileID: 0}
654 + m_GameObject: {fileID: 164441628}
655 + m_CullTransparentMesh: 0
585 --- !u!1 &241038935 656 --- !u!1 &241038935
586 GameObject: 657 GameObject:
587 m_ObjectHideFlags: 0 658 m_ObjectHideFlags: 0
...@@ -1283,6 +1354,77 @@ RectTransform: ...@@ -1283,6 +1354,77 @@ RectTransform:
1283 m_AnchoredPosition: {x: 0, y: 0} 1354 m_AnchoredPosition: {x: 0, y: 0}
1284 m_SizeDelta: {x: 160, y: 30} 1355 m_SizeDelta: {x: 160, y: 30}
1285 m_Pivot: {x: 0.5, y: 0.5} 1356 m_Pivot: {x: 0.5, y: 0.5}
1357 +--- !u!1 &696443519
1358 +GameObject:
1359 + m_ObjectHideFlags: 0
1360 + m_CorrespondingSourceObject: {fileID: 0}
1361 + m_PrefabInstance: {fileID: 0}
1362 + m_PrefabAsset: {fileID: 0}
1363 + serializedVersion: 6
1364 + m_Component:
1365 + - component: {fileID: 696443520}
1366 + - component: {fileID: 696443522}
1367 + - component: {fileID: 696443521}
1368 + m_Layer: 5
1369 + m_Name: SideHighKickTitle
1370 + m_TagString: Untagged
1371 + m_Icon: {fileID: 0}
1372 + m_NavMeshLayer: 0
1373 + m_StaticEditorFlags: 0
1374 + m_IsActive: 0
1375 +--- !u!224 &696443520
1376 +RectTransform:
1377 + m_ObjectHideFlags: 0
1378 + m_CorrespondingSourceObject: {fileID: 0}
1379 + m_PrefabInstance: {fileID: 0}
1380 + m_PrefabAsset: {fileID: 0}
1381 + m_GameObject: {fileID: 696443519}
1382 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1383 + m_LocalPosition: {x: 0, y: 0, z: 0}
1384 + m_LocalScale: {x: 1, y: 1, z: 1}
1385 + m_Children: []
1386 + m_Father: {fileID: 1679758666}
1387 + m_RootOrder: 32
1388 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1389 + m_AnchorMin: {x: 0.5, y: 0.5}
1390 + m_AnchorMax: {x: 0.5, y: 0.5}
1391 + m_AnchoredPosition: {x: 0, y: 270}
1392 + m_SizeDelta: {x: 400, y: 100}
1393 + m_Pivot: {x: 0.5, y: 0.5}
1394 +--- !u!114 &696443521
1395 +MonoBehaviour:
1396 + m_ObjectHideFlags: 0
1397 + m_CorrespondingSourceObject: {fileID: 0}
1398 + m_PrefabInstance: {fileID: 0}
1399 + m_PrefabAsset: {fileID: 0}
1400 + m_GameObject: {fileID: 696443519}
1401 + m_Enabled: 1
1402 + m_EditorHideFlags: 0
1403 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
1404 + m_Name:
1405 + m_EditorClassIdentifier:
1406 + m_Material: {fileID: 0}
1407 + m_Color: {r: 1, g: 1, b: 1, a: 1}
1408 + m_RaycastTarget: 1
1409 + m_Maskable: 1
1410 + m_OnCullStateChanged:
1411 + m_PersistentCalls:
1412 + m_Calls: []
1413 + m_Texture: {fileID: 2800000, guid: 87f0ae4176851f4458480c9ddaf590bb, type: 3}
1414 + m_UVRect:
1415 + serializedVersion: 2
1416 + x: 0
1417 + y: 0
1418 + width: 1
1419 + height: 1
1420 +--- !u!222 &696443522
1421 +CanvasRenderer:
1422 + m_ObjectHideFlags: 0
1423 + m_CorrespondingSourceObject: {fileID: 0}
1424 + m_PrefabInstance: {fileID: 0}
1425 + m_PrefabAsset: {fileID: 0}
1426 + m_GameObject: {fileID: 696443519}
1427 + m_CullTransparentMesh: 0
1286 --- !u!1 &779933557 1428 --- !u!1 &779933557
1287 GameObject: 1429 GameObject:
1288 m_ObjectHideFlags: 0 1430 m_ObjectHideFlags: 0
...@@ -2144,6 +2286,9 @@ MonoBehaviour: ...@@ -2144,6 +2286,9 @@ MonoBehaviour:
2144 Lunge_Left_Instruction: {fileID: 1914474766} 2286 Lunge_Left_Instruction: {fileID: 1914474766}
2145 Lunge_Right_Instruction: {fileID: 1540314533} 2287 Lunge_Right_Instruction: {fileID: 1540314533}
2146 Right_Start: {fileID: 779933557} 2288 Right_Start: {fileID: 779933557}
2289 + Squat_Title: {fileID: 164441628}
2290 + SideHighKick_Title: {fileID: 696443519}
2291 + Lunge_Title: {fileID: 2029814033}
2147 --- !u!4 &1461362268 2292 --- !u!4 &1461362268
2148 Transform: 2293 Transform:
2149 m_ObjectHideFlags: 0 2294 m_ObjectHideFlags: 0
...@@ -2812,6 +2957,9 @@ RectTransform: ...@@ -2812,6 +2957,9 @@ RectTransform:
2812 - {fileID: 1914474767} 2957 - {fileID: 1914474767}
2813 - {fileID: 1540314534} 2958 - {fileID: 1540314534}
2814 - {fileID: 779933558} 2959 - {fileID: 779933558}
2960 + - {fileID: 164441629}
2961 + - {fileID: 696443520}
2962 + - {fileID: 2029814036}
2815 m_Father: {fileID: 0} 2963 m_Father: {fileID: 0}
2816 m_RootOrder: 4 2964 m_RootOrder: 4
2817 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 2965 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -3277,6 +3425,77 @@ CanvasRenderer: ...@@ -3277,6 +3425,77 @@ CanvasRenderer:
3277 m_PrefabAsset: {fileID: 0} 3425 m_PrefabAsset: {fileID: 0}
3278 m_GameObject: {fileID: 1983785836} 3426 m_GameObject: {fileID: 1983785836}
3279 m_CullTransparentMesh: 0 3427 m_CullTransparentMesh: 0
3428 +--- !u!1 &2029814033
3429 +GameObject:
3430 + m_ObjectHideFlags: 0
3431 + m_CorrespondingSourceObject: {fileID: 0}
3432 + m_PrefabInstance: {fileID: 0}
3433 + m_PrefabAsset: {fileID: 0}
3434 + serializedVersion: 6
3435 + m_Component:
3436 + - component: {fileID: 2029814036}
3437 + - component: {fileID: 2029814035}
3438 + - component: {fileID: 2029814034}
3439 + m_Layer: 5
3440 + m_Name: LungeTitle
3441 + m_TagString: Untagged
3442 + m_Icon: {fileID: 0}
3443 + m_NavMeshLayer: 0
3444 + m_StaticEditorFlags: 0
3445 + m_IsActive: 0
3446 +--- !u!114 &2029814034
3447 +MonoBehaviour:
3448 + m_ObjectHideFlags: 0
3449 + m_CorrespondingSourceObject: {fileID: 0}
3450 + m_PrefabInstance: {fileID: 0}
3451 + m_PrefabAsset: {fileID: 0}
3452 + m_GameObject: {fileID: 2029814033}
3453 + m_Enabled: 1
3454 + m_EditorHideFlags: 0
3455 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
3456 + m_Name:
3457 + m_EditorClassIdentifier:
3458 + m_Material: {fileID: 0}
3459 + m_Color: {r: 1, g: 1, b: 1, a: 1}
3460 + m_RaycastTarget: 1
3461 + m_Maskable: 1
3462 + m_OnCullStateChanged:
3463 + m_PersistentCalls:
3464 + m_Calls: []
3465 + m_Texture: {fileID: 2800000, guid: 76fb87de9e80d3b45848ea48f70094cf, type: 3}
3466 + m_UVRect:
3467 + serializedVersion: 2
3468 + x: 0
3469 + y: 0
3470 + width: 1
3471 + height: 1
3472 +--- !u!222 &2029814035
3473 +CanvasRenderer:
3474 + m_ObjectHideFlags: 0
3475 + m_CorrespondingSourceObject: {fileID: 0}
3476 + m_PrefabInstance: {fileID: 0}
3477 + m_PrefabAsset: {fileID: 0}
3478 + m_GameObject: {fileID: 2029814033}
3479 + m_CullTransparentMesh: 0
3480 +--- !u!224 &2029814036
3481 +RectTransform:
3482 + m_ObjectHideFlags: 0
3483 + m_CorrespondingSourceObject: {fileID: 0}
3484 + m_PrefabInstance: {fileID: 0}
3485 + m_PrefabAsset: {fileID: 0}
3486 + m_GameObject: {fileID: 2029814033}
3487 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3488 + m_LocalPosition: {x: 0, y: 0, z: 0}
3489 + m_LocalScale: {x: 1, y: 1, z: 1}
3490 + m_Children: []
3491 + m_Father: {fileID: 1679758666}
3492 + m_RootOrder: 33
3493 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3494 + m_AnchorMin: {x: 0.5, y: 0.5}
3495 + m_AnchorMax: {x: 0.5, y: 0.5}
3496 + m_AnchoredPosition: {x: 0, y: 270}
3497 + m_SizeDelta: {x: 400, y: 100}
3498 + m_Pivot: {x: 0.5, y: 0.5}
3280 --- !u!1 &2059169295 3499 --- !u!1 &2059169295
3281 GameObject: 3500 GameObject:
3282 m_ObjectHideFlags: 0 3501 m_ObjectHideFlags: 0
......
...@@ -84,6 +84,7 @@ public class Move : MonoBehaviour ...@@ -84,6 +84,7 @@ public class Move : MonoBehaviour
84 public GameObject ex_start; 84 public GameObject ex_start;
85 public GameObject Squat_Instruction, SideHighKick_Instruction, Lunge_Left_Instruction, Lunge_Right_Instruction; 85 public GameObject Squat_Instruction, SideHighKick_Instruction, Lunge_Left_Instruction, Lunge_Right_Instruction;
86 public GameObject Right_Start; 86 public GameObject Right_Start;
87 + public GameObject Squat_Title, SideHighKick_Title, Lunge_Title;
87 88
88 int tot; 89 int tot;
89 string total; 90 string total;
...@@ -98,7 +99,14 @@ public class Move : MonoBehaviour ...@@ -98,7 +99,14 @@ public class Move : MonoBehaviour
98 { 99 {
99 Debug.Log("3초 됨 운동 끝!!!!!"); //결과씬이나 다른씬으로 100 Debug.Log("3초 됨 운동 끝!!!!!"); //결과씬이나 다른씬으로
100 trainer_check_outside = false; 101 trainer_check_outside = false;
102 +
103 + Squat_Title.SetActive(false);
104 + SideHighKick_Title.SetActive(false);
105 + Lunge_Title.SetActive(false);
106 +
107 +
101 SceneManager.LoadScene("Result"); // Result씬으로 이동 108 SceneManager.LoadScene("Result"); // Result씬으로 이동
109 +
102 } 110 }
103 return; 111 return;
104 } 112 }
...@@ -570,6 +578,9 @@ public class Move : MonoBehaviour ...@@ -570,6 +578,9 @@ public class Move : MonoBehaviour
570 578
571 if (exercise == "Squat") 579 if (exercise == "Squat")
572 { 580 {
581 + //Squat_Title
582 + Squat_Title.SetActive(true);
583 +
573 if (ReadAngles[1] - ReadAngles[2] <= 5) 584 if (ReadAngles[1] - ReadAngles[2] <= 5)
574 { 585 {
575 HipBalance1.SetActive(false); 586 HipBalance1.SetActive(false);
...@@ -616,6 +627,9 @@ public class Move : MonoBehaviour ...@@ -616,6 +627,9 @@ public class Move : MonoBehaviour
616 } 627 }
617 else if (exercise == "SideHiKick") 628 else if (exercise == "SideHiKick")
618 { 629 {
630 + //Title
631 + SideHighKick_Title.SetActive(true);
632 +
619 if ((ReadAngles[7] < 45) && (ReadAngles[7] > 10) 633 if ((ReadAngles[7] < 45) && (ReadAngles[7] > 10)
620 && (sidehk_flag < ReadAngles[7])) 634 && (sidehk_flag < ReadAngles[7]))
621 { 635 {
...@@ -657,9 +671,12 @@ public class Move : MonoBehaviour ...@@ -657,9 +671,12 @@ public class Move : MonoBehaviour
657 } 671 }
658 else if (exercise == "Lunge") 672 else if (exercise == "Lunge")
659 { 673 {
674 + //Lunge_Title
675 + Lunge_Title.SetActive(true);
676 +
660 if (!trainer_other_side) 677 if (!trainer_other_side)
661 { 678 {
662 - if (lunge_flag_l < 120 && ReadAngles[3] >= 91 && lunge_flag_l > ReadAngles[3]) 679 + if (ReadAngles[3] < 130 && ReadAngles[3] >= 91 && lunge_flag_l > ReadAngles[3])
663 { 680 {
664 great = ""; 681 great = "";
665 Great5.SetActive(false); 682 Great5.SetActive(false);
...@@ -674,6 +691,10 @@ public class Move : MonoBehaviour ...@@ -674,6 +691,10 @@ public class Move : MonoBehaviour
674 KneeDown6.SetActive(false); 691 KneeDown6.SetActive(false);
675 692
676 } 693 }
694 + else {
695 + Great5.SetActive(false);
696 + //KneeDown6.SetActive(false);
697 + }
677 698
678 699
679 //////////////운동 횟수 카운트////////////////// 700 //////////////운동 횟수 카운트//////////////////
...@@ -690,7 +711,7 @@ public class Move : MonoBehaviour ...@@ -690,7 +711,7 @@ public class Move : MonoBehaviour
690 } 711 }
691 else 712 else
692 { 713 {
693 - if (lunge_flag_r < 120 && ReadAngles[4] >= 91 && lunge_flag_r > ReadAngles[4]) 714 + if (ReadAngles[4] < 130 && ReadAngles[4] >= 91 && lunge_flag_r > ReadAngles[4])
694 { 715 {
695 great = ""; 716 great = "";
696 Great5.SetActive(false); 717 Great5.SetActive(false);
...@@ -704,6 +725,10 @@ public class Move : MonoBehaviour ...@@ -704,6 +725,10 @@ public class Move : MonoBehaviour
704 KneeDown6.SetActive(false); 725 KneeDown6.SetActive(false);
705 726
706 } 727 }
728 + else {
729 + Great5.SetActive(false);
730 + //KneeDown6.SetActive(false);
731 + }
707 732
708 733
709 //////////////운동 횟수 카운트////////////////// 734 //////////////운동 횟수 카운트//////////////////
......