2020-1-capstone-design1 / LSK_Project1

Go to a project
Toggle navigation Toggle navigation pinning
고다경
07c2a7ab 1 parent 49c67124

Final Scene follow 움직임, 포즈 인식 구현

Inline Side-by-side
Showing 7 changed files with 164 additions and 7 deletions
...@@ -708,7 +708,7 @@ MonoBehaviour: ...@@ -708,7 +708,7 @@ MonoBehaviour:
708 m_OnClick: 708 m_OnClick:
709 m_PersistentCalls: 709 m_PersistentCalls:
710 m_Calls: 710 m_Calls:
711 - - m_Target: {fileID: 1816730611} 711 + - m_Target: {fileID: 0}
712 m_MethodName: LoadGame 712 m_MethodName: LoadGame
713 m_Mode: 1 713 m_Mode: 1
714 m_Arguments: 714 m_Arguments:
...@@ -1079,7 +1079,7 @@ MonoBehaviour: ...@@ -1079,7 +1079,7 @@ MonoBehaviour:
1079 m_OnClick: 1079 m_OnClick:
1080 m_PersistentCalls: 1080 m_PersistentCalls:
1081 m_Calls: 1081 m_Calls:
1082 - - m_Target: {fileID: 1816730611} 1082 + - m_Target: {fileID: 0}
1083 m_MethodName: LoadGame 1083 m_MethodName: LoadGame
1084 m_Mode: 1 1084 m_Mode: 1
1085 m_Arguments: 1085 m_Arguments:
...@@ -1176,8 +1176,8 @@ GameObject: ...@@ -1176,8 +1176,8 @@ GameObject:
1176 serializedVersion: 6 1176 serializedVersion: 6
1177 m_Component: 1177 m_Component:
1178 - component: {fileID: 1816730612} 1178 - component: {fileID: 1816730612}
1179 - - component: {fileID: 1816730611}
1180 - component: {fileID: 1816730610} 1179 - component: {fileID: 1816730610}
1180 + - component: {fileID: 1816730611}
1181 m_Layer: 0 1181 m_Layer: 0
1182 m_Name: Game Manager 1182 m_Name: Game Manager
1183 m_TagString: Untagged 1183 m_TagString: Untagged
...@@ -1244,10 +1244,9 @@ MonoBehaviour: ...@@ -1244,10 +1244,9 @@ MonoBehaviour:
1244 m_GameObject: {fileID: 1816730609} 1244 m_GameObject: {fileID: 1816730609}
1245 m_Enabled: 1 1245 m_Enabled: 1
1246 m_EditorHideFlags: 0 1246 m_EditorHideFlags: 0
1247 - m_Script: {fileID: 11500000, guid: 148ae4c33b84b7241ab4a900f8ab1e9c, type: 3} 1247 + m_Script: {fileID: 11500000, guid: 3af9c1c60f4b821408457bded93ec384, type: 3}
1248 m_Name: 1248 m_Name:
1249 m_EditorClassIdentifier: 1249 m_EditorClassIdentifier:
1250 - SceneToLoad: Start
1251 --- !u!4 &1816730612 1250 --- !u!4 &1816730612
1252 Transform: 1251 Transform:
1253 m_ObjectHideFlags: 0 1252 m_ObjectHideFlags: 0
......
...@@ -798,6 +798,7 @@ RectTransform: ...@@ -798,6 +798,7 @@ RectTransform:
798 - {fileID: 553455690} 798 - {fileID: 553455690}
799 - {fileID: 338496205} 799 - {fileID: 338496205}
800 - {fileID: 45627341} 800 - {fileID: 45627341}
801 + - {fileID: 1668275442}
801 m_Father: {fileID: 0} 802 m_Father: {fileID: 0}
802 m_RootOrder: 0 803 m_RootOrder: 0
803 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} 804 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -898,6 +899,84 @@ Transform: ...@@ -898,6 +899,84 @@ Transform:
898 m_Father: {fileID: 0} 899 m_Father: {fileID: 0}
899 m_RootOrder: 6 900 m_RootOrder: 6
900 m_LocalEulerAnglesHint: {x: 5, y: -30, z: 0} 901 m_LocalEulerAnglesHint: {x: 5, y: -30, z: 0}
902 +--- !u!1 &1668275441
903 +GameObject:
904 + m_ObjectHideFlags: 0
905 + m_CorrespondingSourceObject: {fileID: 0}
906 + m_PrefabInstance: {fileID: 0}
907 + m_PrefabAsset: {fileID: 0}
908 + serializedVersion: 6
909 + m_Component:
910 + - component: {fileID: 1668275442}
911 + - component: {fileID: 1668275444}
912 + - component: {fileID: 1668275443}
913 + m_Layer: 5
914 + m_Name: Num_Of_Great
915 + m_TagString: Untagged
916 + m_Icon: {fileID: 0}
917 + m_NavMeshLayer: 0
918 + m_StaticEditorFlags: 0
919 + m_IsActive: 1
920 +--- !u!224 &1668275442
921 +RectTransform:
922 + m_ObjectHideFlags: 0
923 + m_CorrespondingSourceObject: {fileID: 0}
924 + m_PrefabInstance: {fileID: 0}
925 + m_PrefabAsset: {fileID: 0}
926 + m_GameObject: {fileID: 1668275441}
927 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
928 + m_LocalPosition: {x: 0, y: 0, z: 0}
929 + m_LocalScale: {x: 2, y: 2, z: 1}
930 + m_Children: []
931 + m_Father: {fileID: 1101068127}
932 + m_RootOrder: 3
933 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
934 + m_AnchorMin: {x: 0.5, y: 0.5}
935 + m_AnchorMax: {x: 0.5, y: 0.5}
936 + m_AnchoredPosition: {x: 450, y: 50}
937 + m_SizeDelta: {x: 200, y: 100}
938 + m_Pivot: {x: 0.5, y: 0.5}
939 +--- !u!114 &1668275443
940 +MonoBehaviour:
941 + m_ObjectHideFlags: 0
942 + m_CorrespondingSourceObject: {fileID: 0}
943 + m_PrefabInstance: {fileID: 0}
944 + m_PrefabAsset: {fileID: 0}
945 + m_GameObject: {fileID: 1668275441}
946 + m_Enabled: 1
947 + m_EditorHideFlags: 0
948 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
949 + m_Name:
950 + m_EditorClassIdentifier:
951 + m_Material: {fileID: 0}
952 + m_Color: {r: 0.9176471, g: 0.31764707, b: 0.46274513, a: 1}
953 + m_RaycastTarget: 1
954 + m_Maskable: 1
955 + m_OnCullStateChanged:
956 + m_PersistentCalls:
957 + m_Calls: []
958 + m_FontData:
959 + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
960 + m_FontSize: 25
961 + m_FontStyle: 3
962 + m_BestFit: 0
963 + m_MinSize: 1
964 + m_MaxSize: 50
965 + m_Alignment: 0
966 + m_AlignByGeometry: 0
967 + m_RichText: 1
968 + m_HorizontalOverflow: 0
969 + m_VerticalOverflow: 0
970 + m_LineSpacing: 1
971 + m_Text:
972 +--- !u!222 &1668275444
973 +CanvasRenderer:
974 + m_ObjectHideFlags: 0
975 + m_CorrespondingSourceObject: {fileID: 0}
976 + m_PrefabInstance: {fileID: 0}
977 + m_PrefabAsset: {fileID: 0}
978 + m_GameObject: {fileID: 1668275441}
979 + m_CullTransparentMesh: 0
901 --- !u!1 &1672269659 980 --- !u!1 &1672269659
902 GameObject: 981 GameObject:
903 m_ObjectHideFlags: 0 982 m_ObjectHideFlags: 0
...@@ -984,3 +1063,4 @@ MonoBehaviour: ...@@ -984,3 +1063,4 @@ MonoBehaviour:
984 m_Script: {fileID: 11500000, guid: 60e42eccbe56e254e880952a601c780a, type: 3} 1063 m_Script: {fileID: 11500000, guid: 60e42eccbe56e254e880952a601c780a, type: 3}
985 m_Name: 1064 m_Name:
986 m_EditorClassIdentifier: 1065 m_EditorClassIdentifier:
1066 + NumOfGreat: {fileID: 1668275443}
......
1 +using System.Collections;
2 +using System.Collections.Generic;
3 +using UnityEngine;
4 +using UnityEngine.SceneManagement;
5 +
6 +
7 +public class Final : MonoBehaviour
8 +{
9 + GameObject follow; //커서
10 + Vector3 pos;
11 + private float timer1;
12 + private float timer2;
13 +
14 + public string SceneToLoad;
15 +
16 +
17 + // Start is called before the first frame update
18 + void Start()
19 + {
20 + follow = GameObject.Find("follow").gameObject;
21 + pos = follow.transform.position;
22 +
23 + timer1 = 0;
24 + timer2 = 0;
25 + }
26 +
27 + // Update is called once per frame
28 + void Update()
29 + {
30 + pos = follow.transform.position;
31 + Debug.Log(pos);
32 +
33 +
34 + if (pos.x >= 290 && pos.x <= 725 && pos.y >= 265 && pos.y <= 315 && pos.z == 200)
35 + {
36 + timer1 += Time.deltaTime;
37 +
38 + if (timer1 > 2.5)
39 + {
40 + Debug.Log("Clicked");
41 + SceneManager.LoadScene(SceneToLoad);
42 + }
43 + }
44 +
45 +
46 +
47 + if (pos.x >= 290 && pos.x <= 725 && pos.y >= 95 && pos.y <= 158 && pos.z == 200)
48 + {
49 + timer2 += Time.deltaTime;
50 +
51 + if (timer2 > 2.5)
52 + {
53 + Debug.Log("Clicked");
54 + SceneManager.LoadScene(SceneToLoad);
55 + }
56 +
57 + }
58 + }
59 +}
1 +fileFormatVersion: 2
2 +guid: 3af9c1c60f4b821408457bded93ec384
3 +MonoImporter:
4 + externalObjects: {}
5 + serializedVersion: 2
6 + defaultReferences: []
7 + executionOrder: 0
8 + icon: {instanceID: 0}
9 + userData:
10 + assetBundleName:
11 + assetBundleVariant:
...@@ -60,7 +60,7 @@ public class Move : MonoBehaviour ...@@ -60,7 +60,7 @@ public class Move : MonoBehaviour
60 public Text Great; 60 public Text Great;
61 61
62 public Text Trainner_count, Trainee_count; 62 public Text Trainner_count, Trainee_count;
63 - string trainercnt, traineecnt; 63 + public static string trainercnt, traineecnt;
64 64
65 string hipbal, leftkneewarning, rightkneewarning, leftsidehighkick, rightsidehighkick; 65 string hipbal, leftkneewarning, rightkneewarning, leftsidehighkick, rightsidehighkick;
66 string spinestraight, pullhipback, great; 66 string spinestraight, pullhipback, great;
......
...@@ -2,20 +2,28 @@ ...@@ -2,20 +2,28 @@
2 using System.Collections.Generic; 2 using System.Collections.Generic;
3 using UnityEngine; 3 using UnityEngine;
4 using UnityEngine.SceneManagement; 4 using UnityEngine.SceneManagement;
5 +using UnityEngine.UI;
5 6
6 public class Result : MonoBehaviour 7 public class Result : MonoBehaviour
7 { 8 {
8 private float timer; 9 private float timer;
9 10
11 + string num;
12 + public Text NumOfGreat;
13 +
10 // Start is called before the first frame update 14 // Start is called before the first frame update
11 void Start() 15 void Start()
12 { 16 {
13 timer = 0; 17 timer = 0;
18 + num = Move.traineecnt;
19 + NumOfGreat.text = "";
14 } 20 }
15 21
16 // Update is called once per frame 22 // Update is called once per frame
17 void Update() 23 void Update()
18 { 24 {
25 + NumOfGreat.text = num;
26 +
19 timer += Time.deltaTime; 27 timer += Time.deltaTime;
20 if (timer > 5) 28 if (timer > 5)
21 { 29 {
......
...@@ -29,7 +29,7 @@ public class Title : MonoBehaviour ...@@ -29,7 +29,7 @@ public class Title : MonoBehaviour
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);
33 33
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) {
......