이상윤

last push

......@@ -457,7 +457,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &109009051
RectTransform:
m_ObjectHideFlags: 0
......@@ -779,7 +779,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &310358199
RectTransform:
m_ObjectHideFlags: 0
......@@ -850,7 +850,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &395084096
RectTransform:
m_ObjectHideFlags: 0
......@@ -1662,7 +1662,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1089006721
RectTransform:
m_ObjectHideFlags: 0
......@@ -2175,7 +2175,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &1484596776
RectTransform:
m_ObjectHideFlags: 0
......
......@@ -262,7 +262,7 @@ public class Move : MonoBehaviour
//lsy end
exercise = ClickExercise.selected_exercise; //ClickExercise에서 선택한 운동이 무엇인지 String으로 넘어옴.
exercise = "Squat";
Debug.Log(exercise); //Squat, SideHiKick, Lunge 에 따라서 Trainer움직이고, 사용자에게 instruction주기
if (exercise == "Squat")
......@@ -654,39 +654,21 @@ public class Move : MonoBehaviour
{
if (workout_count < 10)
{
if (flag == 0)
if (lunge_flag_l < 120 && ReadAngles[3] >= 91 && lunge_flag_l > ReadAngles[3])
{
if (lunge_flag_l < 120 && ReadAngles[3] >= 91 && lunge_flag_l > ReadAngles[3])
{
great = "";
//Great5.SetActive(false);
KneeDown6.SetActive(true); //무릎을 더 굽혀주세요.
flag = 1;
great = "";
Great5.SetActive(false);
KneeDown6.SetActive(true); //무릎을 더 굽혀주세요.
flag = 1;
}
else if (ReadAngles[3] < 91)
{
great = "GREAT!";
Great5.SetActive(true);
//KneeDown6.SetActive(false);
flag = 1;
}
}
else
else if (ReadAngles[3] < 91)
{
great = "GREAT!";
Great5.SetActive(true);
KneeDown6.SetActive(false);
flag_timer += Time.deltaTime;
//Debug.Log(flag_timer);
if (flag_timer > 5)
{
flag = 0;
flag_timer = 0;
Debug.Log("5초넘음");
Great5.SetActive(false);
KneeDown6.SetActive(false);
}
flag = 1;
}
......@@ -704,40 +686,21 @@ public class Move : MonoBehaviour
}
else
{
if (flag == 0)
if (lunge_flag_r < 120 && ReadAngles[4] >= 91 && lunge_flag_r > ReadAngles[4])
{
if (lunge_flag_r < 120 && ReadAngles[4] >= 91 && lunge_flag_r > ReadAngles[4])
{
great = "";
//Great5.SetActive(false);
KneeDown6.SetActive(true); //무릎을 더 굽혀주세요.
flag = 1;
great = "";
Great5.SetActive(false);
KneeDown6.SetActive(true); //무릎을 더 굽혀주세요.
}
else if (ReadAngles[4] < 91)
{
great = "GREAT!";
Great5.SetActive(true);
//KneeDown6.SetActive(false);
flag = 1;
}
}
else
else if (ReadAngles[4] < 91)
{
great = "GREAT!";
Great5.SetActive(true);
KneeDown6.SetActive(false);
flag_timer += Time.deltaTime;
//Debug.Log(flag_timer);
if (flag_timer > 5)
{
flag = 0;
flag_timer = 0;
Debug.Log("5초넘음");
Great5.SetActive(false);
KneeDown6.SetActive(false);
}
}
//////////////운동 횟수 카운트//////////////////
//오른쪽
......