2020-1-capstone-design1 / LSK_Project1

Go to a project
Toggle navigation Toggle navigation pinning
고다경
036aecbe 1 parent 60608cc1

운동 instruction 삽입

Inline Side-by-side
Showing 14 changed files with 891 additions and 12 deletions
1 +fileFormatVersion: 2
2 +guid: 82e961083fc01674db048d60e3513529
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: 770a408fec75d844284edbbb7dc51d66
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: 9cd30abfe950592428bbfb4a5b0b4bab
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: 8eaaf7c57a8e30649840113180ae24e0
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: b49bf1878ea4f9f4596037f81e4a8f2a
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: d0d7afdf4e0108e4ba249ef25f1d21c2
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:
...@@ -450,7 +450,7 @@ GameObject: ...@@ -450,7 +450,7 @@ GameObject:
450 m_Icon: {fileID: 0} 450 m_Icon: {fileID: 0}
451 m_NavMeshLayer: 0 451 m_NavMeshLayer: 0
452 m_StaticEditorFlags: 0 452 m_StaticEditorFlags: 0
453 - m_IsActive: 1 453 + m_IsActive: 0
454 --- !u!224 &132265373 454 --- !u!224 &132265373
455 RectTransform: 455 RectTransform:
456 m_ObjectHideFlags: 0 456 m_ObjectHideFlags: 0
...@@ -1425,6 +1425,77 @@ CanvasRenderer: ...@@ -1425,6 +1425,77 @@ CanvasRenderer:
1425 m_PrefabAsset: {fileID: 0} 1425 m_PrefabAsset: {fileID: 0}
1426 m_GameObject: {fileID: 972410871} 1426 m_GameObject: {fileID: 972410871}
1427 m_CullTransparentMesh: 0 1427 m_CullTransparentMesh: 0
1428 +--- !u!1 &1019081448
1429 +GameObject:
1430 + m_ObjectHideFlags: 0
1431 + m_CorrespondingSourceObject: {fileID: 0}
1432 + m_PrefabInstance: {fileID: 0}
1433 + m_PrefabAsset: {fileID: 0}
1434 + serializedVersion: 6
1435 + m_Component:
1436 + - component: {fileID: 1019081449}
1437 + - component: {fileID: 1019081451}
1438 + - component: {fileID: 1019081450}
1439 + m_Layer: 5
1440 + m_Name: Squat_Instruction
1441 + m_TagString: Untagged
1442 + m_Icon: {fileID: 0}
1443 + m_NavMeshLayer: 0
1444 + m_StaticEditorFlags: 0
1445 + m_IsActive: 0
1446 +--- !u!224 &1019081449
1447 +RectTransform:
1448 + m_ObjectHideFlags: 0
1449 + m_CorrespondingSourceObject: {fileID: 0}
1450 + m_PrefabInstance: {fileID: 0}
1451 + m_PrefabAsset: {fileID: 0}
1452 + m_GameObject: {fileID: 1019081448}
1453 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
1454 + m_LocalPosition: {x: 0, y: 0, z: 0}
1455 + m_LocalScale: {x: 8, y: 3, z: 1}
1456 + m_Children: []
1457 + m_Father: {fileID: 1679758666}
1458 + m_RootOrder: 25
1459 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
1460 + m_AnchorMin: {x: 0.5, y: 0.5}
1461 + m_AnchorMax: {x: 0.5, y: 0.5}
1462 + m_AnchoredPosition: {x: 0, y: 0}
1463 + m_SizeDelta: {x: 100, y: 100}
1464 + m_Pivot: {x: 0.5, y: 0.5}
1465 +--- !u!114 &1019081450
1466 +MonoBehaviour:
1467 + m_ObjectHideFlags: 0
1468 + m_CorrespondingSourceObject: {fileID: 0}
1469 + m_PrefabInstance: {fileID: 0}
1470 + m_PrefabAsset: {fileID: 0}
1471 + m_GameObject: {fileID: 1019081448}
1472 + m_Enabled: 1
1473 + m_EditorHideFlags: 0
1474 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
1475 + m_Name:
1476 + m_EditorClassIdentifier:
1477 + m_Material: {fileID: 0}
1478 + m_Color: {r: 1, g: 1, b: 1, a: 1}
1479 + m_RaycastTarget: 1
1480 + m_Maskable: 1
1481 + m_OnCullStateChanged:
1482 + m_PersistentCalls:
1483 + m_Calls: []
1484 + m_Texture: {fileID: 2800000, guid: d0d7afdf4e0108e4ba249ef25f1d21c2, type: 3}
1485 + m_UVRect:
1486 + serializedVersion: 2
1487 + x: 0
1488 + y: 0
1489 + width: 1
1490 + height: 1
1491 +--- !u!222 &1019081451
1492 +CanvasRenderer:
1493 + m_ObjectHideFlags: 0
1494 + m_CorrespondingSourceObject: {fileID: 0}
1495 + m_PrefabInstance: {fileID: 0}
1496 + m_PrefabAsset: {fileID: 0}
1497 + m_GameObject: {fileID: 1019081448}
1498 + m_CullTransparentMesh: 0
1428 --- !u!1 &1089006720 1499 --- !u!1 &1089006720
1429 GameObject: 1500 GameObject:
1430 m_ObjectHideFlags: 0 1501 m_ObjectHideFlags: 0
...@@ -1891,6 +1962,7 @@ MonoBehaviour: ...@@ -1891,6 +1962,7 @@ MonoBehaviour:
1891 trainer_data1: [] 1962 trainer_data1: []
1892 trainer_state: 1963 trainer_state:
1893 speed: 0 1964 speed: 0
1965 + trainer_count: 0
1894 AngleLeftKnee: {fileID: 1313906998} 1966 AngleLeftKnee: {fileID: 1313906998}
1895 AngleRightKnee: {fileID: 1543390839} 1967 AngleRightKnee: {fileID: 1543390839}
1896 KneeToeLeft: {fileID: 2059169298} 1968 KneeToeLeft: {fileID: 2059169298}
...@@ -1911,6 +1983,10 @@ MonoBehaviour: ...@@ -1911,6 +1983,10 @@ MonoBehaviour:
1911 Great5: {fileID: 310358198} 1983 Great5: {fileID: 310358198}
1912 KneeDown6: {fileID: 938472432} 1984 KneeDown6: {fileID: 938472432}
1913 ex_start: {fileID: 1723072947} 1985 ex_start: {fileID: 1723072947}
1986 + Squat_Instruction: {fileID: 1019081448}
1987 + SideHighKick_Instruction: {fileID: 1616699126}
1988 + Lunge_Left_Instruction: {fileID: 1914474766}
1989 + Lunge_Right_Instruction: {fileID: 1540314533}
1914 --- !u!4 &1461362268 1990 --- !u!4 &1461362268
1915 Transform: 1991 Transform:
1916 m_ObjectHideFlags: 0 1992 m_ObjectHideFlags: 0
...@@ -2074,6 +2150,77 @@ MonoBehaviour: ...@@ -2074,6 +2150,77 @@ MonoBehaviour:
2074 m_VerticalOverflow: 0 2150 m_VerticalOverflow: 0
2075 m_LineSpacing: 1 2151 m_LineSpacing: 1
2076 m_Text: LeftLegUp 2152 m_Text: LeftLegUp
2153 +--- !u!1 &1540314533
2154 +GameObject:
2155 + m_ObjectHideFlags: 0
2156 + m_CorrespondingSourceObject: {fileID: 0}
2157 + m_PrefabInstance: {fileID: 0}
2158 + m_PrefabAsset: {fileID: 0}
2159 + serializedVersion: 6
2160 + m_Component:
2161 + - component: {fileID: 1540314534}
2162 + - component: {fileID: 1540314536}
2163 + - component: {fileID: 1540314535}
2164 + m_Layer: 5
2165 + m_Name: Lunge_Right_Instruction
2166 + m_TagString: Untagged
2167 + m_Icon: {fileID: 0}
2168 + m_NavMeshLayer: 0
2169 + m_StaticEditorFlags: 0
2170 + m_IsActive: 0
2171 +--- !u!224 &1540314534
2172 +RectTransform:
2173 + m_ObjectHideFlags: 0
2174 + m_CorrespondingSourceObject: {fileID: 0}
2175 + m_PrefabInstance: {fileID: 0}
2176 + m_PrefabAsset: {fileID: 0}
2177 + m_GameObject: {fileID: 1540314533}
2178 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2179 + m_LocalPosition: {x: 0, y: 0, z: 0}
2180 + m_LocalScale: {x: 8, y: 3, z: 1}
2181 + m_Children: []
2182 + m_Father: {fileID: 1679758666}
2183 + m_RootOrder: 28
2184 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2185 + m_AnchorMin: {x: 0.5, y: 0.5}
2186 + m_AnchorMax: {x: 0.5, y: 0.5}
2187 + m_AnchoredPosition: {x: 0, y: 0}
2188 + m_SizeDelta: {x: 100, y: 100}
2189 + m_Pivot: {x: 0.5, y: 0.5}
2190 +--- !u!114 &1540314535
2191 +MonoBehaviour:
2192 + m_ObjectHideFlags: 0
2193 + m_CorrespondingSourceObject: {fileID: 0}
2194 + m_PrefabInstance: {fileID: 0}
2195 + m_PrefabAsset: {fileID: 0}
2196 + m_GameObject: {fileID: 1540314533}
2197 + m_Enabled: 1
2198 + m_EditorHideFlags: 0
2199 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
2200 + m_Name:
2201 + m_EditorClassIdentifier:
2202 + m_Material: {fileID: 0}
2203 + m_Color: {r: 1, g: 1, b: 1, a: 1}
2204 + m_RaycastTarget: 1
2205 + m_Maskable: 1
2206 + m_OnCullStateChanged:
2207 + m_PersistentCalls:
2208 + m_Calls: []
2209 + m_Texture: {fileID: 2800000, guid: 9cd30abfe950592428bbfb4a5b0b4bab, type: 3}
2210 + m_UVRect:
2211 + serializedVersion: 2
2212 + x: 0
2213 + y: 0
2214 + width: 1
2215 + height: 1
2216 +--- !u!222 &1540314536
2217 +CanvasRenderer:
2218 + m_ObjectHideFlags: 0
2219 + m_CorrespondingSourceObject: {fileID: 0}
2220 + m_PrefabInstance: {fileID: 0}
2221 + m_PrefabAsset: {fileID: 0}
2222 + m_GameObject: {fileID: 1540314533}
2223 + m_CullTransparentMesh: 0
2077 --- !u!1 &1543390836 2224 --- !u!1 &1543390836
2078 GameObject: 2225 GameObject:
2079 m_ObjectHideFlags: 0 2226 m_ObjectHideFlags: 0
...@@ -2169,7 +2316,7 @@ GameObject: ...@@ -2169,7 +2316,7 @@ GameObject:
2169 m_Icon: {fileID: 0} 2316 m_Icon: {fileID: 0}
2170 m_NavMeshLayer: 0 2317 m_NavMeshLayer: 0
2171 m_StaticEditorFlags: 0 2318 m_StaticEditorFlags: 0
2172 - m_IsActive: 1 2319 + m_IsActive: 0
2173 --- !u!224 &1606945879 2320 --- !u!224 &1606945879
2174 RectTransform: 2321 RectTransform:
2175 m_ObjectHideFlags: 0 2322 m_ObjectHideFlags: 0
...@@ -2223,6 +2370,77 @@ CanvasRenderer: ...@@ -2223,6 +2370,77 @@ CanvasRenderer:
2223 m_PrefabAsset: {fileID: 0} 2370 m_PrefabAsset: {fileID: 0}
2224 m_GameObject: {fileID: 1606945878} 2371 m_GameObject: {fileID: 1606945878}
2225 m_CullTransparentMesh: 0 2372 m_CullTransparentMesh: 0
2373 +--- !u!1 &1616699126
2374 +GameObject:
2375 + m_ObjectHideFlags: 0
2376 + m_CorrespondingSourceObject: {fileID: 0}
2377 + m_PrefabInstance: {fileID: 0}
2378 + m_PrefabAsset: {fileID: 0}
2379 + serializedVersion: 6
2380 + m_Component:
2381 + - component: {fileID: 1616699127}
2382 + - component: {fileID: 1616699129}
2383 + - component: {fileID: 1616699128}
2384 + m_Layer: 5
2385 + m_Name: SideHighKick_Instruction
2386 + m_TagString: Untagged
2387 + m_Icon: {fileID: 0}
2388 + m_NavMeshLayer: 0
2389 + m_StaticEditorFlags: 0
2390 + m_IsActive: 0
2391 +--- !u!224 &1616699127
2392 +RectTransform:
2393 + m_ObjectHideFlags: 0
2394 + m_CorrespondingSourceObject: {fileID: 0}
2395 + m_PrefabInstance: {fileID: 0}
2396 + m_PrefabAsset: {fileID: 0}
2397 + m_GameObject: {fileID: 1616699126}
2398 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2399 + m_LocalPosition: {x: 0, y: 0, z: 0}
2400 + m_LocalScale: {x: 8, y: 3, z: 1}
2401 + m_Children: []
2402 + m_Father: {fileID: 1679758666}
2403 + m_RootOrder: 26
2404 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2405 + m_AnchorMin: {x: 0.5, y: 0.5}
2406 + m_AnchorMax: {x: 0.5, y: 0.5}
2407 + m_AnchoredPosition: {x: 0, y: 0}
2408 + m_SizeDelta: {x: 100, y: 100}
2409 + m_Pivot: {x: 0.5, y: 0.5}
2410 +--- !u!114 &1616699128
2411 +MonoBehaviour:
2412 + m_ObjectHideFlags: 0
2413 + m_CorrespondingSourceObject: {fileID: 0}
2414 + m_PrefabInstance: {fileID: 0}
2415 + m_PrefabAsset: {fileID: 0}
2416 + m_GameObject: {fileID: 1616699126}
2417 + m_Enabled: 1
2418 + m_EditorHideFlags: 0
2419 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
2420 + m_Name:
2421 + m_EditorClassIdentifier:
2422 + m_Material: {fileID: 0}
2423 + m_Color: {r: 1, g: 1, b: 1, a: 1}
2424 + m_RaycastTarget: 1
2425 + m_Maskable: 1
2426 + m_OnCullStateChanged:
2427 + m_PersistentCalls:
2428 + m_Calls: []
2429 + m_Texture: {fileID: 2800000, guid: b49bf1878ea4f9f4596037f81e4a8f2a, type: 3}
2430 + m_UVRect:
2431 + serializedVersion: 2
2432 + x: 0
2433 + y: 0
2434 + width: 1
2435 + height: 1
2436 +--- !u!222 &1616699129
2437 +CanvasRenderer:
2438 + m_ObjectHideFlags: 0
2439 + m_CorrespondingSourceObject: {fileID: 0}
2440 + m_PrefabInstance: {fileID: 0}
2441 + m_PrefabAsset: {fileID: 0}
2442 + m_GameObject: {fileID: 1616699126}
2443 + m_CullTransparentMesh: 0
2226 --- !u!1 &1640929892 2444 --- !u!1 &1640929892
2227 GameObject: 2445 GameObject:
2228 m_ObjectHideFlags: 0 2446 m_ObjectHideFlags: 0
...@@ -2431,6 +2649,10 @@ RectTransform: ...@@ -2431,6 +2649,10 @@ RectTransform:
2431 - {fileID: 972410872} 2649 - {fileID: 972410872}
2432 - {fileID: 938472433} 2650 - {fileID: 938472433}
2433 - {fileID: 433964838} 2651 - {fileID: 433964838}
2652 + - {fileID: 1019081449}
2653 + - {fileID: 1616699127}
2654 + - {fileID: 1914474767}
2655 + - {fileID: 1540314534}
2434 m_Father: {fileID: 0} 2656 m_Father: {fileID: 0}
2435 m_RootOrder: 4 2657 m_RootOrder: 4
2436 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 2658 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -2754,6 +2976,77 @@ GameObject: ...@@ -2754,6 +2976,77 @@ GameObject:
2754 type: 3} 2976 type: 3}
2755 m_PrefabInstance: {fileID: 1840191322} 2977 m_PrefabInstance: {fileID: 1840191322}
2756 m_PrefabAsset: {fileID: 0} 2978 m_PrefabAsset: {fileID: 0}
2979 +--- !u!1 &1914474766
2980 +GameObject:
2981 + m_ObjectHideFlags: 0
2982 + m_CorrespondingSourceObject: {fileID: 0}
2983 + m_PrefabInstance: {fileID: 0}
2984 + m_PrefabAsset: {fileID: 0}
2985 + serializedVersion: 6
2986 + m_Component:
2987 + - component: {fileID: 1914474767}
2988 + - component: {fileID: 1914474769}
2989 + - component: {fileID: 1914474768}
2990 + m_Layer: 5
2991 + m_Name: Lunge_Left_Instruction
2992 + m_TagString: Untagged
2993 + m_Icon: {fileID: 0}
2994 + m_NavMeshLayer: 0
2995 + m_StaticEditorFlags: 0
2996 + m_IsActive: 0
2997 +--- !u!224 &1914474767
2998 +RectTransform:
2999 + m_ObjectHideFlags: 0
3000 + m_CorrespondingSourceObject: {fileID: 0}
3001 + m_PrefabInstance: {fileID: 0}
3002 + m_PrefabAsset: {fileID: 0}
3003 + m_GameObject: {fileID: 1914474766}
3004 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3005 + m_LocalPosition: {x: 0, y: 0, z: 0}
3006 + m_LocalScale: {x: 8, y: 3, z: 1}
3007 + m_Children: []
3008 + m_Father: {fileID: 1679758666}
3009 + m_RootOrder: 27
3010 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3011 + m_AnchorMin: {x: 0.5, y: 0.5}
3012 + m_AnchorMax: {x: 0.5, y: 0.5}
3013 + m_AnchoredPosition: {x: 0, y: 0}
3014 + m_SizeDelta: {x: 100, y: 100}
3015 + m_Pivot: {x: 0.5, y: 0.5}
3016 +--- !u!114 &1914474768
3017 +MonoBehaviour:
3018 + m_ObjectHideFlags: 0
3019 + m_CorrespondingSourceObject: {fileID: 0}
3020 + m_PrefabInstance: {fileID: 0}
3021 + m_PrefabAsset: {fileID: 0}
3022 + m_GameObject: {fileID: 1914474766}
3023 + m_Enabled: 1
3024 + m_EditorHideFlags: 0
3025 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
3026 + m_Name:
3027 + m_EditorClassIdentifier:
3028 + m_Material: {fileID: 0}
3029 + m_Color: {r: 1, g: 1, b: 1, a: 1}
3030 + m_RaycastTarget: 1
3031 + m_Maskable: 1
3032 + m_OnCullStateChanged:
3033 + m_PersistentCalls:
3034 + m_Calls: []
3035 + m_Texture: {fileID: 2800000, guid: 770a408fec75d844284edbbb7dc51d66, type: 3}
3036 + m_UVRect:
3037 + serializedVersion: 2
3038 + x: 0
3039 + y: 0
3040 + width: 1
3041 + height: 1
3042 +--- !u!222 &1914474769
3043 +CanvasRenderer:
3044 + m_ObjectHideFlags: 0
3045 + m_CorrespondingSourceObject: {fileID: 0}
3046 + m_PrefabInstance: {fileID: 0}
3047 + m_PrefabAsset: {fileID: 0}
3048 + m_GameObject: {fileID: 1914474766}
3049 + m_CullTransparentMesh: 0
2757 --- !u!1 &1983785836 3050 --- !u!1 &1983785836
2758 GameObject: 3051 GameObject:
2759 m_ObjectHideFlags: 0 3052 m_ObjectHideFlags: 0
...@@ -2771,7 +3064,7 @@ GameObject: ...@@ -2771,7 +3064,7 @@ GameObject:
2771 m_Icon: {fileID: 0} 3064 m_Icon: {fileID: 0}
2772 m_NavMeshLayer: 0 3065 m_NavMeshLayer: 0
2773 m_StaticEditorFlags: 0 3066 m_StaticEditorFlags: 0
2774 - m_IsActive: 1 3067 + m_IsActive: 0
2775 --- !u!224 &1983785837 3068 --- !u!224 &1983785837
2776 RectTransform: 3069 RectTransform:
2777 m_ObjectHideFlags: 0 3070 m_ObjectHideFlags: 0
......
...@@ -67,6 +67,8 @@ public class Move : MonoBehaviour ...@@ -67,6 +67,8 @@ public class Move : MonoBehaviour
67 public GameObject count1; 67 public GameObject count1;
68 public GameObject HipBalance1, PullHipBack2, LegUp3, SpineStraight4, Great5, KneeDown6; 68 public GameObject HipBalance1, PullHipBack2, LegUp3, SpineStraight4, Great5, KneeDown6;
69 public GameObject ex_start; 69 public GameObject ex_start;
70 + public GameObject Squat_Instruction, SideHighKick_Instruction, Lunge_Left_Instruction, Lunge_Right_Instruction;
71 +
70 72
71 //lsy 73 //lsy
72 void Trainer_Run() 74 void Trainer_Run()
...@@ -189,12 +191,25 @@ public class Move : MonoBehaviour ...@@ -189,12 +191,25 @@ public class Move : MonoBehaviour
189 workout_flag2 = 0; 191 workout_flag2 = 0;
190 workout = false; 192 workout = false;
191 193
192 - HipBalance1.SetActive(false); 194 + if (exercise == "Squat")
193 - PullHipBack2.SetActive(false); 195 + {
194 - LegUp3.SetActive(false); 196 + Squat_Instruction.SetActive(true);
195 - SpineStraight4.SetActive(false); 197 + }
196 - Great5.SetActive(false); 198 + else if (exercise == "SideHiKick")
197 - KneeDown6.SetActive(false); 199 + {
200 + SideHighKick_Instruction.SetActive(true);
201 + }
202 + else if (exercise == "Lunge")
203 + {
204 + Lunge_Left_Instruction.SetActive(true);
205 + }
206 +
207 + //HipBalance1.SetActive(false);
208 + //PullHipBack2.SetActive(false);
209 + //LegUp3.SetActive(false);
210 + //SpineStraight4.SetActive(false);
211 + //Great5.SetActive(false);
212 + //KneeDown6.SetActive(false);
198 } 213 }
199 214
200 private Dictionary<Kinect.JointType, Kinect.JointType> _BoneMap = new Dictionary<Kinect.JointType, Kinect.JointType>() 215 private Dictionary<Kinect.JointType, Kinect.JointType> _BoneMap = new Dictionary<Kinect.JointType, Kinect.JointType>()
...@@ -234,8 +249,27 @@ public class Move : MonoBehaviour ...@@ -234,8 +249,27 @@ public class Move : MonoBehaviour
234 249
235 timer += Time.deltaTime; 250 timer += Time.deltaTime;
236 //Debug.Log("Timer: " + timer); 251 //Debug.Log("Timer: " + timer);
237 - if (timer < 1) 252 + if (timer < 3)
238 { 253 {
254 + if (exercise == "Squat")
255 + {
256 + Squat_Instruction.SetActive(true);
257 + }
258 + else if (exercise == "SideHiKick")
259 + {
260 + SideHighKick_Instruction.SetActive(true);
261 + }
262 + else if (exercise == "Lunge")
263 + {
264 + Lunge_Left_Instruction.SetActive(true);
265 + }
266 + }
267 + else if (timer < 4)
268 + {
269 + Squat_Instruction.SetActive(false);
270 + SideHighKick_Instruction.SetActive(false);
271 + Lunge_Left_Instruction.SetActive(false);
272 +
239 count3.SetActive(true); 273 count3.SetActive(true);
240 count2.SetActive(false); 274 count2.SetActive(false);
241 count1.SetActive(false); 275 count1.SetActive(false);
...@@ -249,7 +283,7 @@ public class Move : MonoBehaviour ...@@ -249,7 +283,7 @@ public class Move : MonoBehaviour
249 KneeDown6.SetActive(false); 283 KneeDown6.SetActive(false);
250 284
251 } 285 }
252 - else if (timer >= 1 && timer < 2) { 286 + else if (timer < 5) {
253 count3.SetActive(false); 287 count3.SetActive(false);
254 count2.SetActive(true); 288 count2.SetActive(true);
255 count1.SetActive(false); 289 count1.SetActive(false);
...@@ -263,7 +297,7 @@ public class Move : MonoBehaviour ...@@ -263,7 +297,7 @@ public class Move : MonoBehaviour
263 KneeDown6.SetActive(false); 297 KneeDown6.SetActive(false);
264 298
265 } 299 }
266 - else if (timer >= 2 && timer < 3) 300 + else if (timer < 6)
267 { 301 {
268 count3.SetActive(false); 302 count3.SetActive(false);
269 count2.SetActive(false); 303 count2.SetActive(false);
......