Showing
15 changed files
with
48 additions
and
46 deletions
... | @@ -474,8 +474,8 @@ RectTransform: | ... | @@ -474,8 +474,8 @@ RectTransform: |
474 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 474 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
475 | m_AnchorMin: {x: 0.5, y: 0.5} | 475 | m_AnchorMin: {x: 0.5, y: 0.5} |
476 | m_AnchorMax: {x: 0.5, y: 0.5} | 476 | m_AnchorMax: {x: 0.5, y: 0.5} |
477 | - m_AnchoredPosition: {x: 330, y: 150} | 477 | + m_AnchoredPosition: {x: 320, y: 150} |
478 | - m_SizeDelta: {x: 250, y: 30} | 478 | + m_SizeDelta: {x: 370, y: 50} |
479 | m_Pivot: {x: 0.5, y: 0.5} | 479 | m_Pivot: {x: 0.5, y: 0.5} |
480 | --- !u!114 &109009052 | 480 | --- !u!114 &109009052 |
481 | MonoBehaviour: | 481 | MonoBehaviour: |
... | @@ -858,17 +858,17 @@ RectTransform: | ... | @@ -858,17 +858,17 @@ RectTransform: |
858 | m_PrefabInstance: {fileID: 0} | 858 | m_PrefabInstance: {fileID: 0} |
859 | m_PrefabAsset: {fileID: 0} | 859 | m_PrefabAsset: {fileID: 0} |
860 | m_GameObject: {fileID: 310358198} | 860 | m_GameObject: {fileID: 310358198} |
861 | - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} | 861 | + m_LocalRotation: {x: 0, y: 0, z: 0.2588191, w: 0.9659258} |
862 | m_LocalPosition: {x: 0, y: 0, z: 0} | 862 | m_LocalPosition: {x: 0, y: 0, z: 0} |
863 | m_LocalScale: {x: 1, y: 1, z: 1} | 863 | m_LocalScale: {x: 1, y: 1, z: 1} |
864 | m_Children: [] | 864 | m_Children: [] |
865 | m_Father: {fileID: 1679758666} | 865 | m_Father: {fileID: 1679758666} |
866 | m_RootOrder: 18 | 866 | m_RootOrder: 18 |
867 | - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 867 | + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 30} |
868 | m_AnchorMin: {x: 0.5, y: 0.5} | 868 | m_AnchorMin: {x: 0.5, y: 0.5} |
869 | m_AnchorMax: {x: 0.5, y: 0.5} | 869 | m_AnchorMax: {x: 0.5, y: 0.5} |
870 | - m_AnchoredPosition: {x: 290, y: 100} | 870 | + m_AnchoredPosition: {x: 200, y: 90} |
871 | - m_SizeDelta: {x: 250, y: 30} | 871 | + m_SizeDelta: {x: 370, y: 50} |
872 | m_Pivot: {x: 0.5, y: 0.5} | 872 | m_Pivot: {x: 0.5, y: 0.5} |
873 | --- !u!114 &310358200 | 873 | --- !u!114 &310358200 |
874 | MonoBehaviour: | 874 | MonoBehaviour: |
... | @@ -938,8 +938,8 @@ RectTransform: | ... | @@ -938,8 +938,8 @@ RectTransform: |
938 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 938 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
939 | m_AnchorMin: {x: 0.5, y: 0.5} | 939 | m_AnchorMin: {x: 0.5, y: 0.5} |
940 | m_AnchorMax: {x: 0.5, y: 0.5} | 940 | m_AnchorMax: {x: 0.5, y: 0.5} |
941 | - m_AnchoredPosition: {x: 330, y: 150} | 941 | + m_AnchoredPosition: {x: 320, y: 210} |
942 | - m_SizeDelta: {x: 250, y: 30} | 942 | + m_SizeDelta: {x: 370, y: 50} |
943 | m_Pivot: {x: 0.5, y: 0.5} | 943 | m_Pivot: {x: 0.5, y: 0.5} |
944 | --- !u!114 &395084097 | 944 | --- !u!114 &395084097 |
945 | MonoBehaviour: | 945 | MonoBehaviour: |
... | @@ -1459,7 +1459,7 @@ RectTransform: | ... | @@ -1459,7 +1459,7 @@ RectTransform: |
1459 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 1459 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1460 | m_AnchorMin: {x: 0.5, y: 0.5} | 1460 | m_AnchorMin: {x: 0.5, y: 0.5} |
1461 | m_AnchorMax: {x: 0.5, y: 0.5} | 1461 | m_AnchorMax: {x: 0.5, y: 0.5} |
1462 | - m_AnchoredPosition: {x: 0, y: 250} | 1462 | + m_AnchoredPosition: {x: 0, y: -220} |
1463 | m_SizeDelta: {x: 320, y: 130} | 1463 | m_SizeDelta: {x: 320, y: 130} |
1464 | m_Pivot: {x: 0.5, y: 0.5} | 1464 | m_Pivot: {x: 0.5, y: 0.5} |
1465 | --- !u!114 &779933559 | 1465 | --- !u!114 &779933559 |
... | @@ -1822,7 +1822,7 @@ RectTransform: | ... | @@ -1822,7 +1822,7 @@ RectTransform: |
1822 | m_AnchorMin: {x: 0.5, y: 0.5} | 1822 | m_AnchorMin: {x: 0.5, y: 0.5} |
1823 | m_AnchorMax: {x: 0.5, y: 0.5} | 1823 | m_AnchorMax: {x: 0.5, y: 0.5} |
1824 | m_AnchoredPosition: {x: 330, y: 200} | 1824 | m_AnchoredPosition: {x: 330, y: 200} |
1825 | - m_SizeDelta: {x: 250, y: 30} | 1825 | + m_SizeDelta: {x: 370, y: 50} |
1826 | m_Pivot: {x: 0.5, y: 0.5} | 1826 | m_Pivot: {x: 0.5, y: 0.5} |
1827 | --- !u!114 &1089006722 | 1827 | --- !u!114 &1089006722 |
1828 | MonoBehaviour: | 1828 | MonoBehaviour: |
... | @@ -2337,8 +2337,8 @@ RectTransform: | ... | @@ -2337,8 +2337,8 @@ RectTransform: |
2337 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} | 2337 | m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
2338 | m_AnchorMin: {x: 0.5, y: 0.5} | 2338 | m_AnchorMin: {x: 0.5, y: 0.5} |
2339 | m_AnchorMax: {x: 0.5, y: 0.5} | 2339 | m_AnchorMax: {x: 0.5, y: 0.5} |
2340 | - m_AnchoredPosition: {x: 330, y: 150} | 2340 | + m_AnchoredPosition: {x: 320, y: 150} |
2341 | - m_SizeDelta: {x: 250, y: 30} | 2341 | + m_SizeDelta: {x: 370, y: 50} |
2342 | m_Pivot: {x: 0.5, y: 0.5} | 2342 | m_Pivot: {x: 0.5, y: 0.5} |
2343 | --- !u!114 &1484596777 | 2343 | --- !u!114 &1484596777 |
2344 | MonoBehaviour: | 2344 | MonoBehaviour: | ... | ... |
... | @@ -195,7 +195,7 @@ class CharacterSkeleton | ... | @@ -195,7 +195,7 @@ class CharacterSkeleton |
195 | } | 195 | } |
196 | } | 196 | } |
197 | 197 | ||
198 | - public void dasomset(float[] jt, int[] st, int offset, bool mirrored, bool move, Kinect.Joint sourceJoint, Transform jointObj) | 198 | + public void trainee_set(float[] jt, int[] st, int offset, bool mirrored, bool move, Kinect.Joint sourceJoint, Transform jointObj) |
199 | { | 199 | { |
200 | if (isSavedPosition == false && jointState[JointType_SpineBase] != TrackingState_NotTracked) | 200 | if (isSavedPosition == false && jointState[JointType_SpineBase] != TrackingState_NotTracked) |
201 | { | 201 | { |
... | @@ -268,7 +268,7 @@ class CharacterSkeleton | ... | @@ -268,7 +268,7 @@ class CharacterSkeleton |
268 | } | 268 | } |
269 | 269 | ||
270 | 270 | ||
271 | - public void dasomset_trainer(float[] jt, int[] st, int offset, bool mirrored, bool move) | 271 | + public void trainer_set(float[] jt, int[] st, int offset, bool mirrored, bool move) |
272 | { | 272 | { |
273 | if (isSavedPosition == false && jointState[JointType_SpineBase] != TrackingState_NotTracked) | 273 | if (isSavedPosition == false && jointState[JointType_SpineBase] != TrackingState_NotTracked) |
274 | { | 274 | { | ... | ... |
... | @@ -95,11 +95,11 @@ public class ClickExercise : MonoBehaviour | ... | @@ -95,11 +95,11 @@ public class ClickExercise : MonoBehaviour |
95 | if (pos.x >= 60 && pos.x <= 285 && pos.y >= 335 && pos.y <= 640 && pos.z == 200) { | 95 | if (pos.x >= 60 && pos.x <= 285 && pos.y >= 335 && pos.y <= 640 && pos.z == 200) { |
96 | //스쿼트 | 96 | //스쿼트 |
97 | timer += Time.deltaTime; | 97 | timer += Time.deltaTime; |
98 | - Debug.Log("Timer: " + timer); | 98 | + //Debug.Log("Timer: " + timer); |
99 | 99 | ||
100 | if (timer > 2.5) | 100 | if (timer > 2.5) |
101 | { | 101 | { |
102 | - Debug.Log("Clicked"); | 102 | + //Debug.Log("Clicked"); |
103 | ////// | 103 | ////// |
104 | selected_exercise = "Squat"; //Squat 넘겨줌 | 104 | selected_exercise = "Squat"; //Squat 넘겨줌 |
105 | GameObject tempBtn = btnParent.transform.GetChild(3).gameObject; | 105 | GameObject tempBtn = btnParent.transform.GetChild(3).gameObject; |
... | @@ -107,7 +107,7 @@ public class ClickExercise : MonoBehaviour | ... | @@ -107,7 +107,7 @@ public class ClickExercise : MonoBehaviour |
107 | 107 | ||
108 | if (btnImage.name == "Squat") | 108 | if (btnImage.name == "Squat") |
109 | { | 109 | { |
110 | - Debug.Log("Squat"); | 110 | + //Debug.Log("Squat"); |
111 | btnImage.texture = Resources.Load("Squat_on", typeof(Texture2D)) as Texture2D; | 111 | btnImage.texture = Resources.Load("Squat_on", typeof(Texture2D)) as Texture2D; |
112 | } | 112 | } |
113 | 113 | ||
... | @@ -124,11 +124,11 @@ public class ClickExercise : MonoBehaviour | ... | @@ -124,11 +124,11 @@ public class ClickExercise : MonoBehaviour |
124 | else if(pos.x >= 400 && pos.x <= 625 && pos.y >= 335 && pos.y <= 640 && pos.z == 200){ | 124 | else if(pos.x >= 400 && pos.x <= 625 && pos.y >= 335 && pos.y <= 640 && pos.z == 200){ |
125 | //사이드하이킥 | 125 | //사이드하이킥 |
126 | timer += Time.deltaTime; | 126 | timer += Time.deltaTime; |
127 | - Debug.Log("Timer: " + timer); | 127 | + // Debug.Log("Timer: " + timer); |
128 | 128 | ||
129 | if (timer > 2.5) | 129 | if (timer > 2.5) |
130 | { | 130 | { |
131 | - Debug.Log("Clicked"); | 131 | + // Debug.Log("Clicked"); |
132 | ///// | 132 | ///// |
133 | selected_exercise = "SideHiKick"; //SideHiKick 넘겨줌 | 133 | selected_exercise = "SideHiKick"; //SideHiKick 넘겨줌 |
134 | GameObject tempBtn = btnParent.transform.GetChild(2).gameObject; | 134 | GameObject tempBtn = btnParent.transform.GetChild(2).gameObject; |
... | @@ -136,7 +136,7 @@ public class ClickExercise : MonoBehaviour | ... | @@ -136,7 +136,7 @@ public class ClickExercise : MonoBehaviour |
136 | 136 | ||
137 | if (btnImage.name == "SideHiKick") | 137 | if (btnImage.name == "SideHiKick") |
138 | { | 138 | { |
139 | - Debug.Log("SideHiKick"); | 139 | + // Debug.Log("SideHiKick"); |
140 | btnImage.texture = Resources.Load("SideHiKick_on", typeof(Texture2D)) as Texture2D; | 140 | btnImage.texture = Resources.Load("SideHiKick_on", typeof(Texture2D)) as Texture2D; |
141 | } | 141 | } |
142 | 142 | ||
... | @@ -154,11 +154,11 @@ public class ClickExercise : MonoBehaviour | ... | @@ -154,11 +154,11 @@ public class ClickExercise : MonoBehaviour |
154 | { | 154 | { |
155 | //런지 | 155 | //런지 |
156 | timer += Time.deltaTime; | 156 | timer += Time.deltaTime; |
157 | - Debug.Log("Timer: " + timer); | 157 | + //Debug.Log("Timer: " + timer); |
158 | 158 | ||
159 | if (timer > 2.5) | 159 | if (timer > 2.5) |
160 | { | 160 | { |
161 | - Debug.Log("Clicked"); | 161 | + // Debug.Log("Clicked"); |
162 | ////// | 162 | ////// |
163 | selected_exercise = "Lunge"; //Lunge 넘겨줌 | 163 | selected_exercise = "Lunge"; //Lunge 넘겨줌 |
164 | 164 | ||
... | @@ -167,7 +167,7 @@ public class ClickExercise : MonoBehaviour | ... | @@ -167,7 +167,7 @@ public class ClickExercise : MonoBehaviour |
167 | 167 | ||
168 | if (btnImage.name == "Lunge") | 168 | if (btnImage.name == "Lunge") |
169 | { | 169 | { |
170 | - Debug.Log("Lunge"); | 170 | + // Debug.Log("Lunge"); |
171 | btnImage.texture = Resources.Load("Lunge_on", typeof(Texture2D)) as Texture2D; | 171 | btnImage.texture = Resources.Load("Lunge_on", typeof(Texture2D)) as Texture2D; |
172 | } | 172 | } |
173 | 173 | ... | ... |
... | @@ -28,7 +28,7 @@ public class Final : MonoBehaviour | ... | @@ -28,7 +28,7 @@ public class Final : MonoBehaviour |
28 | void Update() | 28 | void Update() |
29 | { | 29 | { |
30 | pos = follow.transform.position; | 30 | pos = follow.transform.position; |
31 | - Debug.Log(pos); | 31 | + //Debug.Log(pos); |
32 | 32 | ||
33 | 33 | ||
34 | if (pos.x >= 290 && pos.x <= 725 && pos.y >= 265 && pos.y <= 315 && pos.z == 200) | 34 | if (pos.x >= 290 && pos.x <= 725 && pos.y >= 265 && pos.y <= 315 && pos.z == 200) |
... | @@ -37,7 +37,7 @@ public class Final : MonoBehaviour | ... | @@ -37,7 +37,7 @@ public class Final : MonoBehaviour |
37 | 37 | ||
38 | if (timer1 > 2.5) | 38 | if (timer1 > 2.5) |
39 | { | 39 | { |
40 | - Debug.Log("Clicked"); | 40 | + //Debug.Log("Clicked"); |
41 | SceneManager.LoadScene("Start"); | 41 | SceneManager.LoadScene("Start"); |
42 | } | 42 | } |
43 | } | 43 | } |
... | @@ -50,7 +50,7 @@ public class Final : MonoBehaviour | ... | @@ -50,7 +50,7 @@ public class Final : MonoBehaviour |
50 | 50 | ||
51 | if (timer2 > 2.5) | 51 | if (timer2 > 2.5) |
52 | { | 52 | { |
53 | - Debug.Log("Clicked"); | 53 | + // Debug.Log("Clicked"); |
54 | SceneManager.LoadScene("Intro"); | 54 | SceneManager.LoadScene("Intro"); |
55 | } | 55 | } |
56 | 56 | ... | ... |
... | @@ -97,7 +97,7 @@ public class Move : MonoBehaviour | ... | @@ -97,7 +97,7 @@ public class Move : MonoBehaviour |
97 | trainer_timer += Time.deltaTime; | 97 | trainer_timer += Time.deltaTime; |
98 | if (trainer_timer > 3) | 98 | if (trainer_timer > 3) |
99 | { | 99 | { |
100 | - Debug.Log("3초 됨 운동 끝!!!!!"); //결과씬이나 다른씬으로 | 100 | + //Debug.Log("3초 됨 운동 끝!!!!!"); //결과씬이나 다른씬으로 |
101 | trainer_check_outside = false; | 101 | trainer_check_outside = false; |
102 | 102 | ||
103 | Squat_Title.SetActive(false); | 103 | Squat_Title.SetActive(false); |
... | @@ -116,21 +116,21 @@ public class Move : MonoBehaviour | ... | @@ -116,21 +116,21 @@ public class Move : MonoBehaviour |
116 | if (trainer_count < 20 && exercise == "Squat") | 116 | if (trainer_count < 20 && exercise == "Squat") |
117 | { | 117 | { |
118 | trainer_count++; | 118 | trainer_count++; |
119 | - Debug.Log("카운트 : " + trainer_count); | 119 | + //Debug.Log("카운트 : " + trainer_count); |
120 | trainercnt = trainer_count + "/20"; | 120 | trainercnt = trainer_count + "/20"; |
121 | Trainner_count.text = trainercnt; | 121 | Trainner_count.text = trainercnt; |
122 | } | 122 | } |
123 | if (trainer_count < 10 && exercise == "SideHiKick") | 123 | if (trainer_count < 10 && exercise == "SideHiKick") |
124 | { | 124 | { |
125 | trainer_count++; | 125 | trainer_count++; |
126 | - Debug.Log("카운트 : " + trainer_count); | 126 | + // Debug.Log("카운트 : " + trainer_count); |
127 | trainercnt = trainer_count + "/10"; | 127 | trainercnt = trainer_count + "/10"; |
128 | Trainner_count.text = trainercnt; | 128 | Trainner_count.text = trainercnt; |
129 | } | 129 | } |
130 | if (trainer_count < 10 && exercise == "Lunge") | 130 | if (trainer_count < 10 && exercise == "Lunge") |
131 | { | 131 | { |
132 | trainer_count++; | 132 | trainer_count++; |
133 | - Debug.Log("카운트 : " + trainer_count); | 133 | + // Debug.Log("카운트 : " + trainer_count); |
134 | trainercnt = trainer_count + "/10"; | 134 | trainercnt = trainer_count + "/10"; |
135 | Trainner_count.text = trainercnt; | 135 | Trainner_count.text = trainercnt; |
136 | } | 136 | } |
... | @@ -209,7 +209,7 @@ public class Move : MonoBehaviour | ... | @@ -209,7 +209,7 @@ public class Move : MonoBehaviour |
209 | { | 209 | { |
210 | trainer_state[trainer_i - 2] = 1; | 210 | trainer_state[trainer_i - 2] = 1; |
211 | } | 211 | } |
212 | - skeleton_Trainnner.dasomset_trainer(trainer_data1, trainer_state, 0, true, true); | 212 | + skeleton_Trainnner.trainer_set(trainer_data1, trainer_state, 0, true, true); |
213 | trainer_j = trainer_j + 3; | 213 | trainer_j = trainer_j + 3; |
214 | } | 214 | } |
215 | if (speed < trainer_speed) | 215 | if (speed < trainer_speed) |
... | @@ -253,7 +253,7 @@ public class Move : MonoBehaviour | ... | @@ -253,7 +253,7 @@ public class Move : MonoBehaviour |
253 | } | 253 | } |
254 | workout_count++; | 254 | workout_count++; |
255 | workout = false; | 255 | workout = false; |
256 | - Debug.Log("트레이니: " + workout_count); | 256 | + //Debug.Log("트레이니: " + workout_count); |
257 | traineecnt = workout_count + "/" + total; | 257 | traineecnt = workout_count + "/" + total; |
258 | Trainee_count.text = traineecnt; | 258 | Trainee_count.text = traineecnt; |
259 | } | 259 | } |
... | @@ -276,29 +276,31 @@ public class Move : MonoBehaviour | ... | @@ -276,29 +276,31 @@ public class Move : MonoBehaviour |
276 | 276 | ||
277 | exercise = ClickExercise.selected_exercise; //ClickExercise에서 선택한 운동이 무엇인지 String으로 넘어옴. | 277 | exercise = ClickExercise.selected_exercise; //ClickExercise에서 선택한 운동이 무엇인지 String으로 넘어옴. |
278 | 278 | ||
279 | - Debug.Log(exercise); //Squat, SideHiKick, Lunge 에 따라서 Trainer움직이고, 사용자에게 instruction주기 | 279 | + // Debug.Log(exercise); //Squat, SideHiKick, Lunge 에 따라서 Trainer움직이고, 사용자에게 instruction주기 |
280 | 280 | ||
281 | if (exercise == "Squat") | 281 | if (exercise == "Squat") |
282 | { | 282 | { |
283 | + | ||
283 | lines = File.ReadAllLines(@"Trainer_txt/squart.txt"); | 284 | lines = File.ReadAllLines(@"Trainer_txt/squart.txt"); |
284 | - Debug.Log("읽음"); | 285 | + // Debug.Log("읽음"); |
285 | } | 286 | } |
286 | else if (exercise == "SideHiKick") | 287 | else if (exercise == "SideHiKick") |
287 | { | 288 | { |
289 | + | ||
288 | lines = File.ReadAllLines(@"Trainer_txt/leg_right.txt"); | 290 | lines = File.ReadAllLines(@"Trainer_txt/leg_right.txt"); |
289 | lines_right = File.ReadAllLines(@"Trainer_txt/leg_left.txt"); | 291 | lines_right = File.ReadAllLines(@"Trainer_txt/leg_left.txt"); |
290 | - Debug.Log("읽음"); | 292 | + //Debug.Log("읽음"); |
291 | } | 293 | } |
292 | else if (exercise == "Lunge") | 294 | else if (exercise == "Lunge") |
293 | - { | 295 | + { |
294 | lines = File.ReadAllLines(@"Trainer_txt/runzi_right.txt"); | 296 | lines = File.ReadAllLines(@"Trainer_txt/runzi_right.txt"); |
295 | lines_right = File.ReadAllLines(@"Trainer_txt/runzi_left.txt"); | 297 | lines_right = File.ReadAllLines(@"Trainer_txt/runzi_left.txt"); |
296 | - Debug.Log("읽음"); | 298 | + // Debug.Log("읽음"); |
297 | } | 299 | } |
298 | else | 300 | else |
299 | { | 301 | { |
300 | lines = File.ReadAllLines(@"Trainer_txt/squart.txt"); | 302 | lines = File.ReadAllLines(@"Trainer_txt/squart.txt"); |
301 | - Debug.Log("읽음"); | 303 | + //Debug.Log("읽음"); |
302 | } | 304 | } |
303 | 305 | ||
304 | workout_count = 0; | 306 | workout_count = 0; |
... | @@ -553,7 +555,7 @@ public class Move : MonoBehaviour | ... | @@ -553,7 +555,7 @@ public class Move : MonoBehaviour |
553 | { | 555 | { |
554 | state[i - 2] = 1; | 556 | state[i - 2] = 1; |
555 | } | 557 | } |
556 | - skeleton_Trainnne.dasomset(data1, state, 0, true, true, body.Joints[jt], jointObj); | 558 | + skeleton_Trainnne.trainee_set(data1, state, 0, true, true, body.Joints[jt], jointObj); |
557 | 559 | ||
558 | /* | 560 | /* |
559 | LineRenderer lr = jointObj.GetComponent<LineRenderer>(); | 561 | LineRenderer lr = jointObj.GetComponent<LineRenderer>(); | ... | ... |
... | @@ -200,7 +200,7 @@ public class MoveTrainee : MonoBehaviour | ... | @@ -200,7 +200,7 @@ public class MoveTrainee : MonoBehaviour |
200 | { | 200 | { |
201 | state[i - 2] = 1; | 201 | state[i - 2] = 1; |
202 | } | 202 | } |
203 | - skeleton.dasomset(data1, state, 0, true, true, body.Joints[jt], jointObj); | 203 | + skeleton.trainee_set(data1, state, 0, true, true, body.Joints[jt], jointObj); |
204 | 204 | ||
205 | /* | 205 | /* |
206 | LineRenderer lr = jointObj.GetComponent<LineRenderer>(); | 206 | LineRenderer lr = jointObj.GetComponent<LineRenderer>(); | ... | ... |
... | @@ -201,7 +201,7 @@ public class MoveTrainner : MonoBehaviour | ... | @@ -201,7 +201,7 @@ public class MoveTrainner : MonoBehaviour |
201 | { | 201 | { |
202 | state[i - 2] = 1; | 202 | state[i - 2] = 1; |
203 | } | 203 | } |
204 | - skeleton.dasomset(data1, state, 0, true, true, body.Joints[jt], jointObj); | 204 | + skeleton.trainee_set(data1, state, 0, true, true, body.Joints[jt], jointObj); |
205 | 205 | ||
206 | LineRenderer lr = jointObj.GetComponent<LineRenderer>(); | 206 | LineRenderer lr = jointObj.GetComponent<LineRenderer>(); |
207 | if (targetJoint.HasValue) | 207 | if (targetJoint.HasValue) | ... | ... |
... | @@ -16,7 +16,7 @@ public class Result : MonoBehaviour | ... | @@ -16,7 +16,7 @@ public class Result : MonoBehaviour |
16 | { | 16 | { |
17 | timer = 0; | 17 | timer = 0; |
18 | num = Move.traineecnt; | 18 | num = Move.traineecnt; |
19 | - Debug.Log(num); | 19 | + //Debug.Log(num); |
20 | } | 20 | } |
21 | 21 | ||
22 | // Update is called once per frame | 22 | // Update is called once per frame | ... | ... |
... | @@ -15,7 +15,7 @@ public class Title : MonoBehaviour | ... | @@ -15,7 +15,7 @@ public class Title : MonoBehaviour |
15 | 15 | ||
16 | private void Start() | 16 | private void Start() |
17 | { | 17 | { |
18 | - Debug.Log("Start"); | 18 | + // Debug.Log("Start"); |
19 | follow = GameObject.Find("follow").gameObject; | 19 | follow = GameObject.Find("follow").gameObject; |
20 | } | 20 | } |
21 | 21 | ||
... | @@ -26,7 +26,7 @@ public class Title : MonoBehaviour | ... | @@ -26,7 +26,7 @@ public class Title : MonoBehaviour |
26 | 26 | ||
27 | void Update() | 27 | void Update() |
28 | { | 28 | { |
29 | - Debug.Log("Update"); | 29 | + // Debug.Log("Update"); |
30 | 30 | ||
31 | pos = follow.transform.position; | 31 | pos = follow.transform.position; |
32 | //Debug.Log(pos); | 32 | //Debug.Log(pos); |
... | @@ -34,10 +34,10 @@ public class Title : MonoBehaviour | ... | @@ -34,10 +34,10 @@ public class Title : MonoBehaviour |
34 | 34 | ||
35 | if (pos.x >= 360 && pos.x <= 600 && pos.y >= 180 && pos.y <= 200 &&pos.z == 200) { | 35 | if (pos.x >= 360 && pos.x <= 600 && pos.y >= 180 && pos.y <= 200 &&pos.z == 200) { |
36 | timer += Time.deltaTime; | 36 | timer += Time.deltaTime; |
37 | - Debug.Log("Timer: "+ timer); | 37 | + // Debug.Log("Timer: "+ timer); |
38 | 38 | ||
39 | if (timer > 2.5) { | 39 | if (timer > 2.5) { |
40 | - Debug.Log("Clicked"); | 40 | + // Debug.Log("Clicked"); |
41 | SceneManager.LoadScene(SceneToLoad); | 41 | SceneManager.LoadScene(SceneToLoad); |
42 | } | 42 | } |
43 | 43 | ... | ... |
-
Please register or login to post a comment