2020-1-capstone-design1 / LSK_Project1

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

last last push

Inline Side-by-side
Showing 1 changed file with 15 additions and 11 deletions
......@@ -85,7 +85,8 @@ public class Move : MonoBehaviour
public GameObject Squat_Instruction, SideHighKick_Instruction, Lunge_Left_Instruction, Lunge_Right_Instruction;
public GameObject Right_Start;
int total;
int tot;
string total;
//lsy
void Trainer_Run()
......@@ -163,7 +164,7 @@ public class Move : MonoBehaviour
{
Lunge_Right_Instruction.SetActive(false);
trainer_speed = 7;
trainer_speed = 10;
trainer_count = 0;
lines = lines_right;
trainer_other_side = true;
......@@ -226,24 +227,27 @@ public class Move : MonoBehaviour
workout_flag = 0;
workout_flag2 = 0;
total = 20;
total = "20";
//tot = 20;
}
else if (exercise == "SideHiKick")
{
workout_flag = 0;
total = 10;
tot = 10;
total = "20";
}
else if (exercise == "Lunge")
{
workout_flag = 0;
total = 10;
tot = 10;
total = "20";
}
workout_count++;
workout = false;
Debug.Log("트레이니: " + workout_count);
traineecnt = workout_count + "/" + total;
Trainee_count.text = trainercnt;
Trainee_count.text = traineecnt;
}
void Start()
......@@ -251,7 +255,8 @@ public class Move : MonoBehaviour
timer = 0;
Trainner_count.text = "";
Trainee_count.text = "";
total = 20;
total = "20";
tot = 20;
skeleton_Trainnner = new CharacterSkeleton(Trainnner);
skeleton_Trainnne = new CharacterSkeleton(Trainnne);
......@@ -652,14 +657,14 @@ public class Move : MonoBehaviour
}
else if (exercise == "Lunge")
{
if (workout_count < 10)
if (!trainer_other_side)
{
if (lunge_flag_l < 120 && ReadAngles[3] >= 91 && lunge_flag_l > ReadAngles[3])
{
great = "";
Great5.SetActive(false);
KneeDown6.SetActive(true); //무릎을 더 굽혀주세요.
flag = 1;
}
else if (ReadAngles[3] < 91)
......@@ -668,7 +673,6 @@ public class Move : MonoBehaviour
Great5.SetActive(true);
KneeDown6.SetActive(false);
flag = 1;
}
......@@ -704,7 +708,7 @@ public class Move : MonoBehaviour
//////////////운동 횟수 카운트//////////////////
//오른쪽
if (workout_count >= 10 && ReadAngles[4] < 95 && workout && workout_flag >= 95)
if (ReadAngles[4] < 95 && workout && workout_flag >= 95)
{
Trainee_Count();
}
......