2020-1-capstone-design1 / LSK_Project1

Go to a project
Toggle navigation Toggle navigation pinning
이상윤
6136f186 1 parent ee6e2f06

last push

Inline Side-by-side
Showing 2 changed files with 25 additions and 62 deletions
...@@ -457,7 +457,7 @@ GameObject: ...@@ -457,7 +457,7 @@ GameObject:
457 m_Icon: {fileID: 0} 457 m_Icon: {fileID: 0}
458 m_NavMeshLayer: 0 458 m_NavMeshLayer: 0
459 m_StaticEditorFlags: 0 459 m_StaticEditorFlags: 0
460 - m_IsActive: 1 460 + m_IsActive: 0
461 --- !u!224 &109009051 461 --- !u!224 &109009051
462 RectTransform: 462 RectTransform:
463 m_ObjectHideFlags: 0 463 m_ObjectHideFlags: 0
...@@ -779,7 +779,7 @@ GameObject: ...@@ -779,7 +779,7 @@ GameObject:
779 m_Icon: {fileID: 0} 779 m_Icon: {fileID: 0}
780 m_NavMeshLayer: 0 780 m_NavMeshLayer: 0
781 m_StaticEditorFlags: 0 781 m_StaticEditorFlags: 0
782 - m_IsActive: 1 782 + m_IsActive: 0
783 --- !u!224 &310358199 783 --- !u!224 &310358199
784 RectTransform: 784 RectTransform:
785 m_ObjectHideFlags: 0 785 m_ObjectHideFlags: 0
...@@ -850,7 +850,7 @@ GameObject: ...@@ -850,7 +850,7 @@ GameObject:
850 m_Icon: {fileID: 0} 850 m_Icon: {fileID: 0}
851 m_NavMeshLayer: 0 851 m_NavMeshLayer: 0
852 m_StaticEditorFlags: 0 852 m_StaticEditorFlags: 0
853 - m_IsActive: 1 853 + m_IsActive: 0
854 --- !u!224 &395084096 854 --- !u!224 &395084096
855 RectTransform: 855 RectTransform:
856 m_ObjectHideFlags: 0 856 m_ObjectHideFlags: 0
...@@ -1662,7 +1662,7 @@ GameObject: ...@@ -1662,7 +1662,7 @@ GameObject:
1662 m_Icon: {fileID: 0} 1662 m_Icon: {fileID: 0}
1663 m_NavMeshLayer: 0 1663 m_NavMeshLayer: 0
1664 m_StaticEditorFlags: 0 1664 m_StaticEditorFlags: 0
1665 - m_IsActive: 1 1665 + m_IsActive: 0
1666 --- !u!224 &1089006721 1666 --- !u!224 &1089006721
1667 RectTransform: 1667 RectTransform:
1668 m_ObjectHideFlags: 0 1668 m_ObjectHideFlags: 0
...@@ -2175,7 +2175,7 @@ GameObject: ...@@ -2175,7 +2175,7 @@ GameObject:
2175 m_Icon: {fileID: 0} 2175 m_Icon: {fileID: 0}
2176 m_NavMeshLayer: 0 2176 m_NavMeshLayer: 0
2177 m_StaticEditorFlags: 0 2177 m_StaticEditorFlags: 0
2178 - m_IsActive: 1 2178 + m_IsActive: 0
2179 --- !u!224 &1484596776 2179 --- !u!224 &1484596776
2180 RectTransform: 2180 RectTransform:
2181 m_ObjectHideFlags: 0 2181 m_ObjectHideFlags: 0
......
...@@ -262,7 +262,7 @@ public class Move : MonoBehaviour ...@@ -262,7 +262,7 @@ public class Move : MonoBehaviour
262 //lsy end 262 //lsy end
263 263
264 exercise = ClickExercise.selected_exercise; //ClickExercise에서 선택한 운동이 무엇인지 String으로 넘어옴. 264 exercise = ClickExercise.selected_exercise; //ClickExercise에서 선택한 운동이 무엇인지 String으로 넘어옴.
265 - exercise = "Squat"; 265 +
266 Debug.Log(exercise); //Squat, SideHiKick, Lunge 에 따라서 Trainer움직이고, 사용자에게 instruction주기 266 Debug.Log(exercise); //Squat, SideHiKick, Lunge 에 따라서 Trainer움직이고, 사용자에게 instruction주기
267 267
268 if (exercise == "Squat") 268 if (exercise == "Squat")
...@@ -654,39 +654,21 @@ public class Move : MonoBehaviour ...@@ -654,39 +654,21 @@ public class Move : MonoBehaviour
654 { 654 {
655 if (workout_count < 10) 655 if (workout_count < 10)
656 { 656 {
657 - if (flag == 0) 657 + if (lunge_flag_l < 120 && ReadAngles[3] >= 91 && lunge_flag_l > ReadAngles[3])
658 { 658 {
659 - if (lunge_flag_l < 120 && ReadAngles[3] >= 91 && lunge_flag_l > ReadAngles[3]) 659 + great = "";
660 - { 660 + Great5.SetActive(false);
661 - great = ""; 661 + KneeDown6.SetActive(true); //무릎을 더 굽혀주세요.
662 - //Great5.SetActive(false); 662 + flag = 1;
663 - KneeDown6.SetActive(true); //무릎을 더 굽혀주세요.
664 - flag = 1;
665 663
666 - }
667 - else if (ReadAngles[3] < 91)
668 - {
669 - great = "GREAT!";
670 - Great5.SetActive(true);
671 - //KneeDown6.SetActive(false);
672 -
673 - flag = 1;
674 - }
675 } 664 }
676 - else 665 + else if (ReadAngles[3] < 91)
677 { 666 {
667 + great = "GREAT!";
668 + Great5.SetActive(true);
669 + KneeDown6.SetActive(false);
678 670
679 - flag_timer += Time.deltaTime; 671 + flag = 1;
680 - //Debug.Log(flag_timer);
681 - if (flag_timer > 5)
682 - {
683 - flag = 0;
684 - flag_timer = 0;
685 - Debug.Log("5초넘음");
686 -
687 - Great5.SetActive(false);
688 - KneeDown6.SetActive(false);
689 - }
690 } 672 }
691 673
692 674
...@@ -704,40 +686,21 @@ public class Move : MonoBehaviour ...@@ -704,40 +686,21 @@ public class Move : MonoBehaviour
704 } 686 }
705 else 687 else
706 { 688 {
707 - if (flag == 0) 689 + if (lunge_flag_r < 120 && ReadAngles[4] >= 91 && lunge_flag_r > ReadAngles[4])
708 { 690 {
709 - if (lunge_flag_r < 120 && ReadAngles[4] >= 91 && lunge_flag_r > ReadAngles[4]) 691 + great = "";
710 - { 692 + Great5.SetActive(false);
711 - great = ""; 693 + KneeDown6.SetActive(true); //무릎을 더 굽혀주세요.
712 - //Great5.SetActive(false);
713 - KneeDown6.SetActive(true); //무릎을 더 굽혀주세요.
714 - flag = 1;
715 694
716 - }
717 - else if (ReadAngles[4] < 91)
718 - {
719 - great = "GREAT!";
720 - Great5.SetActive(true);
721 - //KneeDown6.SetActive(false);
722 -
723 - flag = 1;
724 - }
725 } 695 }
726 - else 696 + else if (ReadAngles[4] < 91)
727 { 697 {
698 + great = "GREAT!";
699 + Great5.SetActive(true);
700 + KneeDown6.SetActive(false);
728 701
729 - flag_timer += Time.deltaTime;
730 - //Debug.Log(flag_timer);
731 - if (flag_timer > 5)
732 - {
733 - flag = 0;
734 - flag_timer = 0;
735 - Debug.Log("5초넘음");
736 -
737 - Great5.SetActive(false);
738 - KneeDown6.SetActive(false);
739 - }
740 } 702 }
703 +
741 704
742 //////////////운동 횟수 카운트////////////////// 705 //////////////운동 횟수 카운트//////////////////
743 //오른쪽 706 //오른쪽
......