Showing
1 changed file
with
15 additions
and
11 deletions
| ... | @@ -85,7 +85,8 @@ public class Move : MonoBehaviour | ... | @@ -85,7 +85,8 @@ public class Move : MonoBehaviour |
| 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 | 87 | ||
| 88 | - int total; | 88 | + int tot; |
| 89 | + string total; | ||
| 89 | 90 | ||
| 90 | //lsy | 91 | //lsy |
| 91 | void Trainer_Run() | 92 | void Trainer_Run() |
| ... | @@ -163,7 +164,7 @@ public class Move : MonoBehaviour | ... | @@ -163,7 +164,7 @@ public class Move : MonoBehaviour |
| 163 | { | 164 | { |
| 164 | Lunge_Right_Instruction.SetActive(false); | 165 | Lunge_Right_Instruction.SetActive(false); |
| 165 | 166 | ||
| 166 | - trainer_speed = 7; | 167 | + trainer_speed = 10; |
| 167 | trainer_count = 0; | 168 | trainer_count = 0; |
| 168 | lines = lines_right; | 169 | lines = lines_right; |
| 169 | trainer_other_side = true; | 170 | trainer_other_side = true; |
| ... | @@ -226,24 +227,27 @@ public class Move : MonoBehaviour | ... | @@ -226,24 +227,27 @@ public class Move : MonoBehaviour |
| 226 | 227 | ||
| 227 | workout_flag = 0; | 228 | workout_flag = 0; |
| 228 | workout_flag2 = 0; | 229 | workout_flag2 = 0; |
| 229 | - total = 20; | 230 | + total = "20"; |
| 231 | + //tot = 20; | ||
| 230 | } | 232 | } |
| 231 | else if (exercise == "SideHiKick") | 233 | else if (exercise == "SideHiKick") |
| 232 | { | 234 | { |
| 233 | workout_flag = 0; | 235 | workout_flag = 0; |
| 234 | - total = 10; | 236 | + tot = 10; |
| 237 | + total = "20"; | ||
| 235 | 238 | ||
| 236 | } | 239 | } |
| 237 | else if (exercise == "Lunge") | 240 | else if (exercise == "Lunge") |
| 238 | { | 241 | { |
| 239 | workout_flag = 0; | 242 | workout_flag = 0; |
| 240 | - total = 10; | 243 | + tot = 10; |
| 244 | + total = "20"; | ||
| 241 | } | 245 | } |
| 242 | workout_count++; | 246 | workout_count++; |
| 243 | workout = false; | 247 | workout = false; |
| 244 | Debug.Log("트레이니: " + workout_count); | 248 | Debug.Log("트레이니: " + workout_count); |
| 245 | traineecnt = workout_count + "/" + total; | 249 | traineecnt = workout_count + "/" + total; |
| 246 | - Trainee_count.text = trainercnt; | 250 | + Trainee_count.text = traineecnt; |
| 247 | } | 251 | } |
| 248 | 252 | ||
| 249 | void Start() | 253 | void Start() |
| ... | @@ -251,7 +255,8 @@ public class Move : MonoBehaviour | ... | @@ -251,7 +255,8 @@ public class Move : MonoBehaviour |
| 251 | timer = 0; | 255 | timer = 0; |
| 252 | Trainner_count.text = ""; | 256 | Trainner_count.text = ""; |
| 253 | Trainee_count.text = ""; | 257 | Trainee_count.text = ""; |
| 254 | - total = 20; | 258 | + total = "20"; |
| 259 | + tot = 20; | ||
| 255 | 260 | ||
| 256 | skeleton_Trainnner = new CharacterSkeleton(Trainnner); | 261 | skeleton_Trainnner = new CharacterSkeleton(Trainnner); |
| 257 | skeleton_Trainnne = new CharacterSkeleton(Trainnne); | 262 | skeleton_Trainnne = new CharacterSkeleton(Trainnne); |
| ... | @@ -652,14 +657,14 @@ public class Move : MonoBehaviour | ... | @@ -652,14 +657,14 @@ public class Move : MonoBehaviour |
| 652 | } | 657 | } |
| 653 | else if (exercise == "Lunge") | 658 | else if (exercise == "Lunge") |
| 654 | { | 659 | { |
| 655 | - if (workout_count < 10) | 660 | + if (!trainer_other_side) |
| 656 | { | 661 | { |
| 657 | if (lunge_flag_l < 120 && ReadAngles[3] >= 91 && lunge_flag_l > ReadAngles[3]) | 662 | if (lunge_flag_l < 120 && ReadAngles[3] >= 91 && lunge_flag_l > ReadAngles[3]) |
| 658 | { | 663 | { |
| 659 | great = ""; | 664 | great = ""; |
| 660 | Great5.SetActive(false); | 665 | Great5.SetActive(false); |
| 661 | KneeDown6.SetActive(true); //무릎을 더 굽혀주세요. | 666 | KneeDown6.SetActive(true); //무릎을 더 굽혀주세요. |
| 662 | - flag = 1; | 667 | + |
| 663 | 668 | ||
| 664 | } | 669 | } |
| 665 | else if (ReadAngles[3] < 91) | 670 | else if (ReadAngles[3] < 91) |
| ... | @@ -668,7 +673,6 @@ public class Move : MonoBehaviour | ... | @@ -668,7 +673,6 @@ public class Move : MonoBehaviour |
| 668 | Great5.SetActive(true); | 673 | Great5.SetActive(true); |
| 669 | KneeDown6.SetActive(false); | 674 | KneeDown6.SetActive(false); |
| 670 | 675 | ||
| 671 | - flag = 1; | ||
| 672 | } | 676 | } |
| 673 | 677 | ||
| 674 | 678 | ||
| ... | @@ -704,7 +708,7 @@ public class Move : MonoBehaviour | ... | @@ -704,7 +708,7 @@ public class Move : MonoBehaviour |
| 704 | 708 | ||
| 705 | //////////////운동 횟수 카운트////////////////// | 709 | //////////////운동 횟수 카운트////////////////// |
| 706 | //오른쪽 | 710 | //오른쪽 |
| 707 | - if (workout_count >= 10 && ReadAngles[4] < 95 && workout && workout_flag >= 95) | 711 | + if (ReadAngles[4] < 95 && workout && workout_flag >= 95) |
| 708 | { | 712 | { |
| 709 | Trainee_Count(); | 713 | Trainee_Count(); |
| 710 | } | 714 | } | ... | ... |
-
Please register or login to post a comment