+++ VRTK/00.DEVCENTRAL/App/assets/ptcl_healeffectobj
Binary file is not shown |
+++ VRTK/00.DEVCENTRAL/App/assets/scene_assetbundle_names.json
... | ... | @@ -0,0 +1,16 @@ |
1 | +{ | |
2 | + "datalist": [ | |
3 | + { | |
4 | + "scene": "PlayScene", | |
5 | + "bundleName": [ | |
6 | + "vrui_vrui", | |
7 | + "vrui_common", | |
8 | + "vrui_animplay", | |
9 | + "ptcl_healeffectobj", | |
10 | + "vrobj_mirrorcustom", | |
11 | + "vrmap_lobby01", | |
12 | + "vrmap_tkgym" | |
13 | + ] | |
14 | + } | |
15 | + ] | |
16 | +}(파일 끝에 줄바꿈 문자 없음) |
+++ VRTK/00.DEVCENTRAL/App/assets/taekwondo_contents_by_instructors.json
... | ... | @@ -0,0 +1,196 @@ |
1 | +{ | |
2 | + "datalist" : [ | |
3 | + { | |
4 | + "instructorId": 1001, | |
5 | + "nameKey": "taekwondo_coach_01", | |
6 | + "bundleName": "go0003", | |
7 | + "contents" : [ | |
8 | + { "contentNameKey": "Tk_01", "difficulty": 1, "length": "02:00" }, | |
9 | + { "contentNameKey": "Tk_02", "difficulty": 1, "length": "02:00" }, | |
10 | + { "contentNameKey": "Tk_03", "difficulty": 1, "length": "02:00" }, | |
11 | + { "contentNameKey": "Tk_04", "difficulty": 1, "length": "02:00" }, | |
12 | + { "contentNameKey": "Tk_05", "difficulty": 1, "length": "02:00" }, | |
13 | + { "contentNameKey": "Tk_06", "difficulty": 1, "length": "02:00" }, | |
14 | + { "contentNameKey": "Tk_07", "difficulty": 1, "length": "02:00" }, | |
15 | + { "contentNameKey": "Tk_08", "difficulty": 1, "length": "02:00" }, | |
16 | + { "contentNameKey": "Tk_Korye", "difficulty": 2, "length": "02:00" }, | |
17 | + { "contentNameKey": "Tk_Keumgang", "difficulty": 2, "length": "02:00" }, | |
18 | + { "contentNameKey": "Tk_Taebaek", "difficulty": 2, "length": "02:00" }, | |
19 | + { "contentNameKey": "Tk_Pyongwon", "difficulty": 2, "length": "02:00" }, | |
20 | + { "contentNameKey": "Tk_Sipjin", "difficulty": 2, "length": "02:00" }, | |
21 | + { "contentNameKey": "Tk_Jitae", "difficulty": 2, "length": "02:00" }, | |
22 | + { "contentNameKey": "Tk_Cheonkwon", "difficulty": 2, "length": "02:00" }, | |
23 | + { "contentNameKey": "Tk_Hansu", "difficulty": 2, "length": "02:00" }, | |
24 | + { "contentNameKey": "Tk_Ilyo", "difficulty": 2, "length": "02:00" } | |
25 | + ] | |
26 | + }, | |
27 | + { | |
28 | + "instructorId": 1002, | |
29 | + "nameKey": "taekwondo_coach_02", | |
30 | + "bundleName": "go0003", | |
31 | + "contents" : [ | |
32 | + { "contentNameKey": "Tk_01", "difficulty": 1, "length": "02:00" }, | |
33 | + { "contentNameKey": "Tk_02", "difficulty": 1, "length": "02:00" }, | |
34 | + { "contentNameKey": "Tk_03", "difficulty": 1, "length": "02:00" }, | |
35 | + { "contentNameKey": "Tk_04", "difficulty": 1, "length": "02:00" }, | |
36 | + { "contentNameKey": "Tk_05", "difficulty": 1, "length": "02:00" }, | |
37 | + { "contentNameKey": "Tk_06", "difficulty": 1, "length": "02:00" }, | |
38 | + { "contentNameKey": "Tk_07", "difficulty": 1, "length": "02:00" }, | |
39 | + { "contentNameKey": "Tk_08", "difficulty": 1, "length": "02:00" }, | |
40 | + { "contentNameKey": "Tk_Korye", "difficulty": 2, "length": "02:00" }, | |
41 | + { "contentNameKey": "Tk_Keumgang", "difficulty": 2, "length": "02:00" }, | |
42 | + { "contentNameKey": "Tk_Taebaek", "difficulty": 2, "length": "02:00" }, | |
43 | + { "contentNameKey": "Tk_Pyongwon", "difficulty": 2, "length": "02:00" }, | |
44 | + { "contentNameKey": "Tk_Sipjin", "difficulty": 2, "length": "02:00" }, | |
45 | + { "contentNameKey": "Tk_Jitae", "difficulty": 2, "length": "02:00" }, | |
46 | + { "contentNameKey": "Tk_Cheonkwon", "difficulty": 2, "length": "02:00" }, | |
47 | + { "contentNameKey": "Tk_Hansu", "difficulty": 2, "length": "02:00" }, | |
48 | + { "contentNameKey": "Tk_Ilyo", "difficulty": 2, "length": "02:00" } | |
49 | + ] | |
50 | + }, | |
51 | + { | |
52 | + "instructorId": 1003, | |
53 | + "nameKey": "taekwondo_coach_03", | |
54 | + "bundleName": "go0003", | |
55 | + "contents" : [ | |
56 | + { "contentNameKey": "Tk_01", "difficulty": 1, "length": "02:00" }, | |
57 | + { "contentNameKey": "Tk_02", "difficulty": 1, "length": "02:00" }, | |
58 | + { "contentNameKey": "Tk_03", "difficulty": 1, "length": "02:00" }, | |
59 | + { "contentNameKey": "Tk_04", "difficulty": 1, "length": "02:00" }, | |
60 | + { "contentNameKey": "Tk_05", "difficulty": 1, "length": "02:00" }, | |
61 | + { "contentNameKey": "Tk_06", "difficulty": 1, "length": "02:00" }, | |
62 | + { "contentNameKey": "Tk_07", "difficulty": 1, "length": "02:00" }, | |
63 | + { "contentNameKey": "Tk_08", "difficulty": 1, "length": "02:00" }, | |
64 | + { "contentNameKey": "Tk_Korye", "difficulty": 2, "length": "02:00" }, | |
65 | + { "contentNameKey": "Tk_Keumgang", "difficulty": 2, "length": "02:00" }, | |
66 | + { "contentNameKey": "Tk_Taebaek", "difficulty": 2, "length": "02:00" }, | |
67 | + { "contentNameKey": "Tk_Pyongwon", "difficulty": 2, "length": "02:00" }, | |
68 | + { "contentNameKey": "Tk_Sipjin", "difficulty": 2, "length": "02:00" }, | |
69 | + { "contentNameKey": "Tk_Jitae", "difficulty": 2, "length": "02:00" }, | |
70 | + { "contentNameKey": "Tk_Cheonkwon", "difficulty": 2, "length": "02:00" }, | |
71 | + { "contentNameKey": "Tk_Hansu", "difficulty": 2, "length": "02:00" }, | |
72 | + { "contentNameKey": "Tk_Ilyo", "difficulty": 2, "length": "02:00" } | |
73 | + ] | |
74 | + }, | |
75 | + { | |
76 | + "instructorId": 1004, | |
77 | + "nameKey": "taekwondo_coach_04", | |
78 | + "bundleName": "go0003", | |
79 | + "contents" : [ | |
80 | + { "contentNameKey": "Tk_01", "difficulty": 1, "length": "02:00" }, | |
81 | + { "contentNameKey": "Tk_02", "difficulty": 1, "length": "02:00" }, | |
82 | + { "contentNameKey": "Tk_03", "difficulty": 1, "length": "02:00" }, | |
83 | + { "contentNameKey": "Tk_04", "difficulty": 1, "length": "02:00" }, | |
84 | + { "contentNameKey": "Tk_05", "difficulty": 1, "length": "02:00" }, | |
85 | + { "contentNameKey": "Tk_06", "difficulty": 1, "length": "02:00" }, | |
86 | + { "contentNameKey": "Tk_07", "difficulty": 1, "length": "02:00" }, | |
87 | + { "contentNameKey": "Tk_08", "difficulty": 1, "length": "02:00" }, | |
88 | + { "contentNameKey": "Tk_Korye", "difficulty": 2, "length": "02:00" }, | |
89 | + { "contentNameKey": "Tk_Keumgang", "difficulty": 2, "length": "02:00" }, | |
90 | + { "contentNameKey": "Tk_Taebaek", "difficulty": 2, "length": "02:00" }, | |
91 | + { "contentNameKey": "Tk_Pyongwon", "difficulty": 2, "length": "02:00" }, | |
92 | + { "contentNameKey": "Tk_Sipjin", "difficulty": 2, "length": "02:00" }, | |
93 | + { "contentNameKey": "Tk_Jitae", "difficulty": 2, "length": "02:00" }, | |
94 | + { "contentNameKey": "Tk_Cheonkwon", "difficulty": 2, "length": "02:00" }, | |
95 | + { "contentNameKey": "Tk_Hansu", "difficulty": 2, "length": "02:00" }, | |
96 | + { "contentNameKey": "Tk_Ilyo", "difficulty": 2, "length": "02:00" } | |
97 | + ] | |
98 | + }, | |
99 | + { | |
100 | + "instructorId": 1005, | |
101 | + "nameKey": "taekwondo_coach_05", | |
102 | + "bundleName": "go0003", | |
103 | + "contents" : [ | |
104 | + { "contentNameKey": "Tk_01", "difficulty": 1, "length": "02:00" }, | |
105 | + { "contentNameKey": "Tk_02", "difficulty": 1, "length": "02:00" }, | |
106 | + { "contentNameKey": "Tk_03", "difficulty": 1, "length": "02:00" }, | |
107 | + { "contentNameKey": "Tk_04", "difficulty": 1, "length": "02:00" }, | |
108 | + { "contentNameKey": "Tk_05", "difficulty": 1, "length": "02:00" }, | |
109 | + { "contentNameKey": "Tk_06", "difficulty": 1, "length": "02:00" }, | |
110 | + { "contentNameKey": "Tk_07", "difficulty": 1, "length": "02:00" }, | |
111 | + { "contentNameKey": "Tk_08", "difficulty": 1, "length": "02:00" }, | |
112 | + { "contentNameKey": "Tk_Korye", "difficulty": 2, "length": "02:00" }, | |
113 | + { "contentNameKey": "Tk_Keumgang", "difficulty": 2, "length": "02:00" }, | |
114 | + { "contentNameKey": "Tk_Taebaek", "difficulty": 2, "length": "02:00" }, | |
115 | + { "contentNameKey": "Tk_Pyongwon", "difficulty": 2, "length": "02:00" }, | |
116 | + { "contentNameKey": "Tk_Sipjin", "difficulty": 2, "length": "02:00" }, | |
117 | + { "contentNameKey": "Tk_Jitae", "difficulty": 2, "length": "02:00" }, | |
118 | + { "contentNameKey": "Tk_Cheonkwon", "difficulty": 2, "length": "02:00" }, | |
119 | + { "contentNameKey": "Tk_Hansu", "difficulty": 2, "length": "02:00" }, | |
120 | + { "contentNameKey": "Tk_Ilyo", "difficulty": 2, "length": "02:00" } | |
121 | + ] | |
122 | + }, | |
123 | + { | |
124 | + "instructorId": 1006, | |
125 | + "nameKey": "taekwondo_coach_06", | |
126 | + "bundleName": "go0003", | |
127 | + "contents" : [ | |
128 | + { "contentNameKey": "Tk_01", "difficulty": 1, "length": "02:00" }, | |
129 | + { "contentNameKey": "Tk_02", "difficulty": 1, "length": "02:00" }, | |
130 | + { "contentNameKey": "Tk_03", "difficulty": 1, "length": "02:00" }, | |
131 | + { "contentNameKey": "Tk_04", "difficulty": 1, "length": "02:00" }, | |
132 | + { "contentNameKey": "Tk_05", "difficulty": 1, "length": "02:00" }, | |
133 | + { "contentNameKey": "Tk_06", "difficulty": 1, "length": "02:00" }, | |
134 | + { "contentNameKey": "Tk_07", "difficulty": 1, "length": "02:00" }, | |
135 | + { "contentNameKey": "Tk_08", "difficulty": 1, "length": "02:00" }, | |
136 | + { "contentNameKey": "Tk_Korye", "difficulty": 2, "length": "02:00" }, | |
137 | + { "contentNameKey": "Tk_Keumgang", "difficulty": 2, "length": "02:00" }, | |
138 | + { "contentNameKey": "Tk_Taebaek", "difficulty": 2, "length": "02:00" }, | |
139 | + { "contentNameKey": "Tk_Pyongwon", "difficulty": 2, "length": "02:00" }, | |
140 | + { "contentNameKey": "Tk_Sipjin", "difficulty": 2, "length": "02:00" }, | |
141 | + { "contentNameKey": "Tk_Jitae", "difficulty": 2, "length": "02:00" }, | |
142 | + { "contentNameKey": "Tk_Cheonkwon", "difficulty": 2, "length": "02:00" }, | |
143 | + { "contentNameKey": "Tk_Hansu", "difficulty": 2, "length": "02:00" }, | |
144 | + { "contentNameKey": "Tk_Ilyo", "difficulty": 2, "length": "02:00" } | |
145 | + ] | |
146 | + }, | |
147 | + { | |
148 | + "instructorId": 1007, | |
149 | + "nameKey": "taekwondo_coach_07", | |
150 | + "bundleName": "go0003", | |
151 | + "contents" : [ | |
152 | + { "contentNameKey": "Tk_01", "difficulty": 1, "length": "02:00" }, | |
153 | + { "contentNameKey": "Tk_02", "difficulty": 1, "length": "02:00" }, | |
154 | + { "contentNameKey": "Tk_03", "difficulty": 1, "length": "02:00" }, | |
155 | + { "contentNameKey": "Tk_04", "difficulty": 1, "length": "02:00" }, | |
156 | + { "contentNameKey": "Tk_05", "difficulty": 1, "length": "02:00" }, | |
157 | + { "contentNameKey": "Tk_06", "difficulty": 1, "length": "02:00" }, | |
158 | + { "contentNameKey": "Tk_07", "difficulty": 1, "length": "02:00" }, | |
159 | + { "contentNameKey": "Tk_08", "difficulty": 1, "length": "02:00" }, | |
160 | + { "contentNameKey": "Tk_Korye", "difficulty": 2, "length": "02:00" }, | |
161 | + { "contentNameKey": "Tk_Keumgang", "difficulty": 2, "length": "02:00" }, | |
162 | + { "contentNameKey": "Tk_Taebaek", "difficulty": 2, "length": "02:00" }, | |
163 | + { "contentNameKey": "Tk_Pyongwon", "difficulty": 2, "length": "02:00" }, | |
164 | + { "contentNameKey": "Tk_Sipjin", "difficulty": 2, "length": "02:00" }, | |
165 | + { "contentNameKey": "Tk_Jitae", "difficulty": 2, "length": "02:00" }, | |
166 | + { "contentNameKey": "Tk_Cheonkwon", "difficulty": 2, "length": "02:00" }, | |
167 | + { "contentNameKey": "Tk_Hansu", "difficulty": 2, "length": "02:00" }, | |
168 | + { "contentNameKey": "Tk_Ilyo", "difficulty": 2, "length": "02:00" } | |
169 | + ] | |
170 | + }, | |
171 | + { | |
172 | + "instructorId": 1008, | |
173 | + "nameKey": "taekwondo_coach_08", | |
174 | + "bundleName": "go0003", | |
175 | + "contents" : [ | |
176 | + { "contentNameKey": "Tk_01", "difficulty": 1, "length": "02:00" }, | |
177 | + { "contentNameKey": "Tk_02", "difficulty": 1, "length": "02:00" }, | |
178 | + { "contentNameKey": "Tk_03", "difficulty": 1, "length": "02:00" }, | |
179 | + { "contentNameKey": "Tk_04", "difficulty": 1, "length": "02:00" }, | |
180 | + { "contentNameKey": "Tk_05", "difficulty": 1, "length": "02:00" }, | |
181 | + { "contentNameKey": "Tk_06", "difficulty": 1, "length": "02:00" }, | |
182 | + { "contentNameKey": "Tk_07", "difficulty": 1, "length": "02:00" }, | |
183 | + { "contentNameKey": "Tk_08", "difficulty": 1, "length": "02:00" }, | |
184 | + { "contentNameKey": "Tk_Korye", "difficulty": 2, "length": "02:00" }, | |
185 | + { "contentNameKey": "Tk_Keumgang", "difficulty": 2, "length": "02:00" }, | |
186 | + { "contentNameKey": "Tk_Taebaek", "difficulty": 2, "length": "02:00" }, | |
187 | + { "contentNameKey": "Tk_Pyongwon", "difficulty": 2, "length": "02:00" }, | |
188 | + { "contentNameKey": "Tk_Sipjin", "difficulty": 2, "length": "02:00" }, | |
189 | + { "contentNameKey": "Tk_Jitae", "difficulty": 2, "length": "02:00" }, | |
190 | + { "contentNameKey": "Tk_Cheonkwon", "difficulty": 2, "length": "02:00" }, | |
191 | + { "contentNameKey": "Tk_Hansu", "difficulty": 2, "length": "02:00" }, | |
192 | + { "contentNameKey": "Tk_Ilyo", "difficulty": 2, "length": "02:00" } | |
193 | + ] | |
194 | + } | |
195 | + ] | |
196 | +}(파일 끝에 줄바꿈 문자 없음) |
+++ VRTK/00.DEVCENTRAL/App/assets/vrmap_lobby01
Binary file is not shown |
+++ VRTK/00.DEVCENTRAL/App/assets/vrmap_tkgym
Binary file is not shown |
+++ VRTK/00.DEVCENTRAL/App/assets/vrobj_mirrorcustom
Binary file is not shown |
+++ VRTK/00.DEVCENTRAL/App/assets/vrtaekwondo_go0003
Binary file is not shown |
+++ VRTK/00.DEVCENTRAL/App/assets/vrtaekwondo_go0003clip
Binary file is not shown |
+++ VRTK/00.DEVCENTRAL/App/assets/vrui_animplay
Binary file is not shown |
+++ VRTK/00.DEVCENTRAL/App/assets/vrui_common
Binary file is not shown |
+++ VRTK/00.DEVCENTRAL/App/assets/vrui_vrui
Binary file is not shown |
+++ VRTK/00.DEVCENTRAL/App/config.json
... | ... | @@ -0,0 +1,46 @@ |
1 | +{ | |
2 | + "ptcl_healeffectobj": { | |
3 | + "required": true, | |
4 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
5 | + }, | |
6 | + "vrmap_lobby01": { | |
7 | + "required": true, | |
8 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
9 | + }, | |
10 | + "vrmap_tkgym": { | |
11 | + "required": true, | |
12 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
13 | + }, | |
14 | + "vrobj_mirrorcustom": { | |
15 | + "required": true, | |
16 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
17 | + }, | |
18 | + "vrui_animplay": { | |
19 | + "required": true, | |
20 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
21 | + }, | |
22 | + "vrui_tk": { | |
23 | + "required": true, | |
24 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
25 | + }, | |
26 | + "vrui_common": { | |
27 | + "required": true, | |
28 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
29 | + }, | |
30 | + "vrtaekwondo_go0003": { | |
31 | + "required": true, | |
32 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
33 | + }, | |
34 | + "vrtaekwondo_go0003clip": { | |
35 | + "required": true, | |
36 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
37 | + }, | |
38 | + "scene_assetbundle_names.json": { | |
39 | + "required": true, | |
40 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
41 | + }, | |
42 | + "taekwondo_contents_by_instructors.json": { | |
43 | + "required": true, | |
44 | + "supportedDevices": ["QUEST2", "QUESTPRO", "QUEST3"] | |
45 | + } | |
46 | +}(파일 끝에 줄바꿈 문자 없음) |
--- VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayAnimController.cs
+++ VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayAnimController.cs
... | ... | @@ -9,6 +9,8 @@ |
9 | 9 |
using RootMotion.FinalIK; |
10 | 10 |
using System.Collections; |
11 | 11 |
using System.Collections.Generic; |
12 |
+using System.Runtime.InteropServices; |
|
13 |
+using System.Security.Cryptography.X509Certificates; |
|
12 | 14 |
using UnityEngine; |
13 | 15 |
using UnityEngine.InputSystem; |
14 | 16 |
|
... | ... | @@ -21,7 +23,8 @@ |
21 | 23 |
Stop, // 시작 전 |
22 | 24 |
Practice, // 연습 모드 |
23 | 25 |
Divided, // 구분 동작 모드 |
24 |
- Evaluation // 평가 모드 |
|
26 |
+ Evaluation, // 평가 모드 |
|
27 |
+ AIJudge // AI 심사 모드 |
|
25 | 28 |
} |
26 | 29 |
|
27 | 30 |
private AnimState nowState; |
... | ... | @@ -43,7 +46,13 @@ |
43 | 46 |
} |
44 | 47 |
|
45 | 48 |
private bool isPressA = false; |
49 |
+ public bool IsPressA{ |
|
50 |
+ get{ return isPressA; } |
|
51 |
+ } |
|
46 | 52 |
private bool isPressB = false; |
53 |
+ public bool IsPressB{ |
|
54 |
+ get{ return isPressB; } |
|
55 |
+ } |
|
47 | 56 |
private bool isStopPress = false; |
48 | 57 |
private bool isEffect = false; // 첫 이펙트 설정 유무 |
49 | 58 |
|
... | ... | @@ -99,7 +108,13 @@ |
99 | 108 |
// 동작을 체크할 플레이어 내부 더미 오브젝트 |
100 | 109 |
private GameObject dummyObj; |
101 | 110 |
private Animator dummyAnim; |
111 |
+ public Animator DummyAnim{ |
|
112 |
+ get { return dummyAnim; } |
|
113 |
+ } |
|
102 | 114 |
private VRIK dummyVRIK; |
115 |
+ public VRIK DummyVRIK { |
|
116 |
+ get { return dummyVRIK;} |
|
117 |
+ } |
|
103 | 118 |
private BNGIKPlayerScale dummyPlayerScale; |
104 | 119 |
public BNGIKPlayerScale DummyPlayerScale { |
105 | 120 |
get { return dummyPlayerScale; } |
... | ... | @@ -109,9 +124,12 @@ |
109 | 124 |
private GameObject dummyCopyObj; |
110 | 125 |
private Animator dummyCopyAnim; |
111 | 126 |
private VRIK dummyCopyVRIK; |
127 |
+ public VRIK DummyCopyVRIK { |
|
128 |
+ get { return dummyCopyVRIK;} |
|
129 |
+ } |
|
112 | 130 |
private BNGIKPlayerScale dummyCopyScale; |
113 | 131 |
#endregion |
114 |
- |
|
132 |
+ |
|
115 | 133 |
|
116 | 134 |
// Start is called before the first frame update |
117 | 135 |
void Start() { |
... | ... | @@ -334,7 +352,7 @@ |
334 | 352 |
|
335 | 353 |
// { 동작 체크용 더미 저장 |
336 | 354 |
dummyCopyObj = Instantiate(dummyObj, tempDummyPlace_.transform); |
337 |
- dummyCopyObj.name = "DummyCopy"; |
|
355 |
+ dummyCopyObj.name = "DummyCopy1"; |
|
338 | 356 |
dummyCopyObj.transform.position = new Vector3(1f, 0f, 0f); |
339 | 357 |
|
340 | 358 |
dummyCopyAnim = dummyCopyObj.GetComponent<Animator>(); |
... | ... | @@ -357,7 +375,6 @@ |
357 | 375 |
|
358 | 376 |
tempDummy_.SetActive(false); |
359 | 377 |
tempDummyCopy_.SetActive(false); |
360 |
- |
|
361 | 378 |
} |
362 | 379 |
|
363 | 380 |
/// <summary> |
... | ... | @@ -382,7 +399,7 @@ |
382 | 399 |
{ |
383 | 400 |
if (healObj == null) |
384 | 401 |
{ |
385 |
- yield return MMHelper.GetAssetObjAsync<GameObject>("ptcl", "healeffectobj", |
|
402 |
+ yield return MMHelper.GetAssetObjAsync("ptcl", "healeffectobj", |
|
386 | 403 |
particle => |
387 | 404 |
{ |
388 | 405 |
healObj = Instantiate((GameObject)particle); |
... | ... | @@ -392,11 +409,11 @@ |
392 | 409 |
|
393 | 410 |
if (mirrorObj == null) |
394 | 411 |
{ |
395 |
- yield return MMHelper.GetAssetObjAsync<GameObject>("vrobj", "mirrorcustom", |
|
412 |
+ yield return MMHelper.GetAssetObjAsync("vrobj", "mirrorcustom", |
|
396 | 413 |
obj => |
397 | 414 |
{ |
398 | 415 |
mirrorObj = Instantiate((GameObject)obj); |
399 |
- mirrorObj.SetActive(false); |
|
416 |
+ //mirrorObj.SetActive(false); |
|
400 | 417 |
}); |
401 | 418 |
} |
402 | 419 |
|
... | ... | @@ -542,11 +559,14 @@ |
542 | 559 |
|
543 | 560 |
|
544 | 561 |
// 외곽선 효과를 끄기 위해서 가져옴 |
545 |
- List<EffectPoseText> tempList_ = UIManager.Instance.movementManager.poseManager.effectPoseText; |
|
562 |
+ if(UserDataRepo.Instance.PoseManager.EffectPoseText != null){ |
|
546 | 563 |
|
547 |
- foreach (var outline in tempList_) |
|
548 |
- { |
|
549 |
- outline.AllStopOutLines(); |
|
564 |
+ List<EffectPoseText> tempList_ = UserDataRepo.Instance.PoseManager.EffectPoseText; |
|
565 |
+ |
|
566 |
+ foreach (var outline in tempList_) |
|
567 |
+ { |
|
568 |
+ outline.AllStopOutLines(); |
|
569 |
+ } |
|
550 | 570 |
} |
551 | 571 |
|
552 | 572 |
if (dummyPlayerScale != null) |
... | ... | @@ -721,6 +741,48 @@ |
721 | 741 |
} |
722 | 742 |
} |
723 | 743 |
|
744 |
+ /// <summary> |
|
745 |
+ /// nowAnimator에 Dummy를 추가하는 함수 |
|
746 |
+ /// </summary> |
|
747 |
+ public void SetDummyAnimator(){ |
|
748 |
+ if(!dummyCopyObj.activeSelf) |
|
749 |
+ dummyCopyObj.SetActive(true); |
|
750 |
+ |
|
751 |
+ if (5 <= nowAnimator.Count ) { |
|
752 |
+ nowAnimator[4] = dummyCopyAnim; |
|
753 |
+ } |
|
754 |
+ else { |
|
755 |
+ nowAnimator.Add(dummyCopyAnim); |
|
756 |
+ } |
|
757 |
+ } |
|
758 |
+ |
|
759 |
+ /// <summary> |
|
760 |
+ /// 애니메이션 클립을 바꿔주는 함수 |
|
761 |
+ /// </summary> |
|
762 |
+ /// <param name="charAnimator"></param> |
|
763 |
+ /// <param name="animClip"></param> |
|
764 |
+ public void ChangeAnimClip(Animator charAnimator, AnimationClip animClip) |
|
765 |
+ { |
|
766 |
+ AnimatorOverrideController overrideController = |
|
767 |
+ new AnimatorOverrideController(charAnimator.runtimeAnimatorController); |
|
768 |
+ |
|
769 |
+ charAnimator.runtimeAnimatorController = overrideController; |
|
770 |
+ foreach(var sss in charAnimator.GetCurrentAnimatorClipInfo(0)){ |
|
771 |
+ Debug.LogError(sss.clip.name); |
|
772 |
+ } |
|
773 |
+ overrideController[charAnimator.GetCurrentAnimatorClipInfo(0)[0].clip.name] = animClip; |
|
774 |
+ } |
|
775 |
+ |
|
776 |
+ /// <summary> |
|
777 |
+ /// nowAnimator 안에 있는 애니메이션 클립을 전부 교체하는 함수 |
|
778 |
+ /// </summary> |
|
779 |
+ /// <param name="animClip"></param> |
|
780 |
+ public void AllChangeAnimClip(AnimationClip animClip){ |
|
781 |
+ foreach (var anim in nowAnimator) { |
|
782 |
+ ChangeAnimClip(anim, animClip); |
|
783 |
+ } |
|
784 |
+ } |
|
785 |
+ |
|
724 | 786 |
public void OnOffParticle() |
725 | 787 |
{ |
726 | 788 |
healObj.SetActive(!healObj.activeSelf); |
... | ... | @@ -744,7 +806,7 @@ |
744 | 806 |
OnOffMirror(); |
745 | 807 |
} |
746 | 808 |
|
747 |
- IsEffect = false; |
|
809 |
+ IsEffect = true; |
|
748 | 810 |
|
749 | 811 |
} |
750 | 812 |
|
... | ... | @@ -767,6 +829,9 @@ |
767 | 829 |
{ |
768 | 830 |
nowState = AnimState.Evaluation; |
769 | 831 |
} |
832 |
+ else if (state == "AIJudge") { |
|
833 |
+ nowState = AnimState.AIJudge; |
|
834 |
+ } |
|
770 | 835 |
} |
771 | 836 |
|
772 | 837 |
|
--- VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayMapManager.cs
+++ VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayMapManager.cs
... | ... | @@ -1,4 +1,5 @@ |
1 | 1 |
using System; |
2 |
+using System.Collections; |
|
2 | 3 |
using System.Collections.Generic; |
3 | 4 |
using UnityEngine; |
4 | 5 |
|
... | ... | @@ -21,7 +22,7 @@ |
21 | 22 |
|
22 | 23 |
void Start() { |
23 | 24 |
UserDataRepo.Instance.PlayMapManager = this; |
24 |
- ChangeLobbyMap("vrmap_lobby01"); |
|
25 |
+ StartCoroutine(ChangeLobbyMap("vrmap_lobby01")); |
|
25 | 26 |
|
26 | 27 |
} |
27 | 28 |
|
... | ... | @@ -52,10 +53,8 @@ |
52 | 53 |
/// 로비맵 이름을 받고, 해당 로비맵을 활성화하는 함수 |
53 | 54 |
/// </summary> |
54 | 55 |
/// <param name="lobbyMapName"></param> |
55 |
- public void ChangeLobbyMap(string lobbyMapName) { |
|
56 |
- AllOffMapLobby(); |
|
57 |
- AllOffMapPlay(); |
|
58 |
- |
|
56 |
+ public IEnumerator ChangeLobbyMap(string lobbyMapName) { |
|
57 |
+ |
|
59 | 58 |
int tempIndex_ = 0; |
60 | 59 |
if(mapLobbyObjs.Count == 0){ |
61 | 60 |
tempIndex_ = -1; |
... | ... | @@ -73,79 +72,89 @@ |
73 | 72 |
} |
74 | 73 |
} |
75 | 74 |
|
76 |
- String[] tempArrays = lobbyMapName.Split("_"); |
|
75 |
+ string[] tempArrays = lobbyMapName.Split("_"); |
|
77 | 76 |
|
78 | 77 |
Debug.LogError("값 " + tempIndex_); |
79 | 78 |
// 현재 해당 로비맵이 로드되지 않았음을 의미 |
80 | 79 |
if (tempIndex_ < 0) { |
81 | 80 |
Debug.LogError($"{tempArrays[0]} {tempArrays[1]}"); |
82 | 81 |
|
83 |
- StartCoroutine(MMHelper.GetAssetObjAsync<GameObject>($"{tempArrays[0]}", $"{tempArrays[1]}", callback =>{ |
|
82 |
+ yield return StartCoroutine(MMHelper.GetAssetObjAsync($"{tempArrays[0]}", $"{tempArrays[1]}", callback =>{ |
|
84 | 83 |
GameObject tempLobbyObj_ = Instantiate(callback, lobbyArea); |
85 | 84 |
|
86 | 85 |
tempLobbyObj_.name = lobbyMapName; |
87 | 86 |
|
88 | 87 |
mapLobbyObjs.Add(tempLobbyObj_); |
89 | 88 |
})); |
90 |
- |
|
91 |
- // MMHelper.GetAssetObjAsync<GameObject>($"{tempArrays[0]}", $"{tempArrays[1]}", callback => { |
|
92 |
- // Debug.LogError($"{callback}"); |
|
93 |
- |
|
94 |
- // GameObject tempLobbyObj_ = Instantiate(callback, lobbyArea); |
|
95 |
- |
|
96 |
- // tempLobbyObj_.name = lobbyMapName; |
|
97 |
- |
|
98 |
- // mapLobbyObjs.Add(tempLobbyObj_); |
|
99 |
- // }); |
|
100 | 89 |
} |
101 | 90 |
else { |
102 | 91 |
Debug.LogError("else "); |
103 | 92 |
|
104 | 93 |
mapLobbyObjs[tempIndex_].SetActive(true); |
105 | 94 |
} |
95 |
+ |
|
96 |
+ foreach (var lobbyMap in mapLobbyObjs){ |
|
97 |
+ if(lobbyMap.name != lobbyMapName){ |
|
98 |
+ lobbyMap.SetActive(false); |
|
99 |
+ } |
|
100 |
+ } |
|
101 |
+ |
|
102 |
+ AllOffMapPlay(); |
|
103 |
+ |
|
106 | 104 |
} |
107 | 105 |
|
108 | 106 |
/// <summary> |
109 | 107 |
/// 플레이맵 이름을 받고, 해당 플레이맵을 활성화시키는 함수 |
110 | 108 |
/// </summary> |
111 | 109 |
/// <param name="playMapName"></param> |
112 |
- public void ChangePlayMap(string playMapName) |
|
110 |
+ public IEnumerator ChangePlayMap(string playMapName) |
|
113 | 111 |
{ |
114 |
- AllOffMapLobby(); |
|
115 |
- AllOffMapPlay(); |
|
116 |
- |
|
117 | 112 |
int tempIndex_ = 0; |
118 | 113 |
|
119 |
- for (int i = 0; i < mapPlayObjs.Count; i++) |
|
120 |
- { |
|
121 |
- if (mapPlayObjs[i].name == playMapName) |
|
122 |
- { |
|
123 |
- tempIndex_ = i; |
|
124 |
- |
|
125 |
- break; |
|
126 |
- } |
|
127 |
- |
|
114 |
+ if(mapPlayObjs.Count == 0) { |
|
128 | 115 |
tempIndex_ = -1; |
129 | 116 |
} |
117 |
+ else { |
|
118 |
+ for (int i = 0; i < mapPlayObjs.Count; i++) |
|
119 |
+ { |
|
120 |
+ if (mapPlayObjs[i].name == playMapName) |
|
121 |
+ { |
|
122 |
+ tempIndex_ = i; |
|
130 | 123 |
|
131 |
- String[] tempArrays = playMapName.Split("_"); |
|
124 |
+ break; |
|
125 |
+ } |
|
132 | 126 |
|
133 |
- // 현재 해당 로비맵이 로드되지 않았음을 의미 |
|
127 |
+ tempIndex_ = -1; |
|
128 |
+ } |
|
129 |
+ } |
|
130 |
+ |
|
131 |
+ Debug.LogError("tempIndex_ : " + tempIndex_); |
|
132 |
+ string[] tempArrays = playMapName.Split("_"); |
|
133 |
+ |
|
134 |
+ // 현재 해당 플레이맵이 로드되지 않았음을 의미 |
|
134 | 135 |
if (tempIndex_ < 0) |
135 | 136 |
{ |
136 |
- MMHelper.GetAssetObjAsync<GameObject>($"{tempArrays[0]}", $"{tempArrays[1]}", callback => |
|
137 |
- { |
|
137 |
+ yield return StartCoroutine(MMHelper.GetAssetObjAsync($"{tempArrays[0]}", $"{tempArrays[1]}", callback =>{ |
|
138 | 138 |
GameObject tempPlayMapObj_ = Instantiate(callback, playArea); |
139 | 139 |
|
140 | 140 |
tempPlayMapObj_.name = playMapName; |
141 | 141 |
|
142 | 142 |
mapPlayObjs.Add(tempPlayMapObj_); |
143 |
- }); |
|
143 |
+ })); |
|
144 | 144 |
} |
145 | 145 |
else |
146 | 146 |
{ |
147 | 147 |
mapPlayObjs[tempIndex_].SetActive(true); |
148 | 148 |
} |
149 |
+ |
|
150 |
+ foreach (var playMap in mapPlayObjs){ |
|
151 |
+ if(playMap.name != playMapName){ |
|
152 |
+ playMap.SetActive(false); |
|
153 |
+ } |
|
154 |
+ } |
|
155 |
+ |
|
156 |
+ AllOffMapLobby(); |
|
157 |
+ |
|
149 | 158 |
} |
150 | 159 |
|
151 | 160 |
}(파일 끝에 줄바꿈 문자 없음) |
--- VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayReadyManager.cs
+++ VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayReadyManager.cs
... | ... | @@ -159,7 +159,7 @@ |
159 | 159 |
} |
160 | 160 |
|
161 | 161 |
if (aiEvalBtn == null) { |
162 |
- Transform tempAIEval_ = modeObj.transform.Find("AIEvalMode"); |
|
162 |
+ Transform tempAIEval_ = modeObj.transform.Find("AIJudgeMode"); |
|
163 | 163 |
aiEvalBtn = tempAIEval_.GetComponentInChildren<Button>(); |
164 | 164 |
} |
165 | 165 |
|
--- VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayUIManager.cs
+++ VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayUIManager.cs
... | ... | @@ -121,13 +121,13 @@ |
121 | 121 |
} |
122 | 122 |
|
123 | 123 |
// vrui 배치 |
124 |
- yield return StartCoroutine(MMHelper.GetAssetObjAsync<GameObject>("vrui", "vrui", callback => |
|
124 |
+ yield return StartCoroutine(MMHelper.GetAssetObjAsync("vrui", "vrui", callback => |
|
125 | 125 |
{ |
126 | 126 |
tempUIObj_ = callback; |
127 | 127 |
})); |
128 | 128 |
|
129 | 129 |
|
130 |
- yield return StartCoroutine(MMHelper.GetAssetObjAsync<GameObject>("vrui", "animplay", callback => |
|
130 |
+ yield return StartCoroutine(MMHelper.GetAssetObjAsync("vrui", "animplay", callback => |
|
131 | 131 |
{ |
132 | 132 |
tempAnimObj_ = callback; |
133 | 133 |
})); |
--- VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayVRUIManager.cs
+++ VRTK/Assets/00.MAINSTREAM/Scripts/Manager/PlayVRUIManager.cs
... | ... | @@ -8,10 +8,7 @@ |
8 | 8 |
using System; |
9 | 9 |
using System.Collections; |
10 | 10 |
using System.Collections.Generic; |
11 |
-using System.Drawing.Text; |
|
12 | 11 |
using System.IO; |
13 |
-using Unity.VisualScripting; |
|
14 |
-using UnityEditor.Localization.Plugins.XLIFF.V20; |
|
15 | 12 |
using UnityEngine; |
16 | 13 |
using UnityEngine.InputSystem; |
17 | 14 |
|
... | ... | @@ -65,11 +62,11 @@ |
65 | 62 |
|
66 | 63 |
[SerializeField] private GameObject popUp; // 팝업창 => 모델 불러올때 사용 |
67 | 64 |
|
68 |
- private List<GameObject> instructorObjs; // 사용중인 코치 오브젝트 관리 리스트 |
|
65 |
+ [SerializeField] private List<GameObject> instructorObjs; // 사용중인 강사 오브젝트 관리 리스트 |
|
69 | 66 |
|
70 |
- private List<GameObject> createInstructorObjs; // 만들어진 코치 오브젝트를 전부 보관하는 리스트 |
|
67 |
+ [SerializeField] private List<GameObject> createInstructorObjs; // 만들어진 강사 오브젝트를 전부 보관하는 리스트 |
|
71 | 68 |
|
72 |
- private List<AnimationClip> tkAnimClips; |
|
69 |
+ [SerializeField] private List<AnimationClip> contentAnimClips; // 만들어진 애니메이션 클립 저장하는 리스트 |
|
73 | 70 |
|
74 | 71 |
#region 00.Content |
75 | 72 |
[Header("00.Content")] |
... | ... | @@ -180,14 +177,40 @@ |
180 | 177 |
} |
181 | 178 |
#endregion |
182 | 179 |
|
183 |
- |
|
180 |
+ #region Result |
|
181 |
+ [Header("Result")] |
|
182 |
+ [SerializeField] private ResultUIManager resultUIManager; |
|
183 |
+ |
|
184 |
+ /// <summary> |
|
185 |
+ /// ResultUIManager 스크립트의 정보를 가져오는 프로퍼티 |
|
186 |
+ /// </summary> |
|
187 |
+ public ResultUIManager ResultUIManager |
|
188 |
+ { |
|
189 |
+ get { return resultUIManager; } |
|
190 |
+ set { |
|
191 |
+ if (resultUIManager == null) |
|
192 |
+ resultUIManager = value; |
|
193 |
+ } |
|
194 |
+ } |
|
195 |
+ #endregion |
|
196 |
+ |
|
197 |
+ private void OnEnable() { |
|
198 |
+ // 해당 오브젝트가 꺼지고 켜질때마다 초기화면으로 돌아가도록 한다. |
|
199 |
+ if (UserDataRepo.Instance.VRUIManager == null) |
|
200 |
+ return; |
|
201 |
+ |
|
202 |
+ // 초기 지점을 일단 강사 화면으로 설정 |
|
203 |
+ nowUIMainView = UIMainView.Instructor; |
|
204 |
+ ChangeUIView(); |
|
205 |
+ } |
|
184 | 206 |
|
185 | 207 |
// Start is called before the first frame update |
186 | 208 |
void Start() { |
187 | 209 |
nowContent = Contents.None; // 아무것도 선택되지 않은 상태 |
188 | 210 |
popUp = transform.Find("Popup").gameObject; |
189 | 211 |
instructorObjs = new List<GameObject>(); |
190 |
- tkAnimClips = new List<AnimationClip>(); |
|
212 |
+ createInstructorObjs = new List<GameObject>(); |
|
213 |
+ contentAnimClips = new List<AnimationClip>(); |
|
191 | 214 |
UserDataRepo.Instance.VRUIManager = this; |
192 | 215 |
} |
193 | 216 |
|
... | ... | @@ -223,7 +246,7 @@ |
223 | 246 |
// AnimState를 변경 |
224 | 247 |
UserDataRepo.Instance.VRAnimController.ChangeAnimState(selectMode); |
225 | 248 |
UserDataRepo.Instance.VRAnimController.IsEffect = false; |
226 |
- |
|
249 |
+ Debug.LogError("SetVRAnimPlay"); |
|
227 | 250 |
StartCoroutine(GetVRAssetInstructor(NowSelectBundleName)); |
228 | 251 |
} // SetTkPlay |
229 | 252 |
|
... | ... | @@ -235,8 +258,7 @@ |
235 | 258 |
/// <returns></returns> |
236 | 259 |
IEnumerator GetVRAssetInstructor(string bundleName) |
237 | 260 |
{ |
238 |
- yield return null; |
|
239 |
- DebugTxtCall.Instance.CallDebug("GetVRAssetInstructor IN"); |
|
261 |
+ Debug.LogError("GetVRAssetInstructor"); |
|
240 | 262 |
|
241 | 263 |
if(0 < instructorObjs.Count) { |
242 | 264 |
foreach(var obj in instructorObjs) { |
... | ... | @@ -246,173 +268,155 @@ |
246 | 268 |
|
247 | 269 |
instructorObjs.Clear(); |
248 | 270 |
} |
249 |
- |
|
250 | 271 |
|
251 | 272 |
string tempBundleName_ = MakeBundleName(bundleName, false); |
252 |
- |
|
273 |
+ Debug.LogError($"{tempBundleName_} "+ File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)); |
|
253 | 274 |
|
254 | 275 |
// 먼저 로컬에 강사 파일이 있는지 확인 후 없으면 다운 |
255 | 276 |
if(File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)){ |
256 | 277 |
// 로드 된게 있는지 확인 |
257 |
- if(AssetBundleRepo.Instance.GetAssetBundleList(NowContentInt()).Find(x => x.name == tempBundleName_)){ |
|
258 |
- StartCoroutine(GetVRAnim(NowSelectBundleName)); |
|
278 |
+ if(AssetBundleRepo.Instance.GetAssetBundleList(NowContentInt()).Find(x => x.name == tempBundleName_)) { |
|
279 |
+ // 에셋번들 로드가 되었으니 패스한다 |
|
259 | 280 |
} |
260 | 281 |
else{ |
261 |
- //yield return StartCoroutine(MMHelper.AsyncLoader(tempBundleName_)); |
|
262 |
- |
|
263 |
- LoadVRAssetInstructor(); |
|
282 |
+ // 에셋번들 로드가 안되었으니 로드한다. |
|
283 |
+ yield return StartCoroutine(MMHelper.AsyncLoader(tempBundleName_)); |
|
264 | 284 |
} |
265 | 285 |
|
286 |
+ yield return StartCoroutine(GetVRAnim(NowSelectBundleName)); |
|
287 |
+ |
|
288 |
+ |
|
266 | 289 |
} |
267 |
- else{ |
|
268 |
- |
|
269 |
- // 관련 파일이 없어 에셋번들을 다운받아야할 경우 |
|
270 |
- yield return StartCoroutine(MMHelper.DownloadAssetFile(tempBundleName_, LoadVRAssetInstructor)); |
|
271 |
- |
|
290 |
+ else { |
|
291 |
+ // 관련 파일이 없다 => DLC 구매를 해야한다. |
|
272 | 292 |
} |
273 | 293 |
} |
274 | 294 |
|
275 |
- private void LoadVRAssetInstructor(){ |
|
276 |
- StartCoroutine(LoadInstructor(NowSelectBundleName)); |
|
277 |
- } |
|
278 |
- |
|
279 |
- /// <summary> |
|
280 |
- /// 에셋번들 로드 |
|
281 |
- /// </summary> |
|
282 |
- /// <param name="bundleName"></param> |
|
283 |
- private IEnumerator LoadInstructor(string bundleName) { |
|
284 |
- // 에셋번들 로드하고 리스트에 넣어두고 |
|
285 |
- yield return StartCoroutine(MMHelper.AsyncLoader(bundleName)); |
|
286 |
- |
|
287 |
- // 클립 로드하러 간다. |
|
288 |
- StartCoroutine(GetVRAnim(NowSelectBundleName)); |
|
289 |
- } |
|
290 | 295 |
|
291 | 296 |
private IEnumerator GetVRAnim(string bundleName){ |
292 | 297 |
string tempBundleName_ = MakeBundleName(bundleName, true); |
293 |
- |
|
298 |
+ Debug.LogError($"{tempBundleName_} "+ File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)); |
|
294 | 299 |
|
295 | 300 |
// 먼저 로컬에 강사 애니메이션 클립 파일이 있는지 확인 후 없으면 다운 |
296 | 301 |
if(File.Exists(MMDefine.FULL_FILE_PATH + tempBundleName_)){ |
297 | 302 |
// 로드 된게 있는지 확인 |
298 | 303 |
if(AssetBundleRepo.Instance.GetAssetBundleList(NowContentInt()).Find(x => x.name == tempBundleName_)){ |
299 |
- |
|
304 |
+ // 애니메이션 클립이 로드되었으니 패스한다. |
|
300 | 305 |
} |
301 | 306 |
else{ |
302 |
- LoadVRAssetAnim(); |
|
307 |
+ // 애니메이션 클립이 로드되어 있지 않으니 로드한다. |
|
308 |
+ yield return StartCoroutine(MMHelper.AsyncLoader(tempBundleName_)); |
|
303 | 309 |
} |
310 |
+ |
|
311 |
+ // 강사 클립 둘다 로드했으니 이제 꺼내자 |
|
312 |
+ GameObject tempInstructor_ = null; |
|
313 |
+ AnimationClip tempAnimClip_ = null; |
|
314 |
+ |
|
315 |
+ string tempInstructorBundleName_ = MakeBundleName(bundleName, false); |
|
316 |
+ int tempIndex_ = 0; |
|
317 |
+ tempIndex_ = createInstructorObjs.FindIndex(x => x.name == tempInstructorBundleName_); |
|
318 |
+ |
|
319 |
+ // createInstructorObjs 리스트에 만들어진 강사가 있는지 확인 |
|
320 |
+ if(tempIndex_ != -1){ |
|
321 |
+ // 있다 => 그거 꺼내기 |
|
322 |
+ instructorObjs.Clear(); |
|
323 |
+ |
|
324 |
+ for(int i = 0; i < 4; i++) { |
|
325 |
+ instructorObjs.Add(createInstructorObjs[tempIndex_]); |
|
326 |
+ createInstructorObjs.Remove(createInstructorObjs[tempIndex_]); |
|
327 |
+ } |
|
328 |
+ |
|
329 |
+ tempInstructor_ = instructorObjs[0]; |
|
330 |
+ } |
|
331 |
+ else { |
|
332 |
+ yield return StartCoroutine(MMHelper.GetAssetObjAsync("vrtaekwondo", NowSelectBundleName, callback => { |
|
333 |
+ tempInstructor_ = callback; |
|
334 |
+ })); |
|
335 |
+ } |
|
336 |
+ |
|
337 |
+ // 저장된 클립이 있는지 확인한다 => 클립을 저장할때 이름 규칙은 강사 번들 이름 + 클립 이름이다. |
|
338 |
+ tempIndex_ = contentAnimClips.FindIndex(x => x.name == $"{tempInstructorBundleName_}{NowSelectAnim}"); |
|
339 |
+ if(tempIndex_ != -1) { |
|
340 |
+ // 있다 => 클립 꺼내기 |
|
341 |
+ tempAnimClip_ = contentAnimClips[tempIndex_]; |
|
342 |
+ } |
|
343 |
+ else { |
|
344 |
+ yield return StartCoroutine(MMHelper.GetAssetObjAsync("vrtaekwondo", NowSelectBundleName, NowSelectAnim, callback => { |
|
345 |
+ tempAnimClip_ = callback; |
|
346 |
+ })); |
|
347 |
+ |
|
348 |
+ tempAnimClip_.name = $"{tempInstructorBundleName_}{NowSelectAnim}"; |
|
349 |
+ contentAnimClips.Add(tempAnimClip_); |
|
350 |
+ } |
|
351 |
+ |
|
352 |
+ yield return StartCoroutine(UserDataRepo.Instance.PlayMapManager.ChangePlayMap("vrmap_tkgym")); |
|
353 |
+ |
|
354 |
+ ShowVRTkAnim(tempInstructor_, tempAnimClip_); |
|
304 | 355 |
} |
305 | 356 |
else{ |
306 |
- // 관련 파일이 없어 에셋번들을 다운받아야할 경우 |
|
307 |
- yield return StartCoroutine(MMHelper.DownloadAssetFile(tempBundleName_, LoadVRAssetAnim)); |
|
357 |
+ // 관련 파일이 없다? => DLC 구매를 해야한다. |
|
308 | 358 |
} |
309 | 359 |
} |
310 | 360 |
|
311 |
- |
|
312 |
- private void LoadVRAssetAnim(){ |
|
313 |
- StartCoroutine(LoadAnim(NowSelectBundleName, NowSelectAnim)); |
|
314 |
- } |
|
315 |
- |
|
316 |
- private IEnumerator LoadAnim(string bundleName, string clipName) |
|
361 |
+ public void ShowVRTkAnim(GameObject instrObj, AnimationClip clip) |
|
317 | 362 |
{ |
318 |
- yield return StartCoroutine(MMHelper.AsyncLoader(bundleName + "clip")); |
|
363 |
+ string tempInstructorBundleName_ = MakeBundleName(NowSelectBundleName, false); |
|
319 | 364 |
|
320 |
- // 강사 클립 둘다 로드했으니 이제 꺼내자 |
|
321 |
- GameObject tempInstructor_ = null; |
|
322 |
- AnimationClip tempAnimClip_ = null; |
|
365 |
+ //uiManager.OnOffAnimUI(); |
|
366 |
+ for (int i = 0; i < 4; i++) |
|
367 |
+ { |
|
368 |
+ if (i < instructorObjs.Count) { |
|
369 |
+ // Do Nothing |
|
370 |
+ } |
|
371 |
+ else { |
|
372 |
+ instructorObjs.Add(Instantiate(instrObj)); |
|
323 | 373 |
|
324 |
- yield return StartCoroutine(MMHelper.GetAssetObjAsync<GameObject>("vrtaekwondo", NowSelectBundleName, callback => { |
|
325 |
- tempInstructor_ = callback; |
|
326 |
- })); |
|
374 |
+ instructorObjs[i].name = tempInstructorBundleName_; |
|
375 |
+ } |
|
327 | 376 |
|
328 |
- yield return StartCoroutine(MMHelper.GetAssetObjAsync<AnimationClip>("vrtaekwondo", NowSelectBundleName + "clip", callback => { |
|
329 |
- tempAnimClip_ = callback; |
|
330 |
- })); |
|
331 |
- |
|
332 |
- ShowVRTkAnim(tempInstructor_, tempAnimClip_); |
|
333 |
- } |
|
334 |
- |
|
335 |
- |
|
336 |
- |
|
337 |
- public void ShowVRTkAnim(GameObject coachObj, AnimationClip clip) |
|
338 |
- { |
|
339 |
- // uiManager.OnOffAnimUI(); |
|
340 |
- |
|
341 |
- |
|
342 |
- |
|
343 |
- // for (int i = 0; i < 4; i++) |
|
344 |
- // { |
|
345 |
- // if (i < tkCoachObjs.Count) |
|
346 |
- // { |
|
347 |
- // // Do Nothing |
|
348 |
- // } |
|
349 |
- // else |
|
350 |
- // { |
|
351 |
- // tkCoachObjs.Add(Instantiate(coachObj)); |
|
352 |
- |
|
353 |
- // tkCoachObjs[i].name = coachObj.name; |
|
354 |
- // // 거울에 안보이게 해주는 코드 실행 |
|
355 |
- // if (i == 0 || i == 1) |
|
356 |
- // { |
|
357 |
- // ModelLayerChange tempLayer_ = tkCoachObjs[i].GetComponent<ModelLayerChange>(); |
|
358 |
- // tempLayer_.ChangeLayerObjs(); |
|
359 |
- // } |
|
360 |
- // } |
|
361 |
- |
|
362 |
- // if(i < animController.nowAnimator.Count) |
|
363 |
- // { |
|
364 |
- // animController.nowAnimator[i] = tkCoachObjs[i].transform.GetComponent<Animator>(); |
|
365 |
- // } |
|
366 |
- // else |
|
367 |
- // { |
|
368 |
- // animController.nowAnimator.Add(tkCoachObjs[i].transform.GetComponent<Animator>()); |
|
369 |
- // } |
|
377 |
+ if(i < UserDataRepo.Instance.VRAnimController.nowAnimator.Count) |
|
378 |
+ { |
|
379 |
+ UserDataRepo.Instance.VRAnimController.nowAnimator[i] = instructorObjs[i].transform.GetComponent<Animator>(); |
|
380 |
+ } |
|
381 |
+ else |
|
382 |
+ { |
|
383 |
+ UserDataRepo.Instance.VRAnimController.nowAnimator.Add(instructorObjs[i].transform.GetComponent<Animator>()); |
|
384 |
+ } |
|
370 | 385 |
|
371 | 386 |
|
387 |
+ } |
|
388 |
+ |
|
389 |
+ // 5번째는 동작을 체크할 Dummy 추가 |
|
390 |
+ UserDataRepo.Instance.VRAnimController.SetDummyAnimator(); |
|
391 |
+ |
|
392 |
+ |
|
393 |
+ foreach (var obj in instructorObjs) { |
|
394 |
+ obj.SetActive(true); |
|
395 |
+ } |
|
396 |
+ |
|
397 |
+ UserDataRepo.Instance.VRAnimController.AllChangeAnimClip(clip); |
|
398 |
+ |
|
399 |
+ // 애니메이션 클립 교체가 이루어진다 |
|
400 |
+ // for (int i = 0; i < 5; i++) { |
|
401 |
+ // UserDataRepo.Instance.VRAnimController.AllChangeAnimClip(clip); |
|
372 | 402 |
// } |
373 | 403 |
|
374 |
- // // 여기서 Dummy 추가 |
|
375 |
- // if (5 <= animController.nowAnimator.Count ) |
|
376 |
- // { |
|
377 |
- // animController.nowAnimator[4] = animController.dummyCopyAnim; |
|
404 |
+ UserDataRepo.Instance.VRAnimController.GetModelFrameRate(); |
|
378 | 405 |
|
379 |
- // } |
|
380 |
- // else |
|
381 |
- // { |
|
382 |
- // animController.nowAnimator.Add(animController.dummyCopyAnim); |
|
383 |
- |
|
384 |
- // } |
|
385 |
- |
|
386 |
- // foreach (var anim in tkCoachObjs) |
|
387 |
- // { |
|
388 |
- // anim.SetActive(true); |
|
389 |
- |
|
390 |
- // } |
|
391 |
- |
|
392 |
- // // 애니메이션 클립 교체가 이루어진다 |
|
393 |
- // for (int i = 0; i < 5; i++) |
|
394 |
- // { |
|
395 |
- // animController.ChangeAnimClip(animController.nowAnimator[i], clip); |
|
396 |
- |
|
397 |
- // } |
|
406 |
+ popUp.SetActive(false); |
|
407 |
+ UserDataRepo.Instance.VRAnimController.ResetAnim(true); |
|
398 | 408 |
|
399 | 409 |
|
400 |
- // animController.GetModelFrameRate(); |
|
401 |
- |
|
402 |
- // popUp.SetActive(false); |
|
403 |
- // animController.ResetAnim(true); |
|
410 |
+ //uiManager.isAnimPlay = true; |
|
411 |
+ //animController.StopSpeed(); |
|
412 |
+ UserDataRepo.Instance.VRAnimController.RePlayAnim(false); |
|
404 | 413 |
|
405 | 414 |
|
406 |
- // uiManager.isAnimPlay = true; |
|
407 |
- // //animController.StopSpeed(); |
|
408 |
- // animController.RePlayAnim(false); |
|
415 |
+ //vrInforPopup.SetActive(true); |
|
409 | 416 |
|
410 |
- |
|
411 |
- // //vrInforPopup.SetActive(true); |
|
412 |
- |
|
413 |
- // uiManager.movementManager.gameObject.SetActive(true); |
|
417 |
+ UserDataRepo.Instance.MovementManager.gameObject.SetActive(true); |
|
414 | 418 |
|
415 |
- // uiManager.movementManager.StartMoveMentCheck(nowProgram, nowSelectAnim); |
|
419 |
+ UserDataRepo.Instance.MovementManager.StartMoveMentCheck(NowSelectAnim); |
|
416 | 420 |
} // ShowTkModel |
417 | 421 |
|
418 | 422 |
|
... | ... | @@ -446,8 +450,7 @@ |
446 | 450 |
/// <returns></returns> |
447 | 451 |
private string MakeBundleName(string bundleName, bool isAnim){ |
448 | 452 |
|
449 |
- string tempBundleName_ = string.Empty; |
|
450 |
- // { 현재 컨텐츠를 확인하고 관련 에셋번들 리스트 위치 번호를 가져오는 과정 |
|
453 |
+ string tempBundleName_ = string.Empty; |
|
451 | 454 |
|
452 | 455 |
tempBundleName_ = MMHelper.GetAssetBundleName(NowContentInt()) + $"_{bundleName.ToLower()}"; |
453 | 456 |
|
--- VRTK/Assets/00.MAINSTREAM/Scripts/Repo/UserDataRepo.cs
+++ VRTK/Assets/00.MAINSTREAM/Scripts/Repo/UserDataRepo.cs
... | ... | @@ -12,14 +12,14 @@ |
12 | 12 |
[SerializeField] private Transform userTrans; // 유저 위치 |
13 | 13 |
[SerializeField] private Transform userHeadTrans; // 유저 머리 위치 |
14 | 14 |
[SerializeField] private PlayerHeadUIInfo userHeadUI; // 유저 머리 UI |
15 |
+ [SerializeField] private Transform userHandLeftTrans; // 유저 왼쪽 팔 위치 |
|
16 |
+ [SerializeField] private Transform userHandRightTrans; // 유저 오른쪽 팔 위치 |
|
15 | 17 |
[SerializeField] private GameObject vrUICanvas; // VRUI Canvas 오브젝트 |
16 | 18 |
[SerializeField] private PlayAnimController vrAnimController; |
17 | 19 |
[SerializeField] private PlayUIManager uiManager; |
18 | 20 |
[SerializeField] private MovementManager movementManager; |
21 |
+ [SerializeField] private PoseManager poseManager; |
|
19 | 22 |
[SerializeField] private PlayVRUIManager vrUIManager; |
20 |
- |
|
21 |
- |
|
22 |
- |
|
23 | 23 |
[SerializeField] private PlayMapManager playMapManager; |
24 | 24 |
[SerializeField] private Transform vrPointer; |
25 | 25 |
|
... | ... | @@ -32,6 +32,9 @@ |
32 | 32 |
UserTransform = tempPlayerObj_.transform; |
33 | 33 |
|
34 | 34 |
UserHeadTrans = GameObject.FindWithTag(Define.MAIN_CAMERA_TAG).transform; |
35 |
+ |
|
36 |
+ UserHandLeftTrans = GameObject.Find("ModelsLeft").transform; |
|
37 |
+ UserHandRightTrans = GameObject.Find("ModelsRight").transform; |
|
35 | 38 |
|
36 | 39 |
VRUICanvas = GameObject.FindWithTag(Define.VR_UI_TAG); |
37 | 40 |
|
... | ... | @@ -64,6 +67,16 @@ |
64 | 67 |
public PlayerHeadUIInfo UserHeadUI { |
65 | 68 |
get { return userHeadUI; } |
66 | 69 |
set { userHeadUI = value; } |
70 |
+ } |
|
71 |
+ |
|
72 |
+ public Transform UserHandLeftTrans{ |
|
73 |
+ get { return userHandLeftTrans;} |
|
74 |
+ set { userHandLeftTrans = value; } |
|
75 |
+ } |
|
76 |
+ |
|
77 |
+ public Transform UserHandRightTrans{ |
|
78 |
+ get { return userHandRightTrans;} |
|
79 |
+ set { userHandRightTrans = value; } |
|
67 | 80 |
} |
68 | 81 |
|
69 | 82 |
|
... | ... | @@ -116,6 +129,19 @@ |
116 | 129 |
} |
117 | 130 |
|
118 | 131 |
/// <summary> |
132 |
+ /// PoseManager 스크립트 정보를 가져오는 프로퍼티 |
|
133 |
+ /// </summary> |
|
134 |
+ public PoseManager PoseManager |
|
135 |
+ { |
|
136 |
+ get { return poseManager; } |
|
137 |
+ set |
|
138 |
+ { |
|
139 |
+ if (poseManager == null) |
|
140 |
+ poseManager = value; |
|
141 |
+ } |
|
142 |
+ } |
|
143 |
+ |
|
144 |
+ /// <summary> |
|
119 | 145 |
/// PlayVRUIManager 스크립트 정보를 가져오는 프로퍼티 |
120 | 146 |
/// </summary> |
121 | 147 |
public PlayVRUIManager VRUIManager |
--- VRTK/Assets/00.MAINSTREAM/Scripts/Utils/MMDefine.cs
+++ VRTK/Assets/00.MAINSTREAM/Scripts/Utils/MMDefine.cs
... | ... | @@ -2,9 +2,6 @@ |
2 | 2 |
* 이 코드는 (주)메타모션 임직원에 의해 작성되었으며, 이 코드와 관련한 모든 권리는 (주)메타모션에 귀속됩니다. |
3 | 3 |
* Copyright © MetaMotion Inc. All rights reserved. |
4 | 4 |
* ================================================================================================================================================================ */ |
5 |
- |
|
6 |
-using System.ComponentModel; |
|
7 |
- |
|
8 | 5 |
/// <summary> |
9 | 6 |
/// 필요한 각종 상수나 범용 문자열 등을 저장하는 클래스 |
10 | 7 |
/// </summary> |
... | ... | @@ -15,10 +12,17 @@ |
15 | 12 |
#endregion |
16 | 13 |
|
17 | 14 |
#region path |
18 |
- public const string LOCAL_PATH = "C:\\Users\\KJH-Sub\\Documents\\00.DEVCENTRAL\\App\\assets\\"; // Unity Editor에서 개발할 때 리소스가 들어갈 로컬 경로 |
|
15 |
+ public const string LOCAL_PATH = "./00.DEVCENTRAL/App/assets/"; |
|
16 |
+ //"C:/Users/KJH-Sub/Documents/00.DEVCENTRAL/App/assets/"; // Unity Editor에서 개발할 때 리소스가 들어갈 로컬 경로 |
|
19 | 17 |
public const string STORAGE_PATH = "/sdcard/Android/obb/"; // MQDH에서 에셋파일을 다운받는 경로 중, 기기경로 |
20 | 18 |
public const string PACKAGE_PATH = "com.MetaMotion.VRTk"; // MQDH에서 에셋파일을 다운받는 경로 중, 패키지명 |
21 |
- public const string FULL_FILE_PATH = STORAGE_PATH + PACKAGE_PATH + "/"; // MQDH에서 에셋파일을 다운받는 전체경로 |
|
19 |
+ public const string FULL_FILE_PATH = |
|
20 |
+#if UNITY_EDITOR |
|
21 |
+ LOCAL_PATH; |
|
22 |
+#else |
|
23 |
+ STORAGE_PATH + PACKAGE_PATH + "/"; // MQDH에서 에셋파일을 다운받는 전체경로 |
|
24 |
+#endif |
|
25 |
+ |
|
22 | 26 |
#endregion |
23 | 27 |
|
24 | 28 |
#region jsonNames |
--- VRTK/Assets/00.MAINSTREAM/Scripts/Utils/MMHelper.cs
+++ VRTK/Assets/00.MAINSTREAM/Scripts/Utils/MMHelper.cs
... | ... | @@ -5,10 +5,7 @@ |
5 | 5 |
using Oculus.Platform.Models; |
6 | 6 |
using Unity.VisualScripting; |
7 | 7 |
using UnityEngine; |
8 |
-using UnityEngine.Events; |
|
9 | 8 |
using UnityEngine.SceneManagement; |
10 |
-using UnityEngine.U2D; |
|
11 |
-using UnityEngine.UI; |
|
12 | 9 |
|
13 | 10 |
/// <summary> |
14 | 11 |
/// 여러 유틸리티형 헬퍼 메소드를 저장해두는 곳 |
... | ... | @@ -64,8 +61,8 @@ |
64 | 61 |
/// <param name="bundleName"></param> |
65 | 62 |
/// <param name="useObjName"></param> |
66 | 63 |
/// <param name="callback"></param> |
67 |
- /// <returns></returns> |
|
68 |
- public static IEnumerator GetAssetObjAsync<T>(string bundleName, string useObjName, Action<T> callback) |
|
64 |
+ /// <returns> T </returns> |
|
65 |
+ public static IEnumerator GetAssetObjAsync(string bundleName, string useObjName, Action<GameObject> callback) |
|
69 | 66 |
{ |
70 | 67 |
int tempCaseNum_ = 0; |
71 | 68 |
int tempNumber_ = 0; |
... | ... | @@ -98,28 +95,76 @@ |
98 | 95 |
Debug.LogError("해당 파일이 없습니다"); |
99 | 96 |
} |
100 | 97 |
else{ |
101 |
- reqAsset_ = AssetBundleRepo.Instance.GetAssetBundleList(tempCaseNum_)[tempNumber_].LoadAssetAsync<T>(useObjName); |
|
98 |
+ reqAsset_ = AssetBundleRepo.Instance.GetAssetBundleList(tempCaseNum_)[tempNumber_].LoadAssetAsync<GameObject>(useObjName); |
|
99 |
+ } |
|
100 |
+ |
|
101 |
+ yield return reqAsset_.isDone; |
|
102 |
+ Debug.LogError(reqAsset_.asset); |
|
103 |
+ //callback((T)Convert.ChangeType(reqAsset_.asset, typeof(T))); |
|
104 |
+ |
|
105 |
+#if UNITY_EDITOR |
|
106 |
+ // tempObj_가 GameObject 형식인지 확인하고 반환 |
|
107 |
+ if(reqAsset_.asset != null) { |
|
108 |
+ AssetBundleEditorUtil.FixShadersForEditor((GameObject)reqAsset_.asset); |
|
109 |
+ Debug.LogError(reqAsset_.asset); |
|
110 |
+ |
|
111 |
+ callback((GameObject)reqAsset_.asset); |
|
112 |
+ } |
|
113 |
+#else |
|
114 |
+ callback((GameObject)reqAsset_.asset); |
|
115 |
+#endif |
|
116 |
+ |
|
117 |
+ } |
|
118 |
+ |
|
119 |
+ /// <summary> |
|
120 |
+ /// 에셋번들에서 애니메이션 클립을 가져오는 코루틴 |
|
121 |
+ /// </summary> |
|
122 |
+ /// <param name="bundleName"></param> |
|
123 |
+ /// <param name="useObjName"></param> |
|
124 |
+ /// <param name="clipName"></param> |
|
125 |
+ /// <param name="callback"></param> |
|
126 |
+ /// <typeparam name="T"></typeparam> |
|
127 |
+ /// <returns> AnimationClip </returns> |
|
128 |
+ public static IEnumerator GetAssetObjAsync(string bundleName, string useObjName, string clipName, Action<AnimationClip> callback) |
|
129 |
+ { |
|
130 |
+ int tempCaseNum_ = 0; |
|
131 |
+ int tempNumber_ = 0; |
|
132 |
+ AssetBundleRequest reqAsset_ = null; |
|
133 |
+ |
|
134 |
+ string assetBundleName_ = (bundleName + "_" + useObjName + "clip").ToLower(); |
|
135 |
+ Debug.Log("assetBundleName : " + assetBundleName_); |
|
136 |
+ |
|
137 |
+ if(bundleName.Contains("vrui")) { |
|
138 |
+ tempCaseNum_ = MMDefine.VRUI; |
|
139 |
+ } |
|
140 |
+ else if(bundleName.Contains("vrobj")) { |
|
141 |
+ tempCaseNum_ = MMDefine.VROBJ; |
|
142 |
+ } |
|
143 |
+ else if(bundleName.Contains("vrmap")) { |
|
144 |
+ tempCaseNum_ = MMDefine.VRMAP; |
|
145 |
+ } |
|
146 |
+ else if (bundleName.Contains("vrtaekwondo")) |
|
147 |
+ { |
|
148 |
+ tempCaseNum_ = MMDefine.VRTAEKWONDO; |
|
149 |
+ } |
|
150 |
+ else if (bundleName.Contains("ptcl")) |
|
151 |
+ { |
|
152 |
+ tempCaseNum_ = MMDefine.PARTICLE; |
|
153 |
+ } |
|
154 |
+ |
|
155 |
+ tempNumber_ = AssetBundleRepo.Instance.GetAssetBundleList(tempCaseNum_).FindIndex(x => x.name.Equals(assetBundleName_)); |
|
156 |
+ |
|
157 |
+ if(tempNumber_ == -1){ |
|
158 |
+ Debug.LogError("해당 파일이 없습니다"); |
|
159 |
+ } |
|
160 |
+ else{ |
|
161 |
+ reqAsset_ = AssetBundleRepo.Instance.GetAssetBundleList(tempCaseNum_)[tempNumber_].LoadAssetAsync<AnimationClip>(clipName); |
|
102 | 162 |
} |
103 | 163 |
|
104 | 164 |
yield return reqAsset_.isDone; |
105 | 165 |
Debug.LogError(reqAsset_.asset); |
106 | 166 |
|
107 |
- T tempObj_ = reqAsset_.asset.GetComponent<T>(); |
|
108 |
- |
|
109 |
-#if UNITY_EDITOR |
|
110 |
- // tempObj_가 GameObject 형식인지 확인하고 반환 |
|
111 |
- GameObject tempCheck_ = tempObj_ as GameObject; |
|
112 |
- if(tempCheck_ != null) { |
|
113 |
- AssetBundleEditorUtil.FixShadersForEditor(tempCheck_); |
|
114 |
- |
|
115 |
- tempObj_ = tempCheck_.GetComponent<T>(); |
|
116 |
- |
|
117 |
- callback(tempObj_); |
|
118 |
- } |
|
119 |
-#else |
|
120 |
- callback(tempObj_); |
|
121 |
-#endif |
|
122 |
- |
|
167 |
+ callback((AnimationClip)reqAsset_.asset); |
|
123 | 168 |
} |
124 | 169 |
|
125 | 170 |
|
--- VRTK/Assets/01.Junil/Script/Animator/AnimSpeedController.cs
+++ VRTK/Assets/01.Junil/Script/Animator/AnimSpeedController.cs
... | ... | @@ -803,12 +803,12 @@ |
803 | 803 |
|
804 | 804 |
|
805 | 805 |
// 외곽선 효과를 끄기 위해서 가져옴 |
806 |
- List<EffectPoseText> tempList_ = UIManager.Instance.movementManager.poseManager.effectPoseText; |
|
806 |
+ //List<EffectPoseText> tempList_ = UIManager.Instance.effectPoseText; |
|
807 | 807 |
|
808 |
- foreach (var outline in tempList_) |
|
809 |
- { |
|
810 |
- outline.AllStopOutLines(); |
|
811 |
- } |
|
808 |
+ // foreach (var outline in tempList_) |
|
809 |
+ // { |
|
810 |
+ // outline.AllStopOutLines(); |
|
811 |
+ // } |
|
812 | 812 |
|
813 | 813 |
//if (isFirst) |
814 | 814 |
//{ |
--- VRTK/Assets/01.Junil/Script/Lobby/AssetBundleDataManager.cs
+++ VRTK/Assets/01.Junil/Script/Lobby/AssetBundleDataManager.cs
... | ... | @@ -295,7 +295,6 @@ |
295 | 295 |
break; |
296 | 296 |
} |
297 | 297 |
|
298 |
- |
|
299 | 298 |
yield return reqAsset_; |
300 | 299 |
|
301 | 300 |
tempAsset_ = (AnimationClip)reqAsset_.asset; |
--- VRTK/Assets/01.Junil/Script/Obj/InputPoseModel.cs
+++ VRTK/Assets/01.Junil/Script/Obj/InputPoseModel.cs
... | ... | @@ -49,7 +49,7 @@ |
49 | 49 |
//tempDummy_.SetActive(false); |
50 | 50 |
} |
51 | 51 |
|
52 |
- public void SetVRIK(Animator modelObj, ref PoseManager poseManager ) |
|
52 |
+ public void SetVRIK(Animator modelObj) |
|
53 | 53 |
{ |
54 | 54 |
Animator tempAnim_ = null; |
55 | 55 |
VRIK tempVRIK_ = null; |
... | ... | @@ -148,11 +148,11 @@ |
148 | 148 |
//modelIks.Add(copyModelObj); |
149 | 149 |
} |
150 | 150 |
|
151 |
- poseManager.userAnim = UIManager.Instance.vrAnim.dummyAnim; |
|
151 |
+ //UserDataRepo.Instance.PoseManager.userAnim = UserDataRepo.Instance.VRAnimController.DummyAnim; |
|
152 | 152 |
|
153 |
- poseManager.modelVrIK = UIManager.Instance.vrAnim.dummyCopyVRIK; |
|
153 |
+ //UserDataRepo.Instance.PoseManager.ModelVrIK = UserDataRepo.Instance.VRAnimController.DummyCopyVRIK; |
|
154 | 154 |
|
155 |
- poseManager.playerVrIK = UIManager.Instance.vrAnim.dummyVRIK; |
|
155 |
+ //UserDataRepo.Instance.PoseManager.PlayerVrIK = UserDataRepo.Instance.VRAnimController.DummyVRIK; |
|
156 | 156 |
} // SetVRIK |
157 | 157 |
|
158 | 158 |
|
--- VRTK/Assets/01.Junil/Script/UI/MirrorMenuManager.cs
+++ VRTK/Assets/01.Junil/Script/UI/MirrorMenuManager.cs
... | ... | @@ -47,11 +47,6 @@ |
47 | 47 |
speedTxt.text = nowSpeed; |
48 | 48 |
} |
49 | 49 |
|
50 |
- public void OpenGuide() |
|
51 |
- { |
|
52 |
- //OnOffMenuBtn(); |
|
53 |
- //nowVRUI.vrInforPopup.SetActive(true); |
|
54 |
- } |
|
55 | 50 |
|
56 | 51 |
//public void OpenMenu() |
57 | 52 |
//{ |
--- VRTK/Assets/01.Junil/Script/UI/MovementManager.cs
+++ VRTK/Assets/01.Junil/Script/UI/MovementManager.cs
... | ... | @@ -5,60 +5,38 @@ |
5 | 5 |
using UnityEngine; |
6 | 6 |
using UnityEngine.SceneManagement; |
7 | 7 |
using UnityEngine.InputSystem; |
8 |
+using I2.Loc; |
|
8 | 9 |
|
9 | 10 |
public class MovementManager : MonoBehaviour |
10 | 11 |
{ |
12 |
+ public GameObject mirrorObj; |
|
13 |
+ |
|
11 | 14 |
// 같은 위치에 있고 poseManager의 활성화 유무를 여기서 컨트롤하며 |
12 | 15 |
// 플레이어에도 그게 맞게 동작해야함. |
13 |
- public PoseManager poseManager; |
|
14 |
- |
|
15 |
- public Slider sliderPlay; |
|
16 |
- |
|
17 |
- public TMP_Text nowProgramInfoTxt; |
|
18 |
- public TMP_Text nowAnimInfoTxt; |
|
19 |
- |
|
20 |
- public TMP_Text animTimeTxt; |
|
21 |
- |
|
22 |
- public Image sliderFill; |
|
23 |
- |
|
24 |
- public InputPoseModel inputPoseModel; |
|
16 |
+ //[SerializeField] private PoseManager poseManager; |
|
17 |
+ [SerializeField] private Localize nowAnimInfoTxt; |
|
18 |
+ [SerializeField] private TMP_Text animTimeTxt; |
|
19 |
+ //[SerializeField] private InputPoseModel inputPoseModel; |
|
25 | 20 |
|
26 | 21 |
//public UIManager uiManager; |
27 | 22 |
|
28 |
- public GameObject startView; |
|
29 |
- public GameObject movementInfoView; |
|
30 |
- |
|
31 |
- public TMP_Text startTxt; |
|
32 |
- public List<DummyController> modelDummyControllers = new List<DummyController>(); |
|
23 |
+ [SerializeField] private GameObject startView; |
|
24 |
+ [SerializeField] private GameObject movementInfoView; |
|
25 |
+ [SerializeField] private Button startBtn; |
|
26 |
+ [SerializeField] private TMP_Text startTxt; |
|
27 |
+ //public List<DummyController> modelDummyControllers = new List<DummyController>(); |
|
33 | 28 |
|
34 | 29 |
public InputActionProperty anyKetStartButton; |
35 | 30 |
public MirrorMenuManager mirrorMenuManager; |
36 | 31 |
|
37 |
- public MirrorCamPos mirrorCamPos; |
|
38 |
- |
|
39 | 32 |
private void Awake() |
40 | 33 |
{ |
41 |
- startView.SetActive(true); |
|
42 |
- movementInfoView.SetActive(true); |
|
43 | 34 |
|
44 |
- poseManager = gameObject.GetComponent<PoseManager>(); |
|
45 |
- |
|
46 |
- //if (poseManager.enabled == true) |
|
47 |
- // poseManager.enabled = false; |
|
48 |
- |
|
49 |
- if (inputPoseModel == null) |
|
50 |
- { |
|
51 |
- inputPoseModel = UserDataRepo.Instance.UserTransform.GetComponent<InputPoseModel>(); |
|
52 |
- } |
|
53 | 35 |
} |
54 | 36 |
|
55 | 37 |
// Start is called before the first frame update |
56 | 38 |
void Start() |
57 | 39 |
{ |
58 |
- UserDataRepo.Instance.MovementManager = this; |
|
59 |
- |
|
60 |
- anyKetStartButton = UserDataRepo.Instance.UIManager.GetInputKey("Start"); |
|
61 |
- |
|
62 | 40 |
SetUpMovementUI(); |
63 | 41 |
} |
64 | 42 |
|
... | ... | @@ -72,7 +50,7 @@ |
72 | 50 |
// RestartReady(); |
73 | 51 |
//} |
74 | 52 |
|
75 |
- if (startView.activeSelf == true && |
|
53 |
+ if (mirrorObj.activeSelf && startView.activeSelf && |
|
76 | 54 |
anyKetStartButton.action.WasPressedThisFrame()) |
77 | 55 |
{ |
78 | 56 |
StartPlayMode(); |
... | ... | @@ -91,27 +69,24 @@ |
91 | 69 |
mirrorMenuManager.modeObj.SetActive(false); |
92 | 70 |
movementInfoView.SetActive(false); |
93 | 71 |
Debug.Log("현재 골라진 모드" + selectMode); |
72 |
+ |
|
73 |
+ UserDataRepo.Instance.PoseManager.IsDivided = false; |
|
94 | 74 |
|
95 | 75 |
switch (selectMode) |
96 | 76 |
{ |
97 | 77 |
case "Practice": |
98 | 78 |
mirrorMenuManager.modeObj.SetActive(true); |
99 | 79 |
movementInfoView.SetActive(true); |
100 |
- poseManager.isDivided = false; |
|
101 |
- |
|
102 | 80 |
break; |
103 | 81 |
|
104 | 82 |
case "Divided": |
105 | 83 |
mirrorMenuManager.speedObj.SetActive(true); |
106 | 84 |
mirrorMenuManager.modeObj.SetActive(true); |
107 |
- poseManager.isDivided = true; |
|
108 |
- |
|
85 |
+ UserDataRepo.Instance.PoseManager.IsDivided = true; |
|
109 | 86 |
break; |
110 | 87 |
|
111 | 88 |
case "Evaluation": |
112 | 89 |
movementInfoView.SetActive(true); |
113 |
- poseManager.isDivided = false; |
|
114 |
- |
|
115 | 90 |
break; |
116 | 91 |
} |
117 | 92 |
} |
... | ... | @@ -126,7 +101,7 @@ |
126 | 101 |
|
127 | 102 |
ShowSelectModeUI(UserDataRepo.Instance.VRAnimController.NowState.ToString()); |
128 | 103 |
UserDataRepo.Instance.VRAnimController.ChangeAnimState(UserDataRepo.Instance.VRAnimController.NowState.ToString()); |
129 |
- poseManager.isDivided = true; |
|
104 |
+ UserDataRepo.Instance.PoseManager.IsDivided = true; |
|
130 | 105 |
UserDataRepo.Instance.VRAnimController.ResetAnim(false); |
131 | 106 |
} |
132 | 107 |
else |
... | ... | @@ -137,7 +112,7 @@ |
137 | 112 |
|
138 | 113 |
ShowSelectModeUI("Practice"); |
139 | 114 |
UserDataRepo.Instance.VRAnimController.ChangeAnimState("Practice"); |
140 |
- poseManager.isDivided = false; |
|
115 |
+ UserDataRepo.Instance.PoseManager.IsDivided = false; |
|
141 | 116 |
|
142 | 117 |
UserDataRepo.Instance.VRAnimController.ResetAnim(false); |
143 | 118 |
} |
... | ... | @@ -145,15 +120,8 @@ |
145 | 120 |
} |
146 | 121 |
|
147 | 122 |
|
148 |
- public void StartMoveMentCheck(string nowProgramName, string nowAnimName) |
|
123 |
+ public void StartMoveMentCheck(string nowAnimName) |
|
149 | 124 |
{ |
150 |
- if (SceneManager.GetActiveScene().name != Define.VR_SCENE_FOUR) |
|
151 |
- { |
|
152 |
- gameObject.SetActive(false); |
|
153 |
- |
|
154 |
- return; |
|
155 |
- } |
|
156 |
- |
|
157 | 125 |
startView.SetActive(true); |
158 | 126 |
//vementInfoView.SetActive(false); |
159 | 127 |
startTxt.text = "Start!"; |
... | ... | @@ -161,7 +129,7 @@ |
161 | 129 |
ShowSelectModeUI(UserDataRepo.Instance.VRAnimController.NowState.ToString()); |
162 | 130 |
|
163 | 131 |
// List를 배열로 변경해서 삽입 |
164 |
- poseManager.animArray = UserDataRepo.Instance.VRAnimController.nowAnimator.ToArray(); |
|
132 |
+ UserDataRepo.Instance.PoseManager.AnimArray = UserDataRepo.Instance.VRAnimController.nowAnimator.ToArray(); |
|
165 | 133 |
//poseManager.effectPoseText.Add(poseManager.animArray[1].GetComponent<EffectPoseText>()); |
166 | 134 |
|
167 | 135 |
// 거울 카메라의 타겟 |
... | ... | @@ -169,7 +137,7 @@ |
169 | 137 |
|
170 | 138 |
|
171 | 139 |
//modelDummyControllers.Clear(); |
172 |
- poseManager.effectPoseText.Clear(); |
|
140 |
+ UserDataRepo.Instance.PoseManager.EffectPoseText.Clear(); |
|
173 | 141 |
|
174 | 142 |
//foreach (var model in poseManager.animArray) |
175 | 143 |
//{ |
... | ... | @@ -189,8 +157,8 @@ |
189 | 157 |
|
190 | 158 |
for (int i = 0; i < 4; i++) |
191 | 159 |
{ |
192 |
- EffectPoseText tempEffect_ = poseManager.animArray[i].GetComponent<EffectPoseText>(); |
|
193 |
- poseManager.effectPoseText.Add(tempEffect_); |
|
160 |
+ EffectPoseText tempEffect_ = UserDataRepo.Instance.PoseManager.AnimArray[i].GetComponent<EffectPoseText>(); |
|
161 |
+ UserDataRepo.Instance.PoseManager.EffectPoseText.Add(tempEffect_); |
|
194 | 162 |
} |
195 | 163 |
|
196 | 164 |
|
... | ... | @@ -206,15 +174,16 @@ |
206 | 174 |
|
207 | 175 |
//UIManager.Instance.RecenterPlayer(); |
208 | 176 |
|
209 |
- inputPoseModel.SetVRIK(poseManager.animArray[0], ref poseManager); |
|
177 |
+ //inputPoseModel.SetVRIK(UserDataRepo.Instance.PoseManager.AnimArray[0]); |
|
210 | 178 |
|
211 | 179 |
// Dummy의 DummyController 활성화 |
212 |
- DummyController tempDummy_ = poseManager.animArray[4].GetComponent<DummyController>(); |
|
213 |
- tempDummy_.poseManager = poseManager; |
|
180 |
+ DummyController tempDummy_ = UserDataRepo.Instance.PoseManager.AnimArray[4].GetComponent<DummyController>(); |
|
181 |
+ //tempDummy_.poseManager = poseManager; |
|
214 | 182 |
tempDummy_.isMatchCharacter = true; |
215 | 183 |
|
216 |
- SetNowInfoTxt(nowProgramName, nowAnimName); |
|
184 |
+ SetNowInfoTxt(nowAnimName); |
|
217 | 185 |
|
186 |
+ mirrorObj.SetActive(true); |
|
218 | 187 |
|
219 | 188 |
if (UserDataRepo.Instance.VRUICanvas.activeSelf) |
220 | 189 |
UserDataRepo.Instance.UIManager.OnOffMainUI(); |
... | ... | @@ -273,114 +242,75 @@ |
273 | 242 |
UserDataRepo.Instance.VRUIManager.AllOffUI(); |
274 | 243 |
|
275 | 244 |
// 결과창 꺼내기 |
276 |
- // mirrorMenuManager.nowVRUI. |
|
277 |
- // resultUIManager.gameObject.SetActive(true); |
|
245 |
+ UserDataRepo.Instance.VRUIManager.ResultUIManager.OpenResultUI(); |
|
278 | 246 |
|
279 |
- // mirrorMenuManager.nowVRUI. |
|
280 |
- // resultUIManager.ViewResultUI( |
|
281 |
- // poseManager.greatCount, poseManager.goodCount, poseManager.missCount); |
|
247 |
+ UserDataRepo.Instance.VRUIManager.ResultUIManager.ViewResultUI( |
|
248 |
+ UserDataRepo.Instance.PoseManager.greatCount, |
|
249 |
+ UserDataRepo.Instance.PoseManager.goodCount, |
|
250 |
+ UserDataRepo.Instance.PoseManager.missCount); |
|
282 | 251 |
} |
283 | 252 |
//poseManager.enabled = false; |
284 | 253 |
} |
285 | 254 |
|
286 |
- public void SetNowInfoTxt(string nowProgram, string nowAnim) |
|
287 |
- { |
|
288 |
- //I2.Loc.LocalizationManager.GetTranslation($"coach(gdStage)/{name}"); |
|
289 |
- // 추후 동작평가를 위처럼 현지화 해서 사용해야? |
|
290 |
- |
|
291 |
- string tempStr_ = string.Empty; |
|
292 |
- |
|
293 |
- switch (nowProgram) |
|
294 |
- { |
|
295 |
- case "Basic": |
|
296 |
- tempStr_ = "기본 동작 중"; |
|
297 |
- |
|
298 |
- break; |
|
299 |
- |
|
300 |
- case "Poomsae": |
|
301 |
- tempStr_ = "동작 평가 중"; |
|
302 |
- |
|
303 |
- break; |
|
304 |
- |
|
305 |
- case "Olympic": |
|
306 |
- tempStr_ = "동작 평가 중"; |
|
307 |
- |
|
308 |
- break; |
|
309 |
- } |
|
310 |
- |
|
311 |
- string nowAnimTxt_ = I2.Loc.LocalizationManager.GetTranslation($"animationClip(gdQuest)/{nowAnim}"); |
|
312 |
- |
|
313 |
- nowProgramInfoTxt.text = tempStr_; |
|
314 |
- |
|
315 |
- |
|
316 |
- nowAnimInfoTxt.text = nowAnimTxt_; |
|
255 |
+ public void SetNowInfoTxt(string nowAnim) |
|
256 |
+ { |
|
257 |
+ nowAnimInfoTxt.Term = $"animationClip(gdQuest)/{nowAnim}"; |
|
317 | 258 |
} |
318 | 259 |
|
319 | 260 |
public void SetUpMovementUI() |
320 | 261 |
{ |
321 |
- if(SceneManager.GetActiveScene().name != Define.VR_SCENE_FOUR) |
|
322 |
- { |
|
323 |
- gameObject.SetActive(false); |
|
262 |
+ if(mirrorObj == null) |
|
263 |
+ mirrorObj = transform.Find("Movement_UI").gameObject; |
|
324 | 264 |
|
325 |
- return; |
|
265 |
+ if(startView == null) |
|
266 |
+ startView = mirrorObj.transform.Find("00.Start").gameObject; |
|
267 |
+ |
|
268 |
+ |
|
269 |
+ if(startBtn == null) |
|
270 |
+ startBtn = startView.transform.Find("StartButton").GetComponent<Button>(); |
|
271 |
+ |
|
272 |
+ if(startTxt == null){ |
|
273 |
+ Transform tempStartBtn_ = startView.transform.Find("StartButton"); |
|
274 |
+ startTxt = tempStartBtn_.Find("StartTxt").GetComponent<TMP_Text>(); |
|
326 | 275 |
} |
276 |
+ |
|
277 |
+ if(!startView.activeSelf) |
|
278 |
+ startView.SetActive(true); |
|
327 | 279 |
|
328 |
- GameObject movementInfo_ = gameObject.transform.Find("01.Movement_Info").gameObject; |
|
280 |
+ if(movementInfoView == null) |
|
281 |
+ movementInfoView = mirrorObj.transform.Find("01.Movement_Info").gameObject; |
|
329 | 282 |
|
330 |
- //if (sliderPlay == null) |
|
331 |
- //{ |
|
332 |
- // GameObject tempSilder_ = movementInfo_.transform.Find("Slider").gameObject; |
|
333 |
- // sliderPlay = tempSilder_.GetComponent<Slider>(); |
|
334 |
- //} |
|
283 |
+ if(!movementInfoView.activeSelf) |
|
284 |
+ movementInfoView.SetActive(true); |
|
335 | 285 |
|
336 |
- //if (userPoseTxt == null) |
|
337 |
- //{ |
|
338 |
- // GameObject tempUserPoseTxt_ = movementInfo_.transform.Find("UserPoseTxt").gameObject; |
|
339 |
- // userPoseTxt = tempUserPoseTxt_.GetComponent<TMP_Text>(); |
|
340 |
- //} |
|
341 |
- |
|
342 |
- //if (sliderFill == null) |
|
343 |
- //{ |
|
344 |
- // GameObject tempSilder_ = movementInfo_.transform.Find("Slider").gameObject; |
|
345 |
- // //GameObject tempFillErea_ = tempSilder_.transform.Find("Fill Area").gameObject; |
|
346 |
- // //GameObject tempFill_ = tempFillErea_.transform.GetChild(0).gameObject; |
|
347 |
- // //sliderFill = tempFill_.GetComponent<Image>(); |
|
348 |
- // sliderFill = tempSilder_.transform.Find("Fill").GetComponent<Image>(); |
|
349 |
- |
|
350 |
- //} |
|
351 |
- |
|
352 |
- if (animTimeTxt == null) |
|
353 |
- { |
|
354 |
- GameObject tempSilder_ = movementInfo_.transform.Find("Slider").gameObject; |
|
355 |
- GameObject tempAnimTxt_ = tempSilder_.transform.Find("AnimTimeTxt").gameObject; |
|
286 |
+ //if (inputPoseModel == null) |
|
287 |
+ // inputPoseModel = UserDataRepo.Instance.UserTransform.GetComponent<InputPoseModel>(); |
|
288 |
+ |
|
289 |
+ if (animTimeTxt == null) { |
|
290 |
+ Transform tempProgress_ = movementInfoView.transform.Find("ProgressBar3D"); |
|
291 |
+ Transform tempAnimTxt_ = tempProgress_.Find("AnimTimeTxt"); |
|
356 | 292 |
animTimeTxt = tempAnimTxt_.GetComponent<TMP_Text>(); |
357 | 293 |
} |
358 | 294 |
|
359 |
- Transform tempNowInfo_ = movementInfo_.transform.Find("NowInfoObj"); |
|
295 |
+ if (nowAnimInfoTxt == null) { |
|
296 |
+ Transform tempAnimInfo_ = movementInfoView.transform.Find("NowInfoObj"); |
|
297 |
+ Transform tempAnimInfoTxt_ = tempAnimInfo_.transform.Find("NowAnimInfoTxt"); |
|
360 | 298 |
|
361 |
- if (nowProgramInfoTxt == null) |
|
362 |
- { |
|
363 |
- Transform tempProgramInfo_ = tempNowInfo_.transform.Find("NowProgramInfoTxt"); |
|
364 |
- |
|
365 |
- nowProgramInfoTxt = tempProgramInfo_.GetComponent<TMP_Text>(); |
|
299 |
+ nowAnimInfoTxt = tempAnimInfoTxt_.GetComponent<Localize>(); |
|
300 |
+ } |
|
301 |
+ |
|
302 |
+ if(mirrorMenuManager == null) { |
|
303 |
+ Transform tempMirrorMenu_ = mirrorObj.transform.Find("MirrorControlls"); |
|
304 |
+ mirrorMenuManager = tempMirrorMenu_.GetComponent<MirrorMenuManager>(); |
|
366 | 305 |
} |
367 | 306 |
|
368 |
- if (nowAnimInfoTxt == null) |
|
369 |
- { |
|
370 |
- Transform tempAnimInfo_ = tempNowInfo_.transform.Find("NowAnimInfoTxt"); |
|
371 |
- |
|
372 |
- nowAnimInfoTxt = tempAnimInfo_.GetComponent<TMP_Text>(); |
|
373 |
- } |
|
374 |
- |
|
375 |
- nowProgramInfoTxt.text = ""; |
|
376 |
- nowAnimInfoTxt.text = ""; |
|
377 |
- |
|
378 |
- //poseManager.sliderPlay = sliderPlay; |
|
379 |
- //poseManager.sliderBG = sliderFill; |
|
380 |
- //poseManager.userPoseState = userPoseTxt; |
|
307 |
+ startBtn.onClick.AddListener(() => StartPlayMode()); |
|
381 | 308 |
|
382 | 309 |
mirrorMenuManager.modeBtn.onClick.AddListener(() => OnDividedMode()); |
383 | 310 |
|
384 |
- //gameObject.SetActive(false); |
|
311 |
+ anyKetStartButton = UserDataRepo.Instance.UIManager.GetInputKey("Start"); |
|
312 |
+ UserDataRepo.Instance.MovementManager = this; |
|
313 |
+ |
|
314 |
+ mirrorObj.SetActive(false); |
|
385 | 315 |
} |
386 | 316 |
} |
--- VRTK/Assets/01.Junil/Script/UI/ResultUIManager.cs
+++ VRTK/Assets/01.Junil/Script/UI/ResultUIManager.cs
... | ... | @@ -53,14 +53,12 @@ |
53 | 53 |
resultUI.SetActive(true); |
54 | 54 |
} |
55 | 55 |
|
56 |
- public void CloseResultUI() |
|
56 |
+ public IEnumerator CloseResultUI() |
|
57 | 57 |
{ |
58 |
- UIManager.Instance.mapChange.AllOffMapPlay(); |
|
59 |
- UIManager.Instance.mapChange.ChangeLobbyMap(string.Empty); |
|
60 |
- |
|
61 |
- UIManager.Instance.vrAnim.AllCloseObjs(); |
|
62 |
- UIManager.Instance.isAnimPlay = false; |
|
63 |
- UIManager.Instance.createUI.SetActive(false); |
|
58 |
+ Debug.Log("In CloseResultUI"); |
|
59 |
+ yield return StartCoroutine(UserDataRepo.Instance.PlayMapManager.ChangeLobbyMap("vrmap_lobby01")); |
|
60 |
+ UserDataRepo.Instance.VRAnimController.AllCloseObjs(); |
|
61 |
+ UserDataRepo.Instance.VRUICanvas.SetActive(false); |
|
64 | 62 |
} |
65 | 63 |
|
66 | 64 |
|
... | ... | @@ -93,9 +91,8 @@ |
93 | 91 |
|
94 | 92 |
|
95 | 93 |
//UIManager.Instance.vrTkUIManager.nowSelectCoachName; |
96 |
- |
|
97 |
- string tempStr_ = I2.Loc.LocalizationManager.GetTranslation( |
|
98 |
- $"coach(gdStage)/{UIManager.Instance.vrTkUIManager.nowSelectCoachName}"); |
|
94 |
+ string tempStr_ = LocalizationManager.GetTranslation( |
|
95 |
+ $"coach(gdStage)/{UserDataRepo.Instance.VRUIManager.NowSelectNameKey}"); |
|
99 | 96 |
// 강사 이름 어떻게 가져오지? |
100 | 97 |
instructorNameTxt.text = $"{tempStr_} 강사"; |
101 | 98 |
|
... | ... | @@ -172,7 +169,6 @@ |
172 | 169 |
bestScoreVal = tempBestScore_.Find("BestScoreVal").GetComponent<TMP_Text>(); |
173 | 170 |
} |
174 | 171 |
|
175 |
- |
|
176 | 172 |
if (evaluationTxt == null) |
177 | 173 |
{ |
178 | 174 |
evaluationTxt = tempTotalInfo_.transform.Find("Evaluation").GetComponent<TMP_Text>(); |
... | ... | @@ -217,7 +213,6 @@ |
217 | 213 |
{ |
218 | 214 |
Transform tempGold_ = tempTotalInfo_.transform.Find("Gold_Count"); |
219 | 215 |
goldCount = tempGold_.Find("GoldCount").GetComponent<TMP_Text>(); |
220 |
- |
|
221 | 216 |
} |
222 | 217 |
|
223 | 218 |
if(rankingBtn == null) |
... | ... | @@ -235,21 +230,19 @@ |
235 | 230 |
continueBtn = tempBtns_.transform.Find("ContinueBtn").GetComponent<Button>(); |
236 | 231 |
} |
237 | 232 |
|
238 |
- //if (uiManager == null) |
|
239 |
- //{ |
|
240 |
- // GameObject tempObj_ = GameObject.FindWithTag(Define.UI_MANAGER_TAG); |
|
241 |
- // uiManager = tempObj_.GetComponent<UIManager>(); |
|
242 |
- //} |
|
243 | 233 |
|
244 | 234 |
// 랭킹은 잠시 끄기 |
245 | 235 |
//rankingBtn.onClick.AddListener(() => CloseResultUI()); |
246 |
- lobbyBtn.onClick.AddListener(() => CloseResultUI()); |
|
247 |
- continueBtn.onClick.AddListener(() => UIManager.Instance.movementManager.StartPlayMode()); |
|
236 |
+ lobbyBtn.onClick.AddListener(() => StartCoroutine(CloseResultUI())); |
|
237 |
+ continueBtn.onClick.AddListener(() => UserDataRepo.Instance.MovementManager.StartPlayMode()); |
|
248 | 238 |
|
249 | 239 |
if (resultUI.activeSelf == true) |
250 | 240 |
{ |
251 | 241 |
OffResultUI(); |
252 | 242 |
} |
253 | 243 |
|
244 |
+ PlayVRUIManager tempVRUIManager_ = transform.parent.GetComponent<PlayVRUIManager>(); |
|
245 |
+ tempVRUIManager_.ResultUIManager = this; |
|
246 |
+ |
|
254 | 247 |
} |
255 | 248 |
} |
--- VRTK/Assets/01.Junil/Script/UI/TK/VRTkUIManager.cs
+++ VRTK/Assets/01.Junil/Script/UI/TK/VRTkUIManager.cs
... | ... | @@ -811,7 +811,7 @@ |
811 | 811 |
|
812 | 812 |
uiManager.movementManager.gameObject.SetActive(true); |
813 | 813 |
|
814 |
- uiManager.movementManager.StartMoveMentCheck(nowProgram, nowSelectAnim); |
|
814 |
+ //uiManager.movementManager.StartMoveMentCheck(nowProgram, nowSelectAnim); |
|
815 | 815 |
} // ShowTkModel |
816 | 816 |
|
817 | 817 |
} |
--- VRTK/Assets/@LobbyRes/Prefab/MirrorCustom.prefab
+++ VRTK/Assets/@LobbyRes/Prefab/MirrorCustom.prefab
... | ... | @@ -99,8 +99,6 @@ |
99 | 99 |
speedTxtObj: {fileID: 770361707169205192} |
100 | 100 |
searchSno: JYEki4S6SdYcjNwy2WMDIB1oGNC2 |
101 | 101 |
nickNameTxt: {fileID: 7177263259555141618} |
102 |
- uiManager: {fileID: 0} |
|
103 |
- nowVRUI: {fileID: 0} |
|
104 | 102 |
--- !u!1 &163027169109862480 |
105 | 103 |
GameObject: |
106 | 104 |
m_ObjectHideFlags: 0 |
... | ... | @@ -747,7 +745,9 @@ |
747 | 745 |
serializedVersion: 6 |
748 | 746 |
m_Component: |
749 | 747 |
- component: {fileID: 6776343638521559000} |
750 |
- - component: {fileID: 6573537422460591482} |
|
748 |
+ - component: {fileID: 2080597305224382688} |
|
749 |
+ - component: {fileID: 8851317225924202710} |
|
750 |
+ - component: {fileID: 3510470170845613448} |
|
751 | 751 |
m_Layer: 0 |
752 | 752 |
m_Name: mirrorcustom |
753 | 753 |
m_TagString: Untagged |
... | ... | @@ -774,23 +774,119 @@ |
774 | 774 |
- {fileID: 2448315792599301254} |
775 | 775 |
m_Father: {fileID: 0} |
776 | 776 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
777 |
---- !u!114 &6573537422460591482 |
|
777 |
+--- !u!114 &2080597305224382688 |
|
778 | 778 |
MonoBehaviour: |
779 | 779 |
m_ObjectHideFlags: 0 |
780 | 780 |
m_CorrespondingSourceObject: {fileID: 0} |
781 | 781 |
m_PrefabInstance: {fileID: 0} |
782 | 782 |
m_PrefabAsset: {fileID: 0} |
783 | 783 |
m_GameObject: {fileID: 702392429637569537} |
784 |
- m_Enabled: 0 |
|
784 |
+ m_Enabled: 1 |
|
785 | 785 |
m_EditorHideFlags: 0 |
786 |
- m_Script: {fileID: 11500000, guid: a20c62ff0f730c144a7c05850062a97f, type: 3} |
|
786 |
+ m_Script: {fileID: 11500000, guid: 6dc770ab5b30d5a48920e1a283cbfc86, type: 3} |
|
787 | 787 |
m_Name: |
788 | 788 |
m_EditorClassIdentifier: |
789 |
- poseManager: {fileID: 0} |
|
790 |
- targetHeadTrans: {fileID: 0} |
|
791 |
- mirrorCamTrans: {fileID: 0} |
|
792 |
- isFollow: 0 |
|
793 |
- modelVRIK: {fileID: 0} |
|
789 |
+ mirrorObj: {fileID: 0} |
|
790 |
+ nowAnimInfoTxt: {fileID: 0} |
|
791 |
+ animTimeTxt: {fileID: 0} |
|
792 |
+ inputPoseModel: {fileID: 0} |
|
793 |
+ startView: {fileID: 0} |
|
794 |
+ movementInfoView: {fileID: 0} |
|
795 |
+ startBtn: {fileID: 0} |
|
796 |
+ startTxt: {fileID: 0} |
|
797 |
+ anyKetStartButton: |
|
798 |
+ m_UseReference: 1 |
|
799 |
+ m_Action: |
|
800 |
+ m_Name: Any Ket Start Button |
|
801 |
+ m_Type: 0 |
|
802 |
+ m_ExpectedControlType: |
|
803 |
+ m_Id: 3658c2e0-51bc-4506-a810-1a2a5b753937 |
|
804 |
+ m_Processors: |
|
805 |
+ m_Interactions: |
|
806 |
+ m_SingletonActionBindings: [] |
|
807 |
+ m_Flags: 0 |
|
808 |
+ m_Reference: {fileID: 0} |
|
809 |
+ mirrorMenuManager: {fileID: 0} |
|
810 |
+--- !u!114 &8851317225924202710 |
|
811 |
+MonoBehaviour: |
|
812 |
+ m_ObjectHideFlags: 0 |
|
813 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
814 |
+ m_PrefabInstance: {fileID: 0} |
|
815 |
+ m_PrefabAsset: {fileID: 0} |
|
816 |
+ m_GameObject: {fileID: 702392429637569537} |
|
817 |
+ m_Enabled: 1 |
|
818 |
+ m_EditorHideFlags: 0 |
|
819 |
+ m_Script: {fileID: 11500000, guid: 6090d742e4a89e44fbbd7425c30fb470, type: 3} |
|
820 |
+ m_Name: |
|
821 |
+ m_EditorClassIdentifier: |
|
822 |
+ modelVrIK: {fileID: 0} |
|
823 |
+ playerVrIK: {fileID: 0} |
|
824 |
+ animArray: [] |
|
825 |
+ userAnim: {fileID: 0} |
|
826 |
+ ttNoCnt: {fileID: 0} |
|
827 |
+ ttOkCnt: {fileID: 0} |
|
828 |
+ ttHalfCnt: {fileID: 0} |
|
829 |
+ progressBar: {fileID: 0} |
|
830 |
+ progressColor: {fileID: 0} |
|
831 |
+ durVal: 20 |
|
832 |
+ shoulderVal: 20 |
|
833 |
+ armVal: 15 |
|
834 |
+ currentPoseMatchSimilarity: 0 |
|
835 |
+ userSimilarity: {fileID: 0} |
|
836 |
+ userPoseStr: |
|
837 |
+ userPoseColor: {r: 0, g: 0, b: 0, a: 0} |
|
838 |
+ similarityScoreNormal: 85 |
|
839 |
+ similarityScoreBad: 75 |
|
840 |
+ currentColor: {r: 0, g: 0, b: 0, a: 0} |
|
841 |
+ greatCount: 0 |
|
842 |
+ goodCount: 0 |
|
843 |
+ missCount: 0 |
|
844 |
+ effectPoseText: [] |
|
845 |
+ poseDebugTxt: {fileID: 5865359360534924003} |
|
846 |
+ isDebug: 1 |
|
847 |
+ isTestDeBug: 0 |
|
848 |
+ isPassDebug: 0 |
|
849 |
+ particleVRControl: {fileID: 0} |
|
850 |
+ waitingTime: 0.5 |
|
851 |
+ modelMarkers: [] |
|
852 |
+ playState: 0 |
|
853 |
+ checkInput: |
|
854 |
+ m_UseReference: 0 |
|
855 |
+ m_Action: |
|
856 |
+ m_Name: Check Input |
|
857 |
+ m_Type: 0 |
|
858 |
+ m_ExpectedControlType: |
|
859 |
+ m_Id: d85db8f4-95fa-4c21-9e43-3de1501bc3a3 |
|
860 |
+ m_Processors: |
|
861 |
+ m_Interactions: |
|
862 |
+ m_SingletonActionBindings: [] |
|
863 |
+ m_Flags: 0 |
|
864 |
+ m_Reference: {fileID: 0} |
|
865 |
+--- !u!114 &3510470170845613448 |
|
866 |
+MonoBehaviour: |
|
867 |
+ m_ObjectHideFlags: 0 |
|
868 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
869 |
+ m_PrefabInstance: {fileID: 0} |
|
870 |
+ m_PrefabAsset: {fileID: 0} |
|
871 |
+ m_GameObject: {fileID: 702392429637569537} |
|
872 |
+ m_Enabled: 1 |
|
873 |
+ m_EditorHideFlags: 0 |
|
874 |
+ m_Script: {fileID: 11500000, guid: e12e7b995fe53c7429938ed5bd8312ce, type: 3} |
|
875 |
+ m_Name: |
|
876 |
+ m_EditorClassIdentifier: |
|
877 |
+ particleArray: |
|
878 |
+ - {fileID: 0} |
|
879 |
+ - {fileID: 0} |
|
880 |
+ - {fileID: 0} |
|
881 |
+ - {fileID: 0} |
|
882 |
+ - {fileID: 0} |
|
883 |
+ - {fileID: 0} |
|
884 |
+ - {fileID: 0} |
|
885 |
+ - {fileID: 0} |
|
886 |
+ - {fileID: 0} |
|
887 |
+ - {fileID: 0} |
|
888 |
+ particleObj: {fileID: 4152571495599528958} |
|
889 |
+ effectAreaTrans: {fileID: 0} |
|
794 | 890 |
--- !u!1 &861182371616674418 |
795 | 891 |
GameObject: |
796 | 892 |
m_ObjectHideFlags: 0 |
... | ... | @@ -4214,6 +4310,7 @@ |
4214 | 4310 |
- component: {fileID: 4783819721224876288} |
4215 | 4311 |
- component: {fileID: 8523202347170650060} |
4216 | 4312 |
- component: {fileID: 2668914988405658714} |
4313 |
+ - component: {fileID: 4188122230459467172} |
|
4217 | 4314 |
m_Layer: 5 |
4218 | 4315 |
m_Name: NowAnimInfoTxt |
4219 | 4316 |
m_TagString: Untagged |
... | ... | @@ -4237,7 +4334,7 @@ |
4237 | 4334 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
4238 | 4335 |
m_AnchorMin: {x: 0, y: 0.5} |
4239 | 4336 |
m_AnchorMax: {x: 1, y: 0.5} |
4240 |
- m_AnchoredPosition: {x: 20, y: 0} |
|
4337 |
+ m_AnchoredPosition: {x: -20, y: 0} |
|
4241 | 4338 |
m_SizeDelta: {x: -40, y: 14} |
4242 | 4339 |
m_Pivot: {x: 0.5, y: 0.5} |
4243 | 4340 |
--- !u!222 &8523202347170650060 |
... | ... | @@ -4268,7 +4365,7 @@ |
4268 | 4365 |
m_OnCullStateChanged: |
4269 | 4366 |
m_PersistentCalls: |
4270 | 4367 |
m_Calls: [] |
4271 |
- m_text: "\uD0DC\uADF9 1\uC7A5" |
|
4368 |
+ m_text: |
|
4272 | 4369 |
m_isRightToLeft: 0 |
4273 | 4370 |
m_fontAsset: {fileID: 11400000, guid: dbde3ec474936cd4c8ec331379d16e94, type: 2} |
4274 | 4371 |
m_sharedMaterial: {fileID: 3420232619700612365, guid: dbde3ec474936cd4c8ec331379d16e94, |
... | ... | @@ -4338,6 +4435,45 @@ |
4338 | 4435 |
m_hasFontAssetChanged: 0 |
4339 | 4436 |
m_baseMaterial: {fileID: 0} |
4340 | 4437 |
m_maskOffset: {x: 0, y: 0, z: 0, w: 0} |
4438 |
+--- !u!114 &4188122230459467172 |
|
4439 |
+MonoBehaviour: |
|
4440 |
+ m_ObjectHideFlags: 0 |
|
4441 |
+ m_CorrespondingSourceObject: {fileID: 0} |
|
4442 |
+ m_PrefabInstance: {fileID: 0} |
|
4443 |
+ m_PrefabAsset: {fileID: 0} |
|
4444 |
+ m_GameObject: {fileID: 4432472382111169127} |
|
4445 |
+ m_Enabled: 1 |
|
4446 |
+ m_EditorHideFlags: 0 |
|
4447 |
+ m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} |
|
4448 |
+ m_Name: |
|
4449 |
+ m_EditorClassIdentifier: |
|
4450 |
+ mTerm: |
|
4451 |
+ mTermSecondary: |
|
4452 |
+ PrimaryTermModifier: 0 |
|
4453 |
+ SecondaryTermModifier: 0 |
|
4454 |
+ TermPrefix: |
|
4455 |
+ TermSuffix: |
|
4456 |
+ LocalizeOnAwake: 1 |
|
4457 |
+ IgnoreRTL: 0 |
|
4458 |
+ MaxCharactersInRTL: 0 |
|
4459 |
+ IgnoreNumbersInRTL: 1 |
|
4460 |
+ CorrectAlignmentForRTL: 1 |
|
4461 |
+ AddSpacesToJoinedLanguages: 0 |
|
4462 |
+ AllowLocalizedParameters: 1 |
|
4463 |
+ AllowParameters: 1 |
|
4464 |
+ TranslatedObjects: [] |
|
4465 |
+ LocalizeEvent: |
|
4466 |
+ m_PersistentCalls: |
|
4467 |
+ m_Calls: [] |
|
4468 |
+ AlwaysForceLocalize: 0 |
|
4469 |
+ LocalizeCallBack: |
|
4470 |
+ Target: {fileID: 0} |
|
4471 |
+ MethodName: |
|
4472 |
+ mGUI_ShowReferences: 0 |
|
4473 |
+ mGUI_ShowTems: 1 |
|
4474 |
+ mGUI_ShowCallback: 0 |
|
4475 |
+ mLocalizeTarget: {fileID: 0} |
|
4476 |
+ mLocalizeTargetName: I2.Loc.LocalizeTarget_TextMeshPro_UGUI |
|
4341 | 4477 |
--- !u!1 &4500695146288802483 |
4342 | 4478 |
GameObject: |
4343 | 4479 |
m_ObjectHideFlags: 0 |
... | ... | @@ -4882,9 +5018,6 @@ |
4882 | 5018 |
- component: {fileID: 5860589040194469902} |
4883 | 5019 |
- component: {fileID: 3775056483627737121} |
4884 | 5020 |
- component: {fileID: 2425776587704017946} |
4885 |
- - component: {fileID: 2305159339582060405} |
|
4886 |
- - component: {fileID: 7760480218525326683} |
|
4887 |
- - component: {fileID: 113138770456477527} |
|
4888 | 5021 |
m_Layer: 5 |
4889 | 5022 |
m_Name: Movement_UI |
4890 | 5023 |
m_TagString: Untagged |
... | ... | @@ -4992,124 +5125,6 @@ |
4992 | 5125 |
m_Script: {fileID: 11500000, guid: 7ee805472840d5843b863535775bbe97, type: 3} |
4993 | 5126 |
m_Name: |
4994 | 5127 |
m_EditorClassIdentifier: |
4995 |
---- !u!114 &2305159339582060405 |
|
4996 |
-MonoBehaviour: |
|
4997 |
- m_ObjectHideFlags: 0 |
|
4998 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
4999 |
- m_PrefabInstance: {fileID: 0} |
|
5000 |
- m_PrefabAsset: {fileID: 0} |
|
5001 |
- m_GameObject: {fileID: 4690443472354061427} |
|
5002 |
- m_Enabled: 1 |
|
5003 |
- m_EditorHideFlags: 0 |
|
5004 |
- m_Script: {fileID: 11500000, guid: 6dc770ab5b30d5a48920e1a283cbfc86, type: 3} |
|
5005 |
- m_Name: |
|
5006 |
- m_EditorClassIdentifier: |
|
5007 |
- poseManager: {fileID: 0} |
|
5008 |
- sliderPlay: {fileID: 0} |
|
5009 |
- nowProgramInfoTxt: {fileID: 0} |
|
5010 |
- nowAnimInfoTxt: {fileID: 0} |
|
5011 |
- animTimeTxt: {fileID: 3105393116448346129} |
|
5012 |
- sliderFill: {fileID: 0} |
|
5013 |
- inputPoseModel: {fileID: 0} |
|
5014 |
- startView: {fileID: 272270018644877940} |
|
5015 |
- movementInfoView: {fileID: 9154982448912277379} |
|
5016 |
- startTxt: {fileID: 7736841737638252797} |
|
5017 |
- modelDummyControllers: [] |
|
5018 |
- anyKetStartButton: |
|
5019 |
- m_UseReference: 1 |
|
5020 |
- m_Action: |
|
5021 |
- m_Name: Any Ket Start Button |
|
5022 |
- m_Type: 0 |
|
5023 |
- m_ExpectedControlType: |
|
5024 |
- m_Id: 81d4c986-0a2b-4cea-ba93-b6ee05e68cd0 |
|
5025 |
- m_Processors: |
|
5026 |
- m_Interactions: |
|
5027 |
- m_SingletonActionBindings: [] |
|
5028 |
- m_Flags: 0 |
|
5029 |
- m_Reference: {fileID: 0} |
|
5030 |
- mirrorMenuManager: {fileID: 5667845908797775449} |
|
5031 |
- mirrorCamPos: {fileID: 6573537422460591482} |
|
5032 |
---- !u!114 &7760480218525326683 |
|
5033 |
-MonoBehaviour: |
|
5034 |
- m_ObjectHideFlags: 0 |
|
5035 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
5036 |
- m_PrefabInstance: {fileID: 0} |
|
5037 |
- m_PrefabAsset: {fileID: 0} |
|
5038 |
- m_GameObject: {fileID: 4690443472354061427} |
|
5039 |
- m_Enabled: 1 |
|
5040 |
- m_EditorHideFlags: 0 |
|
5041 |
- m_Script: {fileID: 11500000, guid: 6090d742e4a89e44fbbd7425c30fb470, type: 3} |
|
5042 |
- m_Name: |
|
5043 |
- m_EditorClassIdentifier: |
|
5044 |
- modelVrIK: {fileID: 0} |
|
5045 |
- playerVrIK: {fileID: 0} |
|
5046 |
- animArray: [] |
|
5047 |
- userAnim: {fileID: 0} |
|
5048 |
- ttNoCnt: {fileID: 0} |
|
5049 |
- ttOkCnt: {fileID: 0} |
|
5050 |
- ttHalfCnt: {fileID: 0} |
|
5051 |
- progressBar: {fileID: 0} |
|
5052 |
- progressColor: {fileID: 0} |
|
5053 |
- durVal: 20 |
|
5054 |
- shoulderVal: 20 |
|
5055 |
- armVal: 15 |
|
5056 |
- userSimilarity: {fileID: 0} |
|
5057 |
- userPoseStr: |
|
5058 |
- similarityScoreNormal: 85 |
|
5059 |
- similarityScoreBad: 75 |
|
5060 |
- greatCount: 0 |
|
5061 |
- goodCount: 0 |
|
5062 |
- missCount: 0 |
|
5063 |
- effectPoseText: [] |
|
5064 |
- isDivided: 0 |
|
5065 |
- uiManager: {fileID: 0} |
|
5066 |
- poseDebugTxt: {fileID: 5865359360534924003} |
|
5067 |
- isDebug: 1 |
|
5068 |
- isTestDeBug: 0 |
|
5069 |
- isPassDebug: 0 |
|
5070 |
- particleVRControl: {fileID: 113138770456477527} |
|
5071 |
- PlayerLeftHandTransform: {fileID: 0} |
|
5072 |
- PlayerRightHandTransform: {fileID: 0} |
|
5073 |
- waitingTime: 0.5 |
|
5074 |
- modelMarkers: [] |
|
5075 |
- playState: 0 |
|
5076 |
- checkInput: |
|
5077 |
- m_UseReference: 0 |
|
5078 |
- m_Action: |
|
5079 |
- m_Name: Check Input |
|
5080 |
- m_Type: 0 |
|
5081 |
- m_ExpectedControlType: |
|
5082 |
- m_Id: 03824732-81cf-4eca-9973-ed0815aa13d7 |
|
5083 |
- m_Processors: |
|
5084 |
- m_Interactions: |
|
5085 |
- m_SingletonActionBindings: [] |
|
5086 |
- m_Flags: 0 |
|
5087 |
- m_Reference: {fileID: 0} |
|
5088 |
---- !u!114 &113138770456477527 |
|
5089 |
-MonoBehaviour: |
|
5090 |
- m_ObjectHideFlags: 0 |
|
5091 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
5092 |
- m_PrefabInstance: {fileID: 0} |
|
5093 |
- m_PrefabAsset: {fileID: 0} |
|
5094 |
- m_GameObject: {fileID: 4690443472354061427} |
|
5095 |
- m_Enabled: 1 |
|
5096 |
- m_EditorHideFlags: 0 |
|
5097 |
- m_Script: {fileID: 11500000, guid: e12e7b995fe53c7429938ed5bd8312ce, type: 3} |
|
5098 |
- m_Name: |
|
5099 |
- m_EditorClassIdentifier: |
|
5100 |
- particleArray: |
|
5101 |
- - {fileID: 0} |
|
5102 |
- - {fileID: 0} |
|
5103 |
- - {fileID: 0} |
|
5104 |
- - {fileID: 0} |
|
5105 |
- - {fileID: 0} |
|
5106 |
- - {fileID: 0} |
|
5107 |
- - {fileID: 0} |
|
5108 |
- - {fileID: 0} |
|
5109 |
- - {fileID: 0} |
|
5110 |
- - {fileID: 0} |
|
5111 |
- particleObj: {fileID: 4152571495599528958} |
|
5112 |
- effectAreaTrans: {fileID: 0} |
|
5113 | 5128 |
--- !u!1 &5337442488565641654 |
5114 | 5129 |
GameObject: |
5115 | 5130 |
m_ObjectHideFlags: 0 |
... | ... | @@ -6790,7 +6805,7 @@ |
6790 | 6805 |
- component: {fileID: 938112955608218044} |
6791 | 6806 |
- component: {fileID: 4639534222575486762} |
6792 | 6807 |
m_Layer: 5 |
6793 |
- m_Name: NowProgramInfoTxt |
|
6808 |
+ m_Name: ProgramInfoTxt |
|
6794 | 6809 |
m_TagString: Untagged |
6795 | 6810 |
m_Icon: {fileID: 0} |
6796 | 6811 |
m_NavMeshLayer: 0 |
... | ... | @@ -6812,7 +6827,7 @@ |
6812 | 6827 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
6813 | 6828 |
m_AnchorMin: {x: 0, y: 0.5} |
6814 | 6829 |
m_AnchorMax: {x: 1, y: 0.5} |
6815 |
- m_AnchoredPosition: {x: -20, y: 0} |
|
6830 |
+ m_AnchoredPosition: {x: 20, y: 0} |
|
6816 | 6831 |
m_SizeDelta: {x: -40, y: 14} |
6817 | 6832 |
m_Pivot: {x: 0.5, y: 0.5} |
6818 | 6833 |
--- !u!222 &938112955608218044 |
... | ... | @@ -6843,7 +6858,7 @@ |
6843 | 6858 |
m_OnCullStateChanged: |
6844 | 6859 |
m_PersistentCalls: |
6845 | 6860 |
m_Calls: [] |
6846 |
- m_text: "\uB3D9\uC791 \uD3C9\uAC00 \uC911" |
|
6861 |
+ m_text: "\uD3C9\uAC00 \uC911" |
|
6847 | 6862 |
m_isRightToLeft: 0 |
6848 | 6863 |
m_fontAsset: {fileID: 11400000, guid: dbde3ec474936cd4c8ec331379d16e94, type: 2} |
6849 | 6864 |
m_sharedMaterial: {fileID: 3420232619700612365, guid: dbde3ec474936cd4c8ec331379d16e94, |
... | ... | @@ -7342,7 +7357,7 @@ |
7342 | 7357 |
m_OnClick: |
7343 | 7358 |
m_PersistentCalls: |
7344 | 7359 |
m_Calls: |
7345 |
- - m_Target: {fileID: 2305159339582060405} |
|
7360 |
+ - m_Target: {fileID: 0} |
|
7346 | 7361 |
m_TargetAssemblyTypeName: MovementManager, Assembly-CSharp |
7347 | 7362 |
m_MethodName: StartPlayMode |
7348 | 7363 |
m_Mode: 1 |
--- VRTK/Assets/Scripts/PoseManager/DummyController.cs
+++ VRTK/Assets/Scripts/PoseManager/DummyController.cs
... | ... | @@ -4,7 +4,7 @@ |
4 | 4 |
|
5 | 5 |
public class DummyController : MonoBehaviour |
6 | 6 |
{ |
7 |
- public PoseManager poseManager; |
|
7 |
+ //public PoseManager poseManager; |
|
8 | 8 |
public bool isMatchCharacter; |
9 | 9 |
|
10 | 10 |
|
... | ... | @@ -12,7 +12,7 @@ |
12 | 12 |
{ |
13 | 13 |
if(isMatchCharacter) |
14 | 14 |
{ |
15 |
- poseManager.SetReady(); |
|
15 |
+ UserDataRepo.Instance.PoseManager.SetReady(); |
|
16 | 16 |
} |
17 | 17 |
} |
18 | 18 |
|
... | ... | @@ -20,7 +20,7 @@ |
20 | 20 |
{ |
21 | 21 |
if (isMatchCharacter) |
22 | 22 |
{ |
23 |
- poseManager.SetCheck(); |
|
23 |
+ UserDataRepo.Instance.PoseManager.SetCheck(); |
|
24 | 24 |
} |
25 | 25 |
} |
26 | 26 |
|
... | ... | @@ -29,7 +29,7 @@ |
29 | 29 |
{ |
30 | 30 |
if (isMatchCharacter) |
31 | 31 |
{ |
32 |
- poseManager.PoseCheck(); |
|
32 |
+ UserDataRepo.Instance.PoseManager.PoseCheck(); |
|
33 | 33 |
} |
34 | 34 |
} |
35 | 35 |
|
--- VRTK/Assets/Scripts/PoseManager/PoseManager.cs
+++ VRTK/Assets/Scripts/PoseManager/PoseManager.cs
... | ... | @@ -1,20 +1,28 @@ |
1 | 1 |
using System.Collections; |
2 | 2 |
using System.Collections.Generic; |
3 | 3 |
using UnityEngine; |
4 |
-using UnityEngine.UI; |
|
5 | 4 |
using TMPro; |
6 | 5 |
using UnityEngine.InputSystem; |
7 | 6 |
using RootMotion.FinalIK; |
8 |
-using YAProgressBar; |
|
9 |
-using static System.Net.Mime.MediaTypeNames; |
|
10 | 7 |
|
11 | 8 |
public class PoseManager : MonoBehaviour |
12 | 9 |
{ |
10 |
+ [SerializeField] private VRIK modelVrIK; |
|
11 |
+ public VRIK ModelVrIK{ |
|
12 |
+ get { return modelVrIK; } |
|
13 |
+ set { modelVrIK = value; } |
|
14 |
+ } |
|
15 |
+ [SerializeField] private VRIK playerVrIK; |
|
16 |
+ public VRIK PlayerVrIK{ |
|
17 |
+ get { return playerVrIK; } |
|
18 |
+ set { playerVrIK = value; } |
|
19 |
+ } |
|
13 | 20 |
|
14 |
- public VRIK modelVrIK; |
|
15 |
- public VRIK playerVrIK; |
|
16 |
- |
|
17 |
- public Animator[] animArray; |
|
21 |
+ [SerializeField] private Animator[] animArray; |
|
22 |
+ public Animator[] AnimArray{ |
|
23 |
+ get{ return animArray; } |
|
24 |
+ set{ animArray = value; } |
|
25 |
+ } |
|
18 | 26 |
public Animator userAnim; |
19 | 27 |
|
20 | 28 |
public TMP_Text ttNoCnt; |
... | ... | @@ -34,13 +42,13 @@ |
34 | 42 |
[SerializeField] |
35 | 43 |
private float armVal = 15f; |
36 | 44 |
|
37 |
- private float currentPoseMatchSimilarity; |
|
45 |
+ [SerializeField] private float currentPoseMatchSimilarity; |
|
38 | 46 |
|
39 | 47 |
public TMP_Text userSimilarity; |
40 | 48 |
//public TMP_Text userPoseState; |
41 | 49 |
|
42 | 50 |
public string userPoseStr; |
43 |
- private Color userPoseColor; |
|
51 |
+ [SerializeField] private Color userPoseColor; |
|
44 | 52 |
|
45 | 53 |
//private float similarityScoreGood = 85f; |
46 | 54 |
[SerializeField] |
... | ... | @@ -50,7 +58,7 @@ |
50 | 58 |
|
51 | 59 |
|
52 | 60 |
//public Image sliderBG; |
53 |
- private Color currentColor; |
|
61 |
+ [SerializeField] private Color currentColor; |
|
54 | 62 |
|
55 | 63 |
//private float changeColorVal = 0.15f; |
56 | 64 |
|
... | ... | @@ -60,9 +68,19 @@ |
60 | 68 |
public int goodCount = 0; |
61 | 69 |
public int missCount = 0; |
62 | 70 |
|
63 |
- public List<EffectPoseText> effectPoseText = new List<EffectPoseText>(); |
|
64 |
- public bool isDivided = false; // 구분 동작이 활성화 되었는지 체크하는 bool 값 |
|
65 |
- public UIManager uiManager; |
|
71 |
+ [SerializeField] private List<EffectPoseText> effectPoseText; |
|
72 |
+ public List<EffectPoseText> EffectPoseText{ |
|
73 |
+ get{ return effectPoseText; } |
|
74 |
+ set{ effectPoseText = value; } |
|
75 |
+ } |
|
76 |
+ |
|
77 |
+ private bool isDivided = false; // 구분 동작이 활성화 되었는지 체크하는 bool 값 |
|
78 |
+ public bool IsDivided{ |
|
79 |
+ get{ return isDivided; } |
|
80 |
+ set{ |
|
81 |
+ isDivided = value; |
|
82 |
+ } |
|
83 |
+ } |
|
66 | 84 |
public TMP_Text poseDebugTxt; |
67 | 85 |
|
68 | 86 |
private bool isCheckPose = false; |
... | ... | @@ -75,8 +93,8 @@ |
75 | 93 |
private bool isEndPose = false; |
76 | 94 |
|
77 | 95 |
public ParticleVRControl particleVRControl; |
78 |
- public Transform PlayerLeftHandTransform; |
|
79 |
- public Transform PlayerRightHandTransform; |
|
96 |
+ //public Transform PlayerLeftHandTransform; |
|
97 |
+ //public Transform PlayerRightHandTransform; |
|
80 | 98 |
|
81 | 99 |
private float[] testAngleVals = new float[9]; |
82 | 100 |
|
... | ... | @@ -102,25 +120,22 @@ |
102 | 120 |
|
103 | 121 |
void Start() |
104 | 122 |
{ |
123 |
+ effectPoseText = new List<EffectPoseText>(); |
|
124 |
+ isDivided = false; |
|
105 | 125 |
//isPassDebug = true; |
106 | 126 |
testAngleVals = new float[9]; |
107 | 127 |
|
108 | 128 |
playState = PlayState.Ready; |
109 | 129 |
|
110 |
- GameObject tempMovement_ = gameObject.transform.Find("01.Movement_Info").gameObject; |
|
130 |
+ GameObject tempMovement_ = gameObject.transform.Find("Movement_UI").gameObject; |
|
131 |
+ GameObject tempMovementInfo_ = tempMovement_.transform.Find("01.Movement_Info").gameObject; |
|
111 | 132 |
|
112 |
- //if(userPoseState == null) |
|
113 |
- // userPoseState = tempMovement_.transform.Find("UserPoseTxt").GetComponent<TMP_Text>(); |
|
114 |
- |
|
115 |
- //if(sliderPlay == null) |
|
116 |
- //sliderPlay = tempMovement_.transform.Find("Slider").GetComponent<Slider>(); |
|
117 | 133 |
|
118 | 134 |
if (progressBar == null) |
119 | 135 |
{ |
120 |
- GameObject tempProgress_ = tempMovement_.transform.Find("ProgressBar3D").gameObject; |
|
136 |
+ GameObject tempProgress_ = tempMovementInfo_.transform.Find("ProgressBar3D").gameObject; |
|
121 | 137 |
|
122 |
- progressBar = tempProgress_.transform.Find("CircularProgressBar").GetComponent<YAProgressBar.CircularProgressBar>(); |
|
123 |
- |
|
138 |
+ progressBar = tempProgress_.transform.Find("CircularProgressBar").GetComponent<YAProgressBar.CircularProgressBar>(); |
|
124 | 139 |
} |
125 | 140 |
|
126 | 141 |
if(progressColor == null) |
... | ... | @@ -138,18 +153,21 @@ |
138 | 153 |
if(particleVRControl == null) |
139 | 154 |
particleVRControl = gameObject.GetComponent<ParticleVRControl>(); |
140 | 155 |
|
141 |
- PlayerLeftHandTransform = GameObject.Find("ModelsLeft").transform; |
|
142 |
- PlayerRightHandTransform = GameObject.Find("ModelsRight").transform; |
|
156 |
+ // PlayerLeftHandTransform = User; |
|
157 |
+ // PlayerRightHandTransform = GameObject.Find("ModelsRight").transform; |
|
143 | 158 |
|
144 | 159 |
|
145 | 160 |
//userPoseState.text = ""; |
146 | 161 |
currentColor = Color.white; |
147 | 162 |
progressColor.color = currentColor; |
148 | 163 |
|
149 |
- GameObject tempUIManager_ = GameObject.FindWithTag(Define.UI_MANAGER_TAG); |
|
150 |
- uiManager = tempUIManager_.GetComponent<UIManager>(); |
|
164 |
+ UserDataRepo.Instance.PoseManager = this; |
|
165 |
+ |
|
166 |
+ userAnim = UserDataRepo.Instance.VRAnimController.DummyAnim; |
|
151 | 167 |
|
168 |
+ ModelVrIK = UserDataRepo.Instance.VRAnimController.DummyCopyVRIK; |
|
152 | 169 |
|
170 |
+ PlayerVrIK = UserDataRepo.Instance.VRAnimController.DummyVRIK; |
|
153 | 171 |
} |
154 | 172 |
|
155 | 173 |
|
... | ... | @@ -198,8 +216,8 @@ |
198 | 216 |
isCheckPose = true; |
199 | 217 |
|
200 | 218 |
if (isDivided && |
201 |
- uiManager.vrAnim.isPressA == false && |
|
202 |
- uiManager.vrAnim.isPressB == false) |
|
219 |
+ UserDataRepo.Instance.VRAnimController.IsPressA == false && |
|
220 |
+ UserDataRepo.Instance.VRAnimController.IsPressB == false) |
|
203 | 221 |
{ |
204 | 222 |
// 구분 동작 모드가 켜져 있다. |
205 | 223 |
StartCoroutine(DividedModeWait()); |
... | ... | @@ -261,43 +279,43 @@ |
261 | 279 |
currentPoseMatchSimilarity = tempPoseMatch_; |
262 | 280 |
|
263 | 281 |
|
264 |
- DebugTxtCall.Instance.CallDebug( |
|
265 |
- $"총점 {currentPoseMatchSimilarity}\n" |
|
266 |
- + |
|
267 |
- $"머리 : {modolMarkers[0].rotation.normalized} // {playerMarkers[0].rotation.normalized} //\n" + |
|
268 |
- $"Quaternion.Angle {testAngleVals[8]} // NormalizeHelper [{components[8]}] \n\n" + |
|
282 |
+ // DebugTxtCall.Instance.CallDebug( |
|
283 |
+ // $"총점 {currentPoseMatchSimilarity}\n" |
|
284 |
+ // + |
|
285 |
+ // $"머리 : {modolMarkers[0].rotation.normalized} // {playerMarkers[0].rotation.normalized} //\n" + |
|
286 |
+ // $"Quaternion.Angle {testAngleVals[8]} // NormalizeHelper [{components[8]}] \n\n" + |
|
269 | 287 |
|
270 |
- $"어깨1 : {modolMarkers[1].localRotation} // {playerMarkers[1].localRotation} //\n" + |
|
271 |
- $"Quaternion.Angle {testAngleVals[0]} // NormalizeHelper [{components[0]}]\n" + |
|
288 |
+ // $"어깨1 : {modolMarkers[1].localRotation} // {playerMarkers[1].localRotation} //\n" + |
|
289 |
+ // $"Quaternion.Angle {testAngleVals[0]} // NormalizeHelper [{components[0]}]\n" + |
|
272 | 290 |
|
273 |
- $"어깨2 : {modolMarkers[5].localRotation} // {playerMarkers[5].localRotation} //\n" + |
|
274 |
- $"Quaternion.Angle {testAngleVals[1]} // NormalizeHelper [{components[1]}]\n\n" + |
|
291 |
+ // $"어깨2 : {modolMarkers[5].localRotation} // {playerMarkers[5].localRotation} //\n" + |
|
292 |
+ // $"Quaternion.Angle {testAngleVals[1]} // NormalizeHelper [{components[1]}]\n\n" + |
|
275 | 293 |
|
276 |
- $"손1 : {modolMarkers[4].localRotation} // {playerMarkers[4].localRotation} //\n" + |
|
277 |
- $"Quaternion.Angle {testAngleVals[2]} // NormalizeHelper [{components[2]}]\n" + |
|
294 |
+ // $"손1 : {modolMarkers[4].localRotation} // {playerMarkers[4].localRotation} //\n" + |
|
295 |
+ // $"Quaternion.Angle {testAngleVals[2]} // NormalizeHelper [{components[2]}]\n" + |
|
278 | 296 |
|
279 |
- $"손2 : {modolMarkers[8].localRotation} // {playerMarkers[8].localRotation.normalized} //\n" + |
|
280 |
- $"Quaternion.Angle {testAngleVals[3]} // NormalizeHelper {components[3]}\n\n" + |
|
297 |
+ // $"손2 : {modolMarkers[8].localRotation} // {playerMarkers[8].localRotation.normalized} //\n" + |
|
298 |
+ // $"Quaternion.Angle {testAngleVals[3]} // NormalizeHelper {components[3]}\n\n" + |
|
281 | 299 |
|
282 | 300 |
|
283 |
- $"팔꿈치1 : {GetElbowAngle(modolMarkers[2].position, modolMarkers[3].position, modolMarkers[4].position)}" + |
|
284 |
- $" // {GetElbowAngle(playerMarkers[2].position, playerMarkers[3].position, playerMarkers[4].position)} //\n" + |
|
301 |
+ // $"팔꿈치1 : {GetElbowAngle(modolMarkers[2].position, modolMarkers[3].position, modolMarkers[4].position)}" + |
|
302 |
+ // $" // {GetElbowAngle(playerMarkers[2].position, playerMarkers[3].position, playerMarkers[4].position)} //\n" + |
|
285 | 303 |
|
286 |
- $"Quaternion.Angle {testAngleVals[4]} // NormalizeHelper {components[4]}\n" + |
|
304 |
+ // $"Quaternion.Angle {testAngleVals[4]} // NormalizeHelper {components[4]}\n" + |
|
287 | 305 |
|
288 |
- $"팔꿈치2 : {GetElbowAngle(modolMarkers[6].position, modolMarkers[7].position, modolMarkers[8].position)}" + |
|
289 |
- $" // {GetElbowAngle(playerMarkers[6].position, playerMarkers[7].position, playerMarkers[8].position)} //\n" + |
|
306 |
+ // $"팔꿈치2 : {GetElbowAngle(modolMarkers[6].position, modolMarkers[7].position, modolMarkers[8].position)}" + |
|
307 |
+ // $" // {GetElbowAngle(playerMarkers[6].position, playerMarkers[7].position, playerMarkers[8].position)} //\n" + |
|
290 | 308 |
|
291 |
- $"Quaternion.Angle {testAngleVals[5]} // NormalizeHelper {components[5]}\n\n" + |
|
309 |
+ // $"Quaternion.Angle {testAngleVals[5]} // NormalizeHelper {components[5]}\n\n" + |
|
292 | 310 |
|
293 | 311 |
|
294 |
- $"팔1 : {modolMarkers[2].localRotation} // {playerMarkers[2].localRotation} //\n" + |
|
295 |
- $"Quaternion.Angle {testAngleVals[6]} // NormalizeHelper {components[6]}\n" + // => 팔 방향 |
|
312 |
+ // $"팔1 : {modolMarkers[2].localRotation} // {playerMarkers[2].localRotation} //\n" + |
|
313 |
+ // $"Quaternion.Angle {testAngleVals[6]} // NormalizeHelper {components[6]}\n" + // => 팔 방향 |
|
296 | 314 |
|
297 |
- $"팔2 : {modolMarkers[6].localRotation} // {playerMarkers[6].localRotation} //\n" + |
|
298 |
- $"Quaternion.Angle {testAngleVals[7]} // NormalizeHelper {components[7]}\n\n" // => 팔 방향 |
|
315 |
+ // $"팔2 : {modolMarkers[6].localRotation} // {playerMarkers[6].localRotation} //\n" + |
|
316 |
+ // $"Quaternion.Angle {testAngleVals[7]} // NormalizeHelper {components[7]}\n\n" // => 팔 방향 |
|
299 | 317 |
|
300 |
- ); |
|
318 |
+ // ); |
|
301 | 319 |
|
302 | 320 |
|
303 | 321 |
|
... | ... | @@ -430,7 +448,7 @@ |
430 | 448 |
|
431 | 449 |
// 판정이 miss 만 아니라면 타격 이펙트 발생 |
432 | 450 |
if (userPoseColor != Color.red) |
433 |
- particleVRControl.SetParticleEffect(PlayerLeftHandTransform, PlayerRightHandTransform); |
|
451 |
+ particleVRControl.SetParticleEffect(UserDataRepo.Instance.UserHandLeftTrans, UserDataRepo.Instance.UserHandRightTrans); |
|
434 | 452 |
|
435 | 453 |
|
436 | 454 |
//if (isDivided && |
... | ... | @@ -568,7 +586,7 @@ |
568 | 586 |
isEndPose = true; |
569 | 587 |
//AnimAllReStart(); |
570 | 588 |
//userPoseState.text = ""; |
571 |
- uiManager.movementManager.RestartReady(); |
|
589 |
+ UserDataRepo.Instance.MovementManager.RestartReady(); |
|
572 | 590 |
progressColor.color = Color.white; |
573 | 591 |
playState = PlayState.Ready; |
574 | 592 |
greatCount = 0; |
... | ... | @@ -612,6 +630,9 @@ |
612 | 630 |
// Update is called once per frame |
613 | 631 |
void Update() |
614 | 632 |
{ |
633 |
+ if (!UserDataRepo.Instance.VRAnimController.IsPlay || UserDataRepo.Instance.VRUICanvas.activeSelf) |
|
634 |
+ return; |
|
635 |
+ |
|
615 | 636 |
#if UNITY_EDITOR |
616 | 637 |
if (Input.GetKeyDown(KeyCode.L) || checkInput.action.WasPressedThisFrame()) |
617 | 638 |
{ |
--- VRTK/Assets/VRRes/VRUI/00.Prefab/animplay.prefab
+++ VRTK/Assets/VRRes/VRUI/00.Prefab/animplay.prefab
... | ... | @@ -321,7 +321,6 @@ |
321 | 321 |
m_Component: |
322 | 322 |
- component: {fileID: 8172390620446709851} |
323 | 323 |
- component: {fileID: -5796313045173018655} |
324 |
- - component: {fileID: 5506093677404544293} |
|
325 | 324 |
m_Layer: 5 |
326 | 325 |
m_Name: animplay |
327 | 326 |
m_TagString: Untagged |
... | ... | @@ -434,121 +433,6 @@ |
434 | 433 |
m_SingletonActionBindings: [] |
435 | 434 |
m_Flags: 0 |
436 | 435 |
m_Reference: {fileID: 0} |
437 |
---- !u!114 &5506093677404544293 |
|
438 |
-MonoBehaviour: |
|
439 |
- m_ObjectHideFlags: 0 |
|
440 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
441 |
- m_PrefabInstance: {fileID: 0} |
|
442 |
- m_PrefabAsset: {fileID: 0} |
|
443 |
- m_GameObject: {fileID: 1279190771891503001} |
|
444 |
- m_Enabled: 0 |
|
445 |
- m_EditorHideFlags: 0 |
|
446 |
- m_Script: {fileID: 11500000, guid: e8a75d1c3edfe674e9d574b69c93a268, type: 3} |
|
447 |
- m_Name: |
|
448 |
- m_EditorClassIdentifier: |
|
449 |
- nowAnimator: [] |
|
450 |
- healObj: {fileID: 0} |
|
451 |
- mirrorObj: {fileID: 0} |
|
452 |
- uiManager: {fileID: 0} |
|
453 |
- animSpeed: 1 |
|
454 |
- playStopTxt: {fileID: 6783851734567053726} |
|
455 |
- nowSpeedTxt: {fileID: 4134995328083647633} |
|
456 |
- isPlay: 0 |
|
457 |
- plusAnimButton: |
|
458 |
- m_UseReference: 0 |
|
459 |
- m_Action: |
|
460 |
- m_Name: Plus Anim Button |
|
461 |
- m_Type: 0 |
|
462 |
- m_ExpectedControlType: |
|
463 |
- m_Id: 96a59786-0120-4199-8e8c-cb58b3e19ea9 |
|
464 |
- m_Processors: |
|
465 |
- m_Interactions: |
|
466 |
- m_SingletonActionBindings: [] |
|
467 |
- m_Flags: 0 |
|
468 |
- m_Reference: {fileID: 0} |
|
469 |
- minusAnimButton: |
|
470 |
- m_UseReference: 0 |
|
471 |
- m_Action: |
|
472 |
- m_Name: Minus Anim Button |
|
473 |
- m_Type: 0 |
|
474 |
- m_ExpectedControlType: |
|
475 |
- m_Id: 0ad95926-d816-4aca-968b-0662e998b919 |
|
476 |
- m_Processors: |
|
477 |
- m_Interactions: |
|
478 |
- m_SingletonActionBindings: [] |
|
479 |
- m_Flags: 0 |
|
480 |
- m_Reference: {fileID: 0} |
|
481 |
- rePlayAnimButton: |
|
482 |
- m_UseReference: 0 |
|
483 |
- m_Action: |
|
484 |
- m_Name: Re Play Anim Button |
|
485 |
- m_Type: 0 |
|
486 |
- m_ExpectedControlType: |
|
487 |
- m_Id: c9935e06-b7eb-440e-85b8-5c338446683a |
|
488 |
- m_Processors: |
|
489 |
- m_Interactions: |
|
490 |
- m_SingletonActionBindings: [] |
|
491 |
- m_Flags: 0 |
|
492 |
- m_Reference: {fileID: 0} |
|
493 |
- resetAnimButton: |
|
494 |
- m_UseReference: 0 |
|
495 |
- m_Action: |
|
496 |
- m_Name: Reset Anim Button |
|
497 |
- m_Type: 0 |
|
498 |
- m_ExpectedControlType: |
|
499 |
- m_Id: 6a748158-1b09-49ba-9297-4b58f83bf53e |
|
500 |
- m_Processors: |
|
501 |
- m_Interactions: |
|
502 |
- m_SingletonActionBindings: [] |
|
503 |
- m_Flags: 0 |
|
504 |
- m_Reference: {fileID: 0} |
|
505 |
- rewindAnimButton: |
|
506 |
- m_UseReference: 0 |
|
507 |
- m_Action: |
|
508 |
- m_Name: Rewind Anim Button |
|
509 |
- m_Type: 0 |
|
510 |
- m_ExpectedControlType: |
|
511 |
- m_Id: 96872f82-5326-4518-a058-94a66cb0993c |
|
512 |
- m_Processors: |
|
513 |
- m_Interactions: |
|
514 |
- m_SingletonActionBindings: [] |
|
515 |
- m_Flags: 0 |
|
516 |
- m_Reference: {fileID: 0} |
|
517 |
- forwardAnimButton: |
|
518 |
- m_UseReference: 0 |
|
519 |
- m_Action: |
|
520 |
- m_Name: Forward Anim Button |
|
521 |
- m_Type: 0 |
|
522 |
- m_ExpectedControlType: |
|
523 |
- m_Id: 181c273b-a173-4d92-9b20-2cdda8df2dcc |
|
524 |
- m_Processors: |
|
525 |
- m_Interactions: |
|
526 |
- m_SingletonActionBindings: [] |
|
527 |
- m_Flags: 0 |
|
528 |
- m_Reference: {fileID: 0} |
|
529 |
- selectMode: 0 |
|
530 |
- nowState: 0 |
|
531 |
- closeBtn: {fileID: 1776633091705112379} |
|
532 |
- playerHeadPos: {fileID: 0} |
|
533 |
- modelDist: 7 |
|
534 |
- posAnimUI: {x: 5, y: 3.6, z: 6} |
|
535 |
- playerHeadUI: {fileID: 0} |
|
536 |
- isFirstEffect: 0 |
|
537 |
- isResetBtn: 0 |
|
538 |
- resetTimer: 0 |
|
539 |
- playerAngle: {x: 0, y: 0, z: 0, w: 0} |
|
540 |
- playerPos: {x: 0, y: 0, z: 0} |
|
541 |
- isPressA: 0 |
|
542 |
- isPressB: 0 |
|
543 |
- timer: 0 |
|
544 |
- dummyObj: {fileID: 0} |
|
545 |
- dummyAnim: {fileID: 0} |
|
546 |
- dummyVRIK: {fileID: 0} |
|
547 |
- dummyPlayerScale: {fileID: 0} |
|
548 |
- dummyCopyObj: {fileID: 0} |
|
549 |
- dummyCopyAnim: {fileID: 0} |
|
550 |
- dummyCopyVRIK: {fileID: 0} |
|
551 |
- dummyCopyScale: {fileID: 0} |
|
552 | 436 |
--- !u!1 &1374290096380882306 |
553 | 437 |
GameObject: |
554 | 438 |
m_ObjectHideFlags: 0 |
... | ... | @@ -806,7 +690,7 @@ |
806 | 690 |
m_OnClick: |
807 | 691 |
m_PersistentCalls: |
808 | 692 |
m_Calls: |
809 |
- - m_Target: {fileID: 5506093677404544293} |
|
693 |
+ - m_Target: {fileID: 0} |
|
810 | 694 |
m_TargetAssemblyTypeName: AnimSpeedController, Assembly-CSharp |
811 | 695 |
m_MethodName: ResetAnim |
812 | 696 |
m_Mode: 1 |
... | ... | @@ -1075,7 +959,7 @@ |
1075 | 959 |
m_OnClick: |
1076 | 960 |
m_PersistentCalls: |
1077 | 961 |
m_Calls: |
1078 |
- - m_Target: {fileID: 5506093677404544293} |
|
962 |
+ - m_Target: {fileID: 0} |
|
1079 | 963 |
m_TargetAssemblyTypeName: AnimSpeedController, Assembly-CSharp |
1080 | 964 |
m_MethodName: RePlayAnim |
1081 | 965 |
m_Mode: 1 |
... | ... | @@ -1209,7 +1093,7 @@ |
1209 | 1093 |
m_OnClick: |
1210 | 1094 |
m_PersistentCalls: |
1211 | 1095 |
m_Calls: |
1212 |
- - m_Target: {fileID: 5506093677404544293} |
|
1096 |
+ - m_Target: {fileID: 0} |
|
1213 | 1097 |
m_TargetAssemblyTypeName: AnimSpeedController, Assembly-CSharp |
1214 | 1098 |
m_MethodName: MinusSpeed |
1215 | 1099 |
m_Mode: 1 |
... | ... | @@ -1748,7 +1632,7 @@ |
1748 | 1632 |
m_OnClick: |
1749 | 1633 |
m_PersistentCalls: |
1750 | 1634 |
m_Calls: |
1751 |
- - m_Target: {fileID: 5506093677404544293} |
|
1635 |
+ - m_Target: {fileID: 0} |
|
1752 | 1636 |
m_TargetAssemblyTypeName: AnimSpeedController, Assembly-CSharp |
1753 | 1637 |
m_MethodName: PlusSpeed |
1754 | 1638 |
m_Mode: 1 |
--- VRTK/Assets/VRRes/VRUI/00.Prefab/vrui.prefab
+++ VRTK/Assets/VRRes/VRUI/00.Prefab/vrui.prefab
... | ... | @@ -356,9 +356,9 @@ |
356 | 356 |
m_Father: {fileID: 2913616789516884969} |
357 | 357 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
358 | 358 |
m_AnchorMin: {x: 0, y: 0} |
359 |
- m_AnchorMax: {x: 1, y: 1} |
|
359 |
+ m_AnchorMax: {x: 0, y: 0} |
|
360 | 360 |
m_AnchoredPosition: {x: 0, y: 0} |
361 |
- m_SizeDelta: {x: -7, y: 0} |
|
361 |
+ m_SizeDelta: {x: 0, y: 0} |
|
362 | 362 |
m_Pivot: {x: 0, y: 1} |
363 | 363 |
--- !u!222 &6221527965870359236 |
364 | 364 |
CanvasRenderer: |
... | ... | @@ -558,7 +558,7 @@ |
558 | 558 |
- component: {fileID: 319005467691672994} |
559 | 559 |
- component: {fileID: 3873513333538366824} |
560 | 560 |
m_Layer: 5 |
561 |
- m_Name: CoachImg |
|
561 |
+ m_Name: InstructorImg |
|
562 | 562 |
m_TagString: Untagged |
563 | 563 |
m_Icon: {fileID: 0} |
564 | 564 |
m_NavMeshLayer: 0 |
... | ... | @@ -11250,10 +11250,10 @@ |
11250 | 11250 |
- {fileID: 2704257781856517172} |
11251 | 11251 |
m_Father: {fileID: 8425392062687349333} |
11252 | 11252 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
11253 |
- m_AnchorMin: {x: 0, y: 1} |
|
11254 |
- m_AnchorMax: {x: 0, y: 1} |
|
11255 |
- m_AnchoredPosition: {x: 25, y: -22.5} |
|
11256 |
- m_SizeDelta: {x: 40, y: 45} |
|
11253 |
+ m_AnchorMin: {x: 0, y: 0} |
|
11254 |
+ m_AnchorMax: {x: 0, y: 0} |
|
11255 |
+ m_AnchoredPosition: {x: 0, y: 0} |
|
11256 |
+ m_SizeDelta: {x: 0, y: 0} |
|
11257 | 11257 |
m_Pivot: {x: 0.5, y: 0.5} |
11258 | 11258 |
--- !u!222 &6278576059295779602 |
11259 | 11259 |
CanvasRenderer: |
... | ... | @@ -12267,7 +12267,7 @@ |
12267 | 12267 |
m_OnClick: |
12268 | 12268 |
m_PersistentCalls: |
12269 | 12269 |
m_Calls: |
12270 |
- - m_Target: {fileID: 1336578072685318121} |
|
12270 |
+ - m_Target: {fileID: 0} |
|
12271 | 12271 |
m_TargetAssemblyTypeName: VRTkUIManager, Assembly-CSharp |
12272 | 12272 |
m_MethodName: MakeTkInfo |
12273 | 12273 |
m_Mode: 6 |
... | ... | @@ -12293,96 +12293,6 @@ |
12293 | 12293 |
m_EditorClassIdentifier: |
12294 | 12294 |
radius: 4 |
12295 | 12295 |
image: {fileID: 3951172643135506264} |
12296 |
---- !u!1 &1536902079447723767 |
|
12297 |
-GameObject: |
|
12298 |
- m_ObjectHideFlags: 0 |
|
12299 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
12300 |
- m_PrefabInstance: {fileID: 0} |
|
12301 |
- m_PrefabAsset: {fileID: 0} |
|
12302 |
- serializedVersion: 6 |
|
12303 |
- m_Component: |
|
12304 |
- - component: {fileID: 511829399914839507} |
|
12305 |
- - component: {fileID: 3135653383743908466} |
|
12306 |
- - component: {fileID: 5193161273442129053} |
|
12307 |
- - component: {fileID: 8033121187021179791} |
|
12308 |
- m_Layer: 5 |
|
12309 |
- m_Name: Viewport |
|
12310 |
- m_TagString: Untagged |
|
12311 |
- m_Icon: {fileID: 0} |
|
12312 |
- m_NavMeshLayer: 0 |
|
12313 |
- m_StaticEditorFlags: 0 |
|
12314 |
- m_IsActive: 1 |
|
12315 |
---- !u!224 &511829399914839507 |
|
12316 |
-RectTransform: |
|
12317 |
- m_ObjectHideFlags: 0 |
|
12318 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
12319 |
- m_PrefabInstance: {fileID: 0} |
|
12320 |
- m_PrefabAsset: {fileID: 0} |
|
12321 |
- m_GameObject: {fileID: 1536902079447723767} |
|
12322 |
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
|
12323 |
- m_LocalPosition: {x: 0, y: 0, z: 0} |
|
12324 |
- m_LocalScale: {x: 1, y: 1, z: 1} |
|
12325 |
- m_ConstrainProportionsScale: 0 |
|
12326 |
- m_Children: |
|
12327 |
- - {fileID: 4225573338708162552} |
|
12328 |
- m_Father: {fileID: 3349190830808232335} |
|
12329 |
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
12330 |
- m_AnchorMin: {x: 0, y: 0} |
|
12331 |
- m_AnchorMax: {x: 1, y: 1} |
|
12332 |
- m_AnchoredPosition: {x: 0, y: 0} |
|
12333 |
- m_SizeDelta: {x: 0, y: 0} |
|
12334 |
- m_Pivot: {x: 0, y: 1} |
|
12335 |
---- !u!222 &3135653383743908466 |
|
12336 |
-CanvasRenderer: |
|
12337 |
- m_ObjectHideFlags: 0 |
|
12338 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
12339 |
- m_PrefabInstance: {fileID: 0} |
|
12340 |
- m_PrefabAsset: {fileID: 0} |
|
12341 |
- m_GameObject: {fileID: 1536902079447723767} |
|
12342 |
- m_CullTransparentMesh: 1 |
|
12343 |
---- !u!114 &5193161273442129053 |
|
12344 |
-MonoBehaviour: |
|
12345 |
- m_ObjectHideFlags: 0 |
|
12346 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
12347 |
- m_PrefabInstance: {fileID: 0} |
|
12348 |
- m_PrefabAsset: {fileID: 0} |
|
12349 |
- m_GameObject: {fileID: 1536902079447723767} |
|
12350 |
- m_Enabled: 1 |
|
12351 |
- m_EditorHideFlags: 0 |
|
12352 |
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
|
12353 |
- m_Name: |
|
12354 |
- m_EditorClassIdentifier: |
|
12355 |
- m_Material: {fileID: 0} |
|
12356 |
- m_Color: {r: 1, g: 1, b: 1, a: 1} |
|
12357 |
- m_RaycastTarget: 1 |
|
12358 |
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
|
12359 |
- m_Maskable: 1 |
|
12360 |
- m_OnCullStateChanged: |
|
12361 |
- m_PersistentCalls: |
|
12362 |
- m_Calls: [] |
|
12363 |
- m_Sprite: {fileID: 10917, guid: 0000000000000000f000000000000000, type: 0} |
|
12364 |
- m_Type: 1 |
|
12365 |
- m_PreserveAspect: 0 |
|
12366 |
- m_FillCenter: 1 |
|
12367 |
- m_FillMethod: 4 |
|
12368 |
- m_FillAmount: 1 |
|
12369 |
- m_FillClockwise: 1 |
|
12370 |
- m_FillOrigin: 0 |
|
12371 |
- m_UseSpriteMesh: 0 |
|
12372 |
- m_PixelsPerUnitMultiplier: 1 |
|
12373 |
---- !u!114 &8033121187021179791 |
|
12374 |
-MonoBehaviour: |
|
12375 |
- m_ObjectHideFlags: 0 |
|
12376 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
12377 |
- m_PrefabInstance: {fileID: 0} |
|
12378 |
- m_PrefabAsset: {fileID: 0} |
|
12379 |
- m_GameObject: {fileID: 1536902079447723767} |
|
12380 |
- m_Enabled: 1 |
|
12381 |
- m_EditorHideFlags: 0 |
|
12382 |
- m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3} |
|
12383 |
- m_Name: |
|
12384 |
- m_EditorClassIdentifier: |
|
12385 |
- m_ShowMaskGraphic: 0 |
|
12386 | 12296 |
--- !u!1 &1550397932359321101 |
12387 | 12297 |
GameObject: |
12388 | 12298 |
m_ObjectHideFlags: 0 |
... | ... | @@ -16325,8 +16235,8 @@ |
16325 | 16235 |
m_OnClick: |
16326 | 16236 |
m_PersistentCalls: |
16327 | 16237 |
m_Calls: |
16328 |
- - m_Target: {fileID: 1336578072685318121} |
|
16329 |
- m_TargetAssemblyTypeName: VRTkUIManager, Assembly-CSharp |
|
16238 |
+ - m_Target: {fileID: 7811789589969689281} |
|
16239 |
+ m_TargetAssemblyTypeName: PlayVRUIManager, Assembly-CSharp |
|
16330 | 16240 |
m_MethodName: SetVRAnimPlay |
16331 | 16241 |
m_Mode: 5 |
16332 | 16242 |
m_Arguments: |
... | ... | @@ -16990,7 +16900,7 @@ |
16990 | 16900 |
- component: {fileID: 5958864700967268702} |
16991 | 16901 |
- component: {fileID: 8220108981381429184} |
16992 | 16902 |
m_Layer: 5 |
16993 |
- m_Name: AIEvalModeObj |
|
16903 |
+ m_Name: AIJudgeModeObj |
|
16994 | 16904 |
m_TagString: Untagged |
16995 | 16905 |
m_Icon: {fileID: 0} |
16996 | 16906 |
m_NavMeshLayer: 0 |
... | ... | @@ -18000,141 +17910,6 @@ |
18000 | 17910 |
m_EditorClassIdentifier: |
18001 | 17911 |
radius: 5 |
18002 | 17912 |
image: {fileID: 1048037178912502014} |
18003 |
---- !u!1 &2302240709346426514 |
|
18004 |
-GameObject: |
|
18005 |
- m_ObjectHideFlags: 0 |
|
18006 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
18007 |
- m_PrefabInstance: {fileID: 0} |
|
18008 |
- m_PrefabAsset: {fileID: 0} |
|
18009 |
- serializedVersion: 6 |
|
18010 |
- m_Component: |
|
18011 |
- - component: {fileID: 2676602244570131141} |
|
18012 |
- - component: {fileID: 7995343507427898413} |
|
18013 |
- - component: {fileID: 2108463934943829544} |
|
18014 |
- m_Layer: 5 |
|
18015 |
- m_Name: Text (TMP) |
|
18016 |
- m_TagString: Untagged |
|
18017 |
- m_Icon: {fileID: 0} |
|
18018 |
- m_NavMeshLayer: 0 |
|
18019 |
- m_StaticEditorFlags: 0 |
|
18020 |
- m_IsActive: 1 |
|
18021 |
---- !u!224 &2676602244570131141 |
|
18022 |
-RectTransform: |
|
18023 |
- m_ObjectHideFlags: 0 |
|
18024 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
18025 |
- m_PrefabInstance: {fileID: 0} |
|
18026 |
- m_PrefabAsset: {fileID: 0} |
|
18027 |
- m_GameObject: {fileID: 2302240709346426514} |
|
18028 |
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
|
18029 |
- m_LocalPosition: {x: 0, y: 0, z: -0} |
|
18030 |
- m_LocalScale: {x: 1, y: 1, z: 1} |
|
18031 |
- m_ConstrainProportionsScale: 0 |
|
18032 |
- m_Children: [] |
|
18033 |
- m_Father: {fileID: 6470832318958924327} |
|
18034 |
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
18035 |
- m_AnchorMin: {x: 0.5, y: 0} |
|
18036 |
- m_AnchorMax: {x: 0.5, y: 0} |
|
18037 |
- m_AnchoredPosition: {x: 0, y: -4} |
|
18038 |
- m_SizeDelta: {x: 60, y: 8} |
|
18039 |
- m_Pivot: {x: 0.5, y: 0.5} |
|
18040 |
---- !u!222 &7995343507427898413 |
|
18041 |
-CanvasRenderer: |
|
18042 |
- m_ObjectHideFlags: 0 |
|
18043 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
18044 |
- m_PrefabInstance: {fileID: 0} |
|
18045 |
- m_PrefabAsset: {fileID: 0} |
|
18046 |
- m_GameObject: {fileID: 2302240709346426514} |
|
18047 |
- m_CullTransparentMesh: 1 |
|
18048 |
---- !u!114 &2108463934943829544 |
|
18049 |
-MonoBehaviour: |
|
18050 |
- m_ObjectHideFlags: 0 |
|
18051 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
18052 |
- m_PrefabInstance: {fileID: 0} |
|
18053 |
- m_PrefabAsset: {fileID: 0} |
|
18054 |
- m_GameObject: {fileID: 2302240709346426514} |
|
18055 |
- m_Enabled: 1 |
|
18056 |
- m_EditorHideFlags: 0 |
|
18057 |
- m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} |
|
18058 |
- m_Name: |
|
18059 |
- m_EditorClassIdentifier: |
|
18060 |
- m_Material: {fileID: 0} |
|
18061 |
- m_Color: {r: 1, g: 1, b: 1, a: 1} |
|
18062 |
- m_RaycastTarget: 1 |
|
18063 |
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
|
18064 |
- m_Maskable: 1 |
|
18065 |
- m_OnCullStateChanged: |
|
18066 |
- m_PersistentCalls: |
|
18067 |
- m_Calls: [] |
|
18068 |
- m_text: Pro |
|
18069 |
- m_isRightToLeft: 0 |
|
18070 |
- m_fontAsset: {fileID: 11400000, guid: dbde3ec474936cd4c8ec331379d16e94, type: 2} |
|
18071 |
- m_sharedMaterial: {fileID: 3420232619700612365, guid: dbde3ec474936cd4c8ec331379d16e94, |
|
18072 |
- type: 2} |
|
18073 |
- m_fontSharedMaterials: [] |
|
18074 |
- m_fontMaterial: {fileID: 0} |
|
18075 |
- m_fontMaterials: [] |
|
18076 |
- m_fontColor32: |
|
18077 |
- serializedVersion: 2 |
|
18078 |
- rgba: 4294967295 |
|
18079 |
- m_fontColor: {r: 1, g: 1, b: 1, a: 1} |
|
18080 |
- m_enableVertexGradient: 0 |
|
18081 |
- m_colorMode: 3 |
|
18082 |
- m_fontColorGradient: |
|
18083 |
- topLeft: {r: 1, g: 1, b: 1, a: 1} |
|
18084 |
- topRight: {r: 1, g: 1, b: 1, a: 1} |
|
18085 |
- bottomLeft: {r: 1, g: 1, b: 1, a: 1} |
|
18086 |
- bottomRight: {r: 1, g: 1, b: 1, a: 1} |
|
18087 |
- m_fontColorGradientPreset: {fileID: 0} |
|
18088 |
- m_spriteAsset: {fileID: 0} |
|
18089 |
- m_tintAllSprites: 0 |
|
18090 |
- m_StyleSheet: {fileID: 0} |
|
18091 |
- m_TextStyleHashCode: -1183493901 |
|
18092 |
- m_overrideHtmlColors: 0 |
|
18093 |
- m_faceColor: |
|
18094 |
- serializedVersion: 2 |
|
18095 |
- rgba: 4294967295 |
|
18096 |
- m_fontSize: 6 |
|
18097 |
- m_fontSizeBase: 6 |
|
18098 |
- m_fontWeight: 400 |
|
18099 |
- m_enableAutoSizing: 0 |
|
18100 |
- m_fontSizeMin: 18 |
|
18101 |
- m_fontSizeMax: 72 |
|
18102 |
- m_fontStyle: 0 |
|
18103 |
- m_HorizontalAlignment: 2 |
|
18104 |
- m_VerticalAlignment: 512 |
|
18105 |
- m_textAlignment: 65535 |
|
18106 |
- m_characterSpacing: 0 |
|
18107 |
- m_wordSpacing: 0 |
|
18108 |
- m_lineSpacing: 0 |
|
18109 |
- m_lineSpacingMax: 0 |
|
18110 |
- m_paragraphSpacing: 0 |
|
18111 |
- m_charWidthMaxAdj: 0 |
|
18112 |
- m_enableWordWrapping: 1 |
|
18113 |
- m_wordWrappingRatios: 0.4 |
|
18114 |
- m_overflowMode: 0 |
|
18115 |
- m_linkedTextComponent: {fileID: 0} |
|
18116 |
- parentLinkedComponent: {fileID: 0} |
|
18117 |
- m_enableKerning: 1 |
|
18118 |
- m_enableExtraPadding: 0 |
|
18119 |
- checkPaddingRequired: 0 |
|
18120 |
- m_isRichText: 1 |
|
18121 |
- m_parseCtrlCharacters: 1 |
|
18122 |
- m_isOrthographic: 1 |
|
18123 |
- m_isCullingEnabled: 0 |
|
18124 |
- m_horizontalMapping: 0 |
|
18125 |
- m_verticalMapping: 0 |
|
18126 |
- m_uvLineOffset: 0 |
|
18127 |
- m_geometrySortingOrder: 0 |
|
18128 |
- m_IsTextObjectScaleStatic: 0 |
|
18129 |
- m_VertexBufferAutoSizeReduction: 0 |
|
18130 |
- m_useMaxVisibleDescender: 1 |
|
18131 |
- m_pageToDisplay: 1 |
|
18132 |
- m_margin: {x: 0, y: 0, z: 0, w: 0} |
|
18133 |
- m_isUsingLegacyAnimationComponent: 0 |
|
18134 |
- m_isVolumetricText: 0 |
|
18135 |
- m_hasFontAssetChanged: 0 |
|
18136 |
- m_baseMaterial: {fileID: 0} |
|
18137 |
- m_maskOffset: {x: 0, y: 0, z: 0, w: 0} |
|
18138 | 17913 |
--- !u!1 &2305461688689189757 |
18139 | 17914 |
GameObject: |
18140 | 17915 |
m_ObjectHideFlags: 0 |
... | ... | @@ -22814,13 +22589,12 @@ |
22814 | 22589 |
m_LocalPosition: {x: 0, y: 0, z: -2} |
22815 | 22590 |
m_LocalScale: {x: 1, y: 1, z: 1} |
22816 | 22591 |
m_ConstrainProportionsScale: 0 |
22817 |
- m_Children: |
|
22818 |
- - {fileID: 2676602244570131141} |
|
22592 |
+ m_Children: [] |
|
22819 | 22593 |
m_Father: {fileID: 2682295955347840279} |
22820 | 22594 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
22821 |
- m_AnchorMin: {x: 1, y: 1} |
|
22822 |
- m_AnchorMax: {x: 1, y: 1} |
|
22823 |
- m_AnchoredPosition: {x: -10, y: -10} |
|
22595 |
+ m_AnchorMin: {x: 0, y: 0} |
|
22596 |
+ m_AnchorMax: {x: 0, y: 0} |
|
22597 |
+ m_AnchoredPosition: {x: 10, y: 20} |
|
22824 | 22598 |
m_SizeDelta: {x: 15, y: 15} |
22825 | 22599 |
m_Pivot: {x: 0.5, y: 0.5} |
22826 | 22600 |
--- !u!222 &5383579481475631065 |
... | ... | @@ -23735,9 +23509,9 @@ |
23735 | 23509 |
- {fileID: 1025620628972644177} |
23736 | 23510 |
m_Father: {fileID: 5045285817590339192} |
23737 | 23511 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
23738 |
- m_AnchorMin: {x: 0, y: 1} |
|
23739 |
- m_AnchorMax: {x: 0, y: 1} |
|
23740 |
- m_AnchoredPosition: {x: 20, y: -5} |
|
23512 |
+ m_AnchorMin: {x: 0, y: 0} |
|
23513 |
+ m_AnchorMax: {x: 0, y: 0} |
|
23514 |
+ m_AnchoredPosition: {x: 0, y: 0} |
|
23741 | 23515 |
m_SizeDelta: {x: 40, y: 10} |
23742 | 23516 |
m_Pivot: {x: 0.5, y: 0.5} |
23743 | 23517 |
--- !u!1 &3185937031637650261 |
... | ... | @@ -23945,7 +23719,7 @@ |
23945 | 23719 |
m_Icon: {fileID: 0} |
23946 | 23720 |
m_NavMeshLayer: 0 |
23947 | 23721 |
m_StaticEditorFlags: 0 |
23948 |
- m_IsActive: 1 |
|
23722 |
+ m_IsActive: 0 |
|
23949 | 23723 |
--- !u!224 &7989251958888224101 |
23950 | 23724 |
RectTransform: |
23951 | 23725 |
m_ObjectHideFlags: 0 |
... | ... | @@ -24019,7 +23793,7 @@ |
24019 | 23793 |
m_Icon: {fileID: 0} |
24020 | 23794 |
m_NavMeshLayer: 0 |
24021 | 23795 |
m_StaticEditorFlags: 0 |
24022 |
- m_IsActive: 0 |
|
23796 |
+ m_IsActive: 1 |
|
24023 | 23797 |
--- !u!224 &7098302888413880262 |
24024 | 23798 |
RectTransform: |
24025 | 23799 |
m_ObjectHideFlags: 0 |
... | ... | @@ -24690,9 +24464,9 @@ |
24690 | 24464 |
- {fileID: 3230108889490381906} |
24691 | 24465 |
m_Father: {fileID: 6451429106112992192} |
24692 | 24466 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
24693 |
- m_AnchorMin: {x: 0, y: 1} |
|
24694 |
- m_AnchorMax: {x: 0, y: 1} |
|
24695 |
- m_AnchoredPosition: {x: 15, y: -10} |
|
24467 |
+ m_AnchorMin: {x: 0, y: 0} |
|
24468 |
+ m_AnchorMax: {x: 0, y: 0} |
|
24469 |
+ m_AnchoredPosition: {x: 0, y: 0} |
|
24696 | 24470 |
m_SizeDelta: {x: 30, y: 20} |
24697 | 24471 |
m_Pivot: {x: 0.5, y: 0.5} |
24698 | 24472 |
--- !u!1 &3297391311811209740 |
... | ... | @@ -25534,9 +25308,9 @@ |
25534 | 25308 |
- {fileID: 1020782642765065989} |
25535 | 25309 |
m_Father: {fileID: 5045285817590339192} |
25536 | 25310 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
25537 |
- m_AnchorMin: {x: 0, y: 1} |
|
25538 |
- m_AnchorMax: {x: 0, y: 1} |
|
25539 |
- m_AnchoredPosition: {x: 70, y: -5} |
|
25311 |
+ m_AnchorMin: {x: 0, y: 0} |
|
25312 |
+ m_AnchorMax: {x: 0, y: 0} |
|
25313 |
+ m_AnchoredPosition: {x: 0, y: 0} |
|
25540 | 25314 |
m_SizeDelta: {x: 40, y: 10} |
25541 | 25315 |
m_Pivot: {x: 0.5, y: 0.5} |
25542 | 25316 |
--- !u!1 &3364374563496874083 |
... | ... | @@ -26963,7 +26737,7 @@ |
26963 | 26737 |
m_OnClick: |
26964 | 26738 |
m_PersistentCalls: |
26965 | 26739 |
m_Calls: |
26966 |
- - m_Target: {fileID: 1336578072685318121} |
|
26740 |
+ - m_Target: {fileID: 0} |
|
26967 | 26741 |
m_TargetAssemblyTypeName: VRTkUIManager, Assembly-CSharp |
26968 | 26742 |
m_MethodName: SetVRAnimPlay |
26969 | 26743 |
m_Mode: 5 |
... | ... | @@ -27332,7 +27106,7 @@ |
27332 | 27106 |
m_AnchorMin: {x: 0, y: 0} |
27333 | 27107 |
m_AnchorMax: {x: 1, y: 0} |
27334 | 27108 |
m_AnchoredPosition: {x: 0, y: 12.000003} |
27335 |
- m_SizeDelta: {x: -194, y: 20} |
|
27109 |
+ m_SizeDelta: {x: 0, y: 20} |
|
27336 | 27110 |
m_Pivot: {x: 0.5, y: 0.5} |
27337 | 27111 |
--- !u!114 &7887242680132732357 |
27338 | 27112 |
MonoBehaviour: |
... | ... | @@ -29028,7 +28802,7 @@ |
29028 | 28802 |
m_Component: |
29029 | 28803 |
- component: {fileID: 4979405780825979092} |
29030 | 28804 |
m_Layer: 5 |
29031 |
- m_Name: AIEvalMode |
|
28805 |
+ m_Name: AIJudgeMode |
|
29032 | 28806 |
m_TagString: Untagged |
29033 | 28807 |
m_Icon: {fileID: 0} |
29034 | 28808 |
m_NavMeshLayer: 0 |
... | ... | @@ -34168,7 +33942,7 @@ |
34168 | 33942 |
m_Father: {fileID: 8168959594747483245} |
34169 | 33943 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
34170 | 33944 |
m_AnchorMin: {x: 0, y: 0} |
34171 |
- m_AnchorMax: {x: 1, y: 1} |
|
33945 |
+ m_AnchorMax: {x: 0, y: 0} |
|
34172 | 33946 |
m_AnchoredPosition: {x: 0, y: 0} |
34173 | 33947 |
m_SizeDelta: {x: 10, y: 10} |
34174 | 33948 |
m_Pivot: {x: 0.5, y: 0.5} |
... | ... | @@ -34659,41 +34433,6 @@ |
34659 | 34433 |
m_EditorClassIdentifier: |
34660 | 34434 |
radius: 4 |
34661 | 34435 |
image: {fileID: 1386511731173260655} |
34662 |
---- !u!1 &4638100131963605589 |
|
34663 |
-GameObject: |
|
34664 |
- m_ObjectHideFlags: 0 |
|
34665 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
34666 |
- m_PrefabInstance: {fileID: 0} |
|
34667 |
- m_PrefabAsset: {fileID: 0} |
|
34668 |
- serializedVersion: 6 |
|
34669 |
- m_Component: |
|
34670 |
- - component: {fileID: 4225573338708162552} |
|
34671 |
- m_Layer: 5 |
|
34672 |
- m_Name: Content |
|
34673 |
- m_TagString: Untagged |
|
34674 |
- m_Icon: {fileID: 0} |
|
34675 |
- m_NavMeshLayer: 0 |
|
34676 |
- m_StaticEditorFlags: 0 |
|
34677 |
- m_IsActive: 1 |
|
34678 |
---- !u!224 &4225573338708162552 |
|
34679 |
-RectTransform: |
|
34680 |
- m_ObjectHideFlags: 0 |
|
34681 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
34682 |
- m_PrefabInstance: {fileID: 0} |
|
34683 |
- m_PrefabAsset: {fileID: 0} |
|
34684 |
- m_GameObject: {fileID: 4638100131963605589} |
|
34685 |
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
|
34686 |
- m_LocalPosition: {x: 0, y: 0, z: 0} |
|
34687 |
- m_LocalScale: {x: 1, y: 1, z: 1} |
|
34688 |
- m_ConstrainProportionsScale: 0 |
|
34689 |
- m_Children: [] |
|
34690 |
- m_Father: {fileID: 511829399914839507} |
|
34691 |
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
34692 |
- m_AnchorMin: {x: 0, y: 1} |
|
34693 |
- m_AnchorMax: {x: 1, y: 1} |
|
34694 |
- m_AnchoredPosition: {x: 0, y: 0} |
|
34695 |
- m_SizeDelta: {x: 0, y: 300} |
|
34696 |
- m_Pivot: {x: 0, y: 1} |
|
34697 | 34436 |
--- !u!1 &4658621522914320314 |
34698 | 34437 |
GameObject: |
34699 | 34438 |
m_ObjectHideFlags: 0 |
... | ... | @@ -34998,7 +34737,6 @@ |
34998 | 34737 |
m_Component: |
34999 | 34738 |
- component: {fileID: 6197702163516169505} |
35000 | 34739 |
- component: {fileID: 7811789589969689281} |
35001 |
- - component: {fileID: 1336578072685318121} |
|
35002 | 34740 |
- component: {fileID: 5060755355616458311} |
35003 | 34741 |
m_Layer: 5 |
35004 | 34742 |
m_Name: vrui |
... | ... | @@ -35079,6 +34817,9 @@ |
35079 | 34817 |
nowSelectBundleName: |
35080 | 34818 |
nowSelectAnim: |
35081 | 34819 |
popUp: {fileID: 0} |
34820 |
+ instructorObjs: [] |
|
34821 |
+ createInstructorObjs: [] |
|
34822 |
+ contentAnimClips: [] |
|
35082 | 34823 |
playContentManager: {fileID: 0} |
35083 | 34824 |
playTitleBgManager: {fileID: 0} |
35084 | 34825 |
playItemManager: {fileID: 0} |
... | ... | @@ -35086,77 +34827,7 @@ |
35086 | 34827 |
playProgramManager: {fileID: 0} |
35087 | 34828 |
playReadyManager: {fileID: 0} |
35088 | 34829 |
playBtmBtnManager: {fileID: 0} |
35089 |
---- !u!114 &1336578072685318121 |
|
35090 |
-MonoBehaviour: |
|
35091 |
- m_ObjectHideFlags: 0 |
|
35092 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
35093 |
- m_PrefabInstance: {fileID: 0} |
|
35094 |
- m_PrefabAsset: {fileID: 0} |
|
35095 |
- m_GameObject: {fileID: 4699340791248144885} |
|
35096 |
- m_Enabled: 0 |
|
35097 |
- m_EditorHideFlags: 0 |
|
35098 |
- m_Script: {fileID: 11500000, guid: f08a769f14cb24d4c98f2862c6e10b5e, type: 3} |
|
35099 |
- m_Name: |
|
35100 |
- m_EditorClassIdentifier: |
|
35101 |
- uiManager: {fileID: 0} |
|
35102 |
- animController: {fileID: 0} |
|
35103 |
- popUp: {fileID: 7555817891792917584} |
|
35104 |
- resultUIManager: {fileID: 8551312290356072768} |
|
35105 |
- titleObj: {fileID: 460412680427438641} |
|
35106 |
- titleTxt: {fileID: 1565124616250416381} |
|
35107 |
- InstructorObj: {fileID: 0} |
|
35108 |
- programObj: {fileID: 1139739480747065517} |
|
35109 |
- basicBtn: {fileID: 3796100122441745758} |
|
35110 |
- poomsaeBtn: {fileID: 7684445513370022854} |
|
35111 |
- olympicBtn: {fileID: 3726365245254345660} |
|
35112 |
- userInfoObj: {fileID: 6073842978729044186} |
|
35113 |
- profileImg: {fileID: 2975413323642893234} |
|
35114 |
- nicknameTxt: {fileID: 4919129807110386040} |
|
35115 |
- idTxt: {fileID: 0} |
|
35116 |
- heartCountTxt: {fileID: 3464072892567608936} |
|
35117 |
- coachInfoObj: {fileID: 0} |
|
35118 |
- coachImg: {fileID: 0} |
|
35119 |
- coachNameTxt: {fileID: 0} |
|
35120 |
- coachCareerTxt: {fileID: 0} |
|
35121 |
- coachAwardListTxt: {fileID: 0} |
|
35122 |
- buttomObj: {fileID: 3947715609280903020} |
|
35123 |
- homeBtn: {fileID: 2785194658062799443} |
|
35124 |
- storeBtn: {fileID: 2260397953961266586} |
|
35125 |
- settingBtn: {fileID: 3150545000586007727} |
|
35126 |
- exitBtn: {fileID: 850262024699958872} |
|
35127 |
- poomsaeObj: {fileID: 0} |
|
35128 |
- placeSelectobj: {fileID: 0} |
|
35129 |
- selectPlayMode: {fileID: 9195523751978392180} |
|
35130 |
- selectTk: {fileID: 0} |
|
35131 |
- selectTkCoach: {fileID: 5326180956647978047} |
|
35132 |
- tkCoachScrollContent: {fileID: 1521246837608718965} |
|
35133 |
- tkScrollContent: {fileID: 0} |
|
35134 |
- tkScrollRect: {fileID: 0} |
|
35135 |
- contentXPos: 0 |
|
35136 |
- grandSelectBg: {fileID: 3415930285306285781} |
|
35137 |
- tkCoachObj: {fileID: 2646062016474715998} |
|
35138 |
- tkInfoObj: {fileID: 0} |
|
35139 |
- popupDetailManager: {fileID: 459766418189488068} |
|
35140 |
- popupBuyManager: {fileID: 5235217658021458059} |
|
35141 |
- nowProgram: |
|
35142 |
- nowSelectAnim: |
|
35143 |
- nowSelectCoachId: 0 |
|
35144 |
- nowSelectCoachFileName: |
|
35145 |
- nowSelectCoachName: |
|
35146 |
- tkInfoList: [] |
|
35147 |
- tkCoachList: [] |
|
35148 |
- tkCoachObjs: [] |
|
35149 |
- tkCreateCoachObjs: [] |
|
35150 |
- tkAnimClips: |
|
35151 |
- keys: [] |
|
35152 |
- values: [] |
|
35153 |
- isOnBtn: 0 |
|
35154 |
- isInMouse: 0 |
|
35155 |
- tkState: 0 |
|
35156 |
- nowOpenTk: 0 |
|
35157 |
- buyListTxt: {fileID: 7433690880523699685} |
|
35158 |
- changeScrollRect: {fileID: 0} |
|
35159 |
- storeManager: {fileID: 5060755355616458311} |
|
34830 |
+ resultUIManager: {fileID: 0} |
|
35160 | 34831 |
--- !u!114 &5060755355616458311 |
35161 | 34832 |
MonoBehaviour: |
35162 | 34833 |
m_ObjectHideFlags: 0 |
... | ... | @@ -36576,7 +36247,7 @@ |
36576 | 36247 |
m_Icon: {fileID: 0} |
36577 | 36248 |
m_NavMeshLayer: 0 |
36578 | 36249 |
m_StaticEditorFlags: 0 |
36579 |
- m_IsActive: 0 |
|
36250 |
+ m_IsActive: 1 |
|
36580 | 36251 |
--- !u!224 &6889083374197538515 |
36581 | 36252 |
RectTransform: |
36582 | 36253 |
m_ObjectHideFlags: 0 |
... | ... | @@ -38345,7 +38016,7 @@ |
38345 | 38016 |
m_AnchorMin: {x: 0, y: 1} |
38346 | 38017 |
m_AnchorMax: {x: 1, y: 1} |
38347 | 38018 |
m_AnchoredPosition: {x: 26, y: -32} |
38348 |
- m_SizeDelta: {x: -132, y: 10} |
|
38019 |
+ m_SizeDelta: {x: 0, y: 10} |
|
38349 | 38020 |
m_Pivot: {x: 0.5, y: 0.5} |
38350 | 38021 |
--- !u!114 &1945156265169757091 |
38351 | 38022 |
MonoBehaviour: |
... | ... | @@ -40408,42 +40079,6 @@ |
40408 | 40079 |
m_AnchoredPosition: {x: 0, y: 0} |
40409 | 40080 |
m_SizeDelta: {x: 0, y: 0} |
40410 | 40081 |
m_Pivot: {x: 0.5, y: 0.5} |
40411 |
---- !u!1 &5223641353899670806 |
|
40412 |
-GameObject: |
|
40413 |
- m_ObjectHideFlags: 0 |
|
40414 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
40415 |
- m_PrefabInstance: {fileID: 0} |
|
40416 |
- m_PrefabAsset: {fileID: 0} |
|
40417 |
- serializedVersion: 6 |
|
40418 |
- m_Component: |
|
40419 |
- - component: {fileID: 2918449762508607542} |
|
40420 |
- m_Layer: 5 |
|
40421 |
- m_Name: GameObject |
|
40422 |
- m_TagString: Untagged |
|
40423 |
- m_Icon: {fileID: 0} |
|
40424 |
- m_NavMeshLayer: 0 |
|
40425 |
- m_StaticEditorFlags: 0 |
|
40426 |
- m_IsActive: 1 |
|
40427 |
---- !u!224 &2918449762508607542 |
|
40428 |
-RectTransform: |
|
40429 |
- m_ObjectHideFlags: 0 |
|
40430 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
40431 |
- m_PrefabInstance: {fileID: 0} |
|
40432 |
- m_PrefabAsset: {fileID: 0} |
|
40433 |
- m_GameObject: {fileID: 5223641353899670806} |
|
40434 |
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
|
40435 |
- m_LocalPosition: {x: 0, y: 0, z: 0} |
|
40436 |
- m_LocalScale: {x: 1, y: 1, z: 1} |
|
40437 |
- m_ConstrainProportionsScale: 0 |
|
40438 |
- m_Children: |
|
40439 |
- - {fileID: 3349190830808232335} |
|
40440 |
- m_Father: {fileID: 6833826957283142493} |
|
40441 |
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
40442 |
- m_AnchorMin: {x: 0, y: 0} |
|
40443 |
- m_AnchorMax: {x: 1, y: 1} |
|
40444 |
- m_AnchoredPosition: {x: 0, y: 0} |
|
40445 |
- m_SizeDelta: {x: 0, y: 0} |
|
40446 |
- m_Pivot: {x: 0.5, y: 0.5} |
|
40447 | 40082 |
--- !u!1 &5230486044234813632 |
40448 | 40083 |
GameObject: |
40449 | 40084 |
m_ObjectHideFlags: 0 |
... | ... | @@ -40847,7 +40482,7 @@ |
40847 | 40482 |
- component: {fileID: 8248589966349255186} |
40848 | 40483 |
- component: {fileID: 4685281808250285975} |
40849 | 40484 |
m_Layer: 5 |
40850 |
- m_Name: CoachNameBg |
|
40485 |
+ m_Name: InstructorNameBg |
|
40851 | 40486 |
m_TagString: Untagged |
40852 | 40487 |
m_Icon: {fileID: 0} |
40853 | 40488 |
m_NavMeshLayer: 0 |
... | ... | @@ -41292,7 +40927,7 @@ |
41292 | 40927 |
m_Icon: {fileID: 0} |
41293 | 40928 |
m_NavMeshLayer: 0 |
41294 | 40929 |
m_StaticEditorFlags: 0 |
41295 |
- m_IsActive: 1 |
|
40930 |
+ m_IsActive: 0 |
|
41296 | 40931 |
--- !u!224 &7141110829551216877 |
41297 | 40932 |
RectTransform: |
41298 | 40933 |
m_ObjectHideFlags: 0 |
... | ... | @@ -43264,9 +42899,9 @@ |
43264 | 42899 |
- {fileID: 350217055102543266} |
43265 | 42900 |
m_Father: {fileID: 5045285817590339192} |
43266 | 42901 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
43267 |
- m_AnchorMin: {x: 0, y: 1} |
|
43268 |
- m_AnchorMax: {x: 0, y: 1} |
|
43269 |
- m_AnchoredPosition: {x: 120, y: -5} |
|
42902 |
+ m_AnchorMin: {x: 0, y: 0} |
|
42903 |
+ m_AnchorMax: {x: 0, y: 0} |
|
42904 |
+ m_AnchoredPosition: {x: 0, y: 0} |
|
43270 | 42905 |
m_SizeDelta: {x: 40, y: 10} |
43271 | 42906 |
m_Pivot: {x: 0.5, y: 0.5} |
43272 | 42907 |
--- !u!1 &5537900026628668635 |
... | ... | @@ -44879,7 +44514,7 @@ |
44879 | 44514 |
m_OnClick: |
44880 | 44515 |
m_PersistentCalls: |
44881 | 44516 |
m_Calls: |
44882 |
- - m_Target: {fileID: 1336578072685318121} |
|
44517 |
+ - m_Target: {fileID: 0} |
|
44883 | 44518 |
m_TargetAssemblyTypeName: VRTkUIManager, Assembly-CSharp |
44884 | 44519 |
m_MethodName: SetVRAnimPlay |
44885 | 44520 |
m_Mode: 5 |
... | ... | @@ -45871,7 +45506,7 @@ |
45871 | 45506 |
m_Icon: {fileID: 0} |
45872 | 45507 |
m_NavMeshLayer: 0 |
45873 | 45508 |
m_StaticEditorFlags: 0 |
45874 |
- m_IsActive: 0 |
|
45509 |
+ m_IsActive: 1 |
|
45875 | 45510 |
--- !u!224 &4890934204488270359 |
45876 | 45511 |
RectTransform: |
45877 | 45512 |
m_ObjectHideFlags: 0 |
... | ... | @@ -51904,7 +51539,7 @@ |
51904 | 51539 |
m_Script: {fileID: 11500000, guid: adb30198aa32dd140b5750692dd48104, type: 3} |
51905 | 51540 |
m_Name: |
51906 | 51541 |
m_EditorClassIdentifier: |
51907 |
- radius: 4 |
|
51542 |
+ radius: 2 |
|
51908 | 51543 |
image: {fileID: 1777372452605893533} |
51909 | 51544 |
--- !u!1 &6680491161230323629 |
51910 | 51545 |
GameObject: |
... | ... | @@ -51938,9 +51573,9 @@ |
51938 | 51573 |
- {fileID: 2005451749108728121} |
51939 | 51574 |
m_Father: {fileID: 6451429106112992192} |
51940 | 51575 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
51941 |
- m_AnchorMin: {x: 0, y: 1} |
|
51942 |
- m_AnchorMax: {x: 0, y: 1} |
|
51943 |
- m_AnchoredPosition: {x: 60, y: -10} |
|
51576 |
+ m_AnchorMin: {x: 0, y: 0} |
|
51577 |
+ m_AnchorMax: {x: 0, y: 0} |
|
51578 |
+ m_AnchoredPosition: {x: 0, y: 0} |
|
51944 | 51579 |
m_SizeDelta: {x: 36, y: 20} |
51945 | 51580 |
m_Pivot: {x: 0.5, y: 0.5} |
51946 | 51581 |
--- !u!1 &6689295819397701156 |
... | ... | @@ -52976,113 +52611,6 @@ |
52976 | 52611 |
m_EditorClassIdentifier: |
52977 | 52612 |
radius: 5 |
52978 | 52613 |
image: {fileID: 782867038231620472} |
52979 |
---- !u!1 &6792097359753474479 |
|
52980 |
-GameObject: |
|
52981 |
- m_ObjectHideFlags: 0 |
|
52982 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
52983 |
- m_PrefabInstance: {fileID: 0} |
|
52984 |
- m_PrefabAsset: {fileID: 0} |
|
52985 |
- serializedVersion: 6 |
|
52986 |
- m_Component: |
|
52987 |
- - component: {fileID: 3349190830808232335} |
|
52988 |
- - component: {fileID: 1610684021096981496} |
|
52989 |
- - component: {fileID: 2403197906767089646} |
|
52990 |
- - component: {fileID: 3578773070419870475} |
|
52991 |
- m_Layer: 5 |
|
52992 |
- m_Name: Scroll View |
|
52993 |
- m_TagString: Untagged |
|
52994 |
- m_Icon: {fileID: 0} |
|
52995 |
- m_NavMeshLayer: 0 |
|
52996 |
- m_StaticEditorFlags: 0 |
|
52997 |
- m_IsActive: 1 |
|
52998 |
---- !u!224 &3349190830808232335 |
|
52999 |
-RectTransform: |
|
53000 |
- m_ObjectHideFlags: 0 |
|
53001 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
53002 |
- m_PrefabInstance: {fileID: 0} |
|
53003 |
- m_PrefabAsset: {fileID: 0} |
|
53004 |
- m_GameObject: {fileID: 6792097359753474479} |
|
53005 |
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} |
|
53006 |
- m_LocalPosition: {x: 0, y: 0, z: 0} |
|
53007 |
- m_LocalScale: {x: 1, y: 1, z: 1} |
|
53008 |
- m_ConstrainProportionsScale: 0 |
|
53009 |
- m_Children: |
|
53010 |
- - {fileID: 511829399914839507} |
|
53011 |
- m_Father: {fileID: 2918449762508607542} |
|
53012 |
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
|
53013 |
- m_AnchorMin: {x: 0, y: 1} |
|
53014 |
- m_AnchorMax: {x: 0, y: 1} |
|
53015 |
- m_AnchoredPosition: {x: 25, y: -25} |
|
53016 |
- m_SizeDelta: {x: 50, y: 50} |
|
53017 |
- m_Pivot: {x: 0.5, y: 0.5} |
|
53018 |
---- !u!222 &1610684021096981496 |
|
53019 |
-CanvasRenderer: |
|
53020 |
- m_ObjectHideFlags: 0 |
|
53021 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
53022 |
- m_PrefabInstance: {fileID: 0} |
|
53023 |
- m_PrefabAsset: {fileID: 0} |
|
53024 |
- m_GameObject: {fileID: 6792097359753474479} |
|
53025 |
- m_CullTransparentMesh: 1 |
|
53026 |
---- !u!114 &2403197906767089646 |
|
53027 |
-MonoBehaviour: |
|
53028 |
- m_ObjectHideFlags: 0 |
|
53029 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
53030 |
- m_PrefabInstance: {fileID: 0} |
|
53031 |
- m_PrefabAsset: {fileID: 0} |
|
53032 |
- m_GameObject: {fileID: 6792097359753474479} |
|
53033 |
- m_Enabled: 1 |
|
53034 |
- m_EditorHideFlags: 0 |
|
53035 |
- m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} |
|
53036 |
- m_Name: |
|
53037 |
- m_EditorClassIdentifier: |
|
53038 |
- m_Material: {fileID: 0} |
|
53039 |
- m_Color: {r: 1, g: 1, b: 1, a: 0.392} |
|
53040 |
- m_RaycastTarget: 1 |
|
53041 |
- m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
|
53042 |
- m_Maskable: 1 |
|
53043 |
- m_OnCullStateChanged: |
|
53044 |
- m_PersistentCalls: |
|
53045 |
- m_Calls: [] |
|
53046 |
- m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} |
|
53047 |
- m_Type: 1 |
|
53048 |
- m_PreserveAspect: 0 |
|
53049 |
- m_FillCenter: 1 |
|
53050 |
- m_FillMethod: 4 |
|
53051 |
- m_FillAmount: 1 |
|
53052 |
- m_FillClockwise: 1 |
|
53053 |
- m_FillOrigin: 0 |
|
53054 |
- m_UseSpriteMesh: 0 |
|
53055 |
- m_PixelsPerUnitMultiplier: 1 |
|
53056 |
---- !u!114 &3578773070419870475 |
|
53057 |
-MonoBehaviour: |
|
53058 |
- m_ObjectHideFlags: 0 |
|
53059 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
53060 |
- m_PrefabInstance: {fileID: 0} |
|
53061 |
- m_PrefabAsset: {fileID: 0} |
|
53062 |
- m_GameObject: {fileID: 6792097359753474479} |
|
53063 |
- m_Enabled: 1 |
|
53064 |
- m_EditorHideFlags: 0 |
|
53065 |
- m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3} |
|
53066 |
- m_Name: |
|
53067 |
- m_EditorClassIdentifier: |
|
53068 |
- m_Content: {fileID: 4225573338708162552} |
|
53069 |
- m_Horizontal: 0 |
|
53070 |
- m_Vertical: 1 |
|
53071 |
- m_MovementType: 1 |
|
53072 |
- m_Elasticity: 0.1 |
|
53073 |
- m_Inertia: 1 |
|
53074 |
- m_DecelerationRate: 0.135 |
|
53075 |
- m_ScrollSensitivity: 1 |
|
53076 |
- m_Viewport: {fileID: 511829399914839507} |
|
53077 |
- m_HorizontalScrollbar: {fileID: 0} |
|
53078 |
- m_VerticalScrollbar: {fileID: 0} |
|
53079 |
- m_HorizontalScrollbarVisibility: 2 |
|
53080 |
- m_VerticalScrollbarVisibility: 2 |
|
53081 |
- m_HorizontalScrollbarSpacing: -3 |
|
53082 |
- m_VerticalScrollbarSpacing: -3 |
|
53083 |
- m_OnValueChanged: |
|
53084 |
- m_PersistentCalls: |
|
53085 |
- m_Calls: [] |
|
53086 | 52614 |
--- !u!1 &6798026560647917495 |
53087 | 52615 |
GameObject: |
53088 | 52616 |
m_ObjectHideFlags: 0 |
... | ... | @@ -53417,7 +52945,7 @@ |
53417 | 52945 |
m_OnClick: |
53418 | 52946 |
m_PersistentCalls: |
53419 | 52947 |
m_Calls: |
53420 |
- - m_Target: {fileID: 1336578072685318121} |
|
52948 |
+ - m_Target: {fileID: 0} |
|
53421 | 52949 |
m_TargetAssemblyTypeName: VRTkUIManager, Assembly-CSharp |
53422 | 52950 |
m_MethodName: SetVRAnimPlay |
53423 | 52951 |
m_Mode: 5 |
... | ... | @@ -54049,9 +53577,8 @@ |
54049 | 53577 |
- component: {fileID: 6481221994957514943} |
54050 | 53578 |
- component: {fileID: 4926932906412312819} |
54051 | 53579 |
- component: {fileID: 48526201028024104} |
54052 |
- - component: {fileID: 2714969803873006320} |
|
54053 | 53580 |
m_Layer: 5 |
54054 |
- m_Name: InfoCoachObj |
|
53581 |
+ m_Name: InstructorInfoObj |
|
54055 | 53582 |
m_TagString: Untagged |
54056 | 53583 |
m_Icon: {fileID: 0} |
54057 | 53584 |
m_NavMeshLayer: 0 |
... | ... | @@ -54065,7 +53592,7 @@ |
54065 | 53592 |
m_PrefabAsset: {fileID: 0} |
54066 | 53593 |
m_GameObject: {fileID: 6874549994622180780} |
54067 | 53594 |
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} |
54068 |
- m_LocalPosition: {x: 0, y: 0, z: -2} |
|
53595 |
+ m_LocalPosition: {x: 0, y: 0, z: 0} |
|
54069 | 53596 |
m_LocalScale: {x: 1, y: 1, z: 1} |
54070 | 53597 |
m_ConstrainProportionsScale: 0 |
54071 | 53598 |
m_Children: |
... | ... | @@ -54129,7 +53656,7 @@ |
54129 | 53656 |
m_PrefabInstance: {fileID: 0} |
54130 | 53657 |
m_PrefabAsset: {fileID: 0} |
54131 | 53658 |
m_GameObject: {fileID: 6874549994622180780} |
54132 |
- m_Enabled: 1 |
|
53659 |
+ m_Enabled: 0 |
|
54133 | 53660 |
m_EditorHideFlags: 0 |
54134 | 53661 |
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} |
54135 | 53662 |
m_Name: |
... | ... | @@ -54161,37 +53688,11 @@ |
54161 | 53688 |
m_PressedTrigger: Pressed |
54162 | 53689 |
m_SelectedTrigger: Selected |
54163 | 53690 |
m_DisabledTrigger: Disabled |
54164 |
- m_Interactable: 1 |
|
53691 |
+ m_Interactable: 0 |
|
54165 | 53692 |
m_TargetGraphic: {fileID: 4926932906412312819} |
54166 | 53693 |
m_OnClick: |
54167 | 53694 |
m_PersistentCalls: |
54168 | 53695 |
m_Calls: [] |
54169 |
---- !u!114 &2714969803873006320 |
|
54170 |
-MonoBehaviour: |
|
54171 |
- m_ObjectHideFlags: 0 |
|
54172 |
- m_CorrespondingSourceObject: {fileID: 0} |
|
54173 |
- m_PrefabInstance: {fileID: 0} |
|
54174 |
- m_PrefabAsset: {fileID: 0} |
|
54175 |
- m_GameObject: {fileID: 6874549994622180780} |
|
54176 |
- m_Enabled: 1 |
|
54177 |
- m_EditorHideFlags: 0 |
|
54178 |
- m_Script: {fileID: 11500000, guid: e6b78f018d8668849bce0a5cba39804d, type: 3} |
|
54179 |
- m_Name: |
|
54180 |
- m_EditorClassIdentifier: |
|
54181 |
- coachImg: {fileID: 3873513333538366824} |
|
54182 |
- coachNameTxt: {fileID: 6266579885331779920} |
|
54183 |
- checkImg: {fileID: 9211592013612933059} |
|
54184 |
- tkCoachId: 0 |
|
54185 |
- isLock: 0 |
|
54186 |
- lockObj: {fileID: 1624543572733031381} |
|
54187 |
- vrTkUIManager: {fileID: 0} |
|
54188 |
- isPointDown: 0 |
|
54189 |
- tkCoachImg: |
|
54190 |
- - {fileID: 21300000, guid: 2a8772130a6398746ad7dadd93653cd6, type: 3} |
|
54191 |
- - {fileID: 21300000, guid: fe61c32aa02506a46b59646deb9d71c7, type: 3} |
|
54192 |
- - {fileID: 21300000, guid: 52804bea393e6054d81c99eaef349f35, type: 3} |
|
54193 |
- tkCoachkLocalize: {fileID: 3641075100548663748} |
|
54194 |
- detailBtn: {fileID: 522562240654709748} |
|
54195 | 53696 |
--- !u!1 &6885039034413235147 |
54196 | 53697 |
GameObject: |
54197 | 53698 |
m_ObjectHideFlags: 0 |
... | ... | @@ -58990,8 +58491,8 @@ |
58990 | 58491 |
m_OnClick: |
58991 | 58492 |
m_PersistentCalls: |
58992 | 58493 |
m_Calls: |
58993 |
- - m_Target: {fileID: 1336578072685318121} |
|
58994 |
- m_TargetAssemblyTypeName: VRTkUIManager, Assembly-CSharp |
|
58494 |
+ - m_Target: {fileID: 7811789589969689281} |
|
58495 |
+ m_TargetAssemblyTypeName: PlayVRUIManager, Assembly-CSharp |
|
58995 | 58496 |
m_MethodName: SetVRAnimPlay |
58996 | 58497 |
m_Mode: 5 |
58997 | 58498 |
m_Arguments: |
... | ... | @@ -62135,7 +61636,7 @@ |
62135 | 61636 |
m_OnClick: |
62136 | 61637 |
m_PersistentCalls: |
62137 | 61638 |
m_Calls: |
62138 |
- - m_Target: {fileID: 1336578072685318121} |
|
61639 |
+ - m_Target: {fileID: 0} |
|
62139 | 61640 |
m_TargetAssemblyTypeName: VRTkUIManager, Assembly-CSharp |
62140 | 61641 |
m_MethodName: ResetBuyList |
62141 | 61642 |
m_Mode: 1 |
... | ... | @@ -62518,7 +62019,7 @@ |
62518 | 62019 |
m_AnchorMin: {x: 0, y: 0} |
62519 | 62020 |
m_AnchorMax: {x: 1, y: 1} |
62520 | 62021 |
m_AnchoredPosition: {x: 0, y: -0.0000076293945} |
62521 |
- m_SizeDelta: {x: -15, y: -48} |
|
62022 |
+ m_SizeDelta: {x: 0, y: 0} |
|
62522 | 62023 |
m_Pivot: {x: 0, y: 1} |
62523 | 62024 |
--- !u!114 &9133275818351279943 |
62524 | 62025 |
MonoBehaviour: |
... | ... | @@ -66832,7 +66333,6 @@ |
66832 | 66333 |
m_ConstrainProportionsScale: 0 |
66833 | 66334 |
m_Children: |
66834 | 66335 |
- {fileID: 368239961977590006} |
66835 |
- - {fileID: 2918449762508607542} |
|
66836 | 66336 |
m_Father: {fileID: 6197702163516169505} |
66837 | 66337 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
66838 | 66338 |
m_AnchorMin: {x: 0, y: 0} |
... | ... | @@ -69098,7 +68598,7 @@ |
69098 | 68598 |
m_Name: |
69099 | 68599 |
m_EditorClassIdentifier: |
69100 | 68600 |
m_Material: {fileID: 0} |
69101 |
- m_Color: {r: 0, g: 0, b: 0, a: 0.9411765} |
|
68601 |
+ m_Color: {r: 0, g: 0, b: 0, a: 0.54901963} |
|
69102 | 68602 |
m_RaycastTarget: 1 |
69103 | 68603 |
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} |
69104 | 68604 |
m_Maskable: 1 |
... | ... | @@ -69600,9 +69100,9 @@ |
69600 | 69100 |
- {fileID: 5777289841090790467} |
69601 | 69101 |
m_Father: {fileID: 6451429106112992192} |
69602 | 69102 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
69603 |
- m_AnchorMin: {x: 0, y: 1} |
|
69604 |
- m_AnchorMax: {x: 0, y: 1} |
|
69605 |
- m_AnchoredPosition: {x: 36, y: -10} |
|
69103 |
+ m_AnchorMin: {x: 0, y: 0} |
|
69104 |
+ m_AnchorMax: {x: 0, y: 0} |
|
69105 |
+ m_AnchoredPosition: {x: 0, y: 0} |
|
69606 | 69106 |
m_SizeDelta: {x: 12, y: 16} |
69607 | 69107 |
m_Pivot: {x: 0.5, y: 0.5} |
69608 | 69108 |
--- !u!1 &8769875149630266903 |
... | ... | @@ -69798,7 +69298,7 @@ |
69798 | 69298 |
- component: {fileID: 7938614661829018313} |
69799 | 69299 |
- component: {fileID: 502727699367414917} |
69800 | 69300 |
m_Layer: 5 |
69801 |
- m_Name: AIEvalModeBtn |
|
69301 |
+ m_Name: AIJudgeModeBtn |
|
69802 | 69302 |
m_TagString: Untagged |
69803 | 69303 |
m_Icon: {fileID: 0} |
69804 | 69304 |
m_NavMeshLayer: 0 |
... | ... | @@ -69902,13 +69402,13 @@ |
69902 | 69402 |
m_PressedTrigger: Pressed |
69903 | 69403 |
m_SelectedTrigger: Selected |
69904 | 69404 |
m_DisabledTrigger: Disabled |
69905 |
- m_Interactable: 1 |
|
69405 |
+ m_Interactable: 0 |
|
69906 | 69406 |
m_TargetGraphic: {fileID: 7938614661829018313} |
69907 | 69407 |
m_OnClick: |
69908 | 69408 |
m_PersistentCalls: |
69909 | 69409 |
m_Calls: |
69910 |
- - m_Target: {fileID: 1336578072685318121} |
|
69911 |
- m_TargetAssemblyTypeName: VRTkUIManager, Assembly-CSharp |
|
69410 |
+ - m_Target: {fileID: 7811789589969689281} |
|
69411 |
+ m_TargetAssemblyTypeName: PlayVRUIManager, Assembly-CSharp |
|
69912 | 69412 |
m_MethodName: SetVRAnimPlay |
69913 | 69413 |
m_Mode: 5 |
69914 | 69414 |
m_Arguments: |
... | ... | @@ -69916,7 +69416,7 @@ |
69916 | 69416 |
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine |
69917 | 69417 |
m_IntArgument: 0 |
69918 | 69418 |
m_FloatArgument: 0 |
69919 |
- m_StringArgument: Evaluation |
|
69419 |
+ m_StringArgument: AIJudge |
|
69920 | 69420 |
m_BoolArgument: 0 |
69921 | 69421 |
m_CallState: 2 |
69922 | 69422 |
--- !u!1 &8798359815218270732 |
... | ... | @@ -75030,18 +74530,6 @@ |
75030 | 74530 |
m_AddedGameObjects: [] |
75031 | 74531 |
m_AddedComponents: [] |
75032 | 74532 |
m_SourcePrefab: {fileID: 100100000, guid: e21648063d624cc4f92e4c2f3e7ab222, type: 3} |
75033 |
---- !u!114 &5235217658021458059 stripped |
|
75034 |
-MonoBehaviour: |
|
75035 |
- m_CorrespondingSourceObject: {fileID: 7734070126319620258, guid: e21648063d624cc4f92e4c2f3e7ab222, |
|
75036 |
- type: 3} |
|
75037 |
- m_PrefabInstance: {fileID: 2590648911018680361} |
|
75038 |
- m_PrefabAsset: {fileID: 0} |
|
75039 |
- m_GameObject: {fileID: 0} |
|
75040 |
- m_Enabled: 0 |
|
75041 |
- m_EditorHideFlags: 0 |
|
75042 |
- m_Script: {fileID: 11500000, guid: 6f27b1349f3492c4796b9cc88fc38d41, type: 3} |
|
75043 |
- m_Name: |
|
75044 |
- m_EditorClassIdentifier: |
|
75045 | 74533 |
--- !u!224 &6199545176439902351 stripped |
75046 | 74534 |
RectTransform: |
75047 | 74535 |
m_CorrespondingSourceObject: {fileID: 8501353574359019686, guid: e21648063d624cc4f92e4c2f3e7ab222, |
... | ... | @@ -75600,11 +75088,6 @@ |
75600 | 75088 |
serializedVersion: 3 |
75601 | 75089 |
m_TransformParent: {fileID: 6197702163516169505} |
75602 | 75090 |
m_Modifications: |
75603 |
- - target: {fileID: 1597595697967922387, guid: 0cfc92233c4b986459613e5602a3862c, |
|
75604 |
- type: 3} |
|
75605 |
- propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target |
|
75606 |
- value: |
|
75607 |
- objectReference: {fileID: 1336578072685318121} |
|
75608 | 75091 |
- target: {fileID: 3059809388255471161, guid: 0cfc92233c4b986459613e5602a3862c, |
75609 | 75092 |
type: 3} |
75610 | 75093 |
propertyPath: m_Pivot.x |
... | ... | @@ -75715,11 +75198,6 @@ |
75715 | 75198 |
propertyPath: m_IsActive |
75716 | 75199 |
value: 0 |
75717 | 75200 |
objectReference: {fileID: 0} |
75718 |
- - target: {fileID: 8769216382389145891, guid: 0cfc92233c4b986459613e5602a3862c, |
|
75719 |
- type: 3} |
|
75720 |
- propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target |
|
75721 |
- value: |
|
75722 |
- objectReference: {fileID: 1336578072685318121} |
|
75723 | 75201 |
m_RemovedComponents: [] |
75724 | 75202 |
m_RemovedGameObjects: [] |
75725 | 75203 |
m_AddedGameObjects: [] |
... | ... | @@ -75906,7 +75384,7 @@ |
75906 | 75384 |
- target: {fileID: 1223463166084774675, guid: 131b2a17860f9d543ab488c9500c4d1e, |
75907 | 75385 |
type: 3} |
75908 | 75386 |
propertyPath: m_Enabled |
75909 |
- value: 0 |
|
75387 |
+ value: 1 |
|
75910 | 75388 |
objectReference: {fileID: 0} |
75911 | 75389 |
- target: {fileID: 1286603951155642656, guid: 131b2a17860f9d543ab488c9500c4d1e, |
75912 | 75390 |
type: 3} |
... | ... | @@ -76313,6 +75791,11 @@ |
76313 | 75791 |
propertyPath: m_Name |
76314 | 75792 |
value: Result |
76315 | 75793 |
objectReference: {fileID: 0} |
75794 |
+ - target: {fileID: 6306900555965340622, guid: 131b2a17860f9d543ab488c9500c4d1e, |
|
75795 |
+ type: 3} |
|
75796 |
+ propertyPath: m_IsActive |
|
75797 |
+ value: 1 |
|
75798 |
+ objectReference: {fileID: 0} |
|
76316 | 75799 |
- target: {fileID: 6420709919626506456, guid: 131b2a17860f9d543ab488c9500c4d1e, |
76317 | 75800 |
type: 3} |
76318 | 75801 |
propertyPath: m_AnchorMax.y |
... | ... | @@ -76434,18 +75917,6 @@ |
76434 | 75917 |
type: 3} |
76435 | 75918 |
m_PrefabInstance: {fileID: 7374293082236971603} |
76436 | 75919 |
m_PrefabAsset: {fileID: 0} |
76437 |
---- !u!114 &8551312290356072768 stripped |
|
76438 |
-MonoBehaviour: |
|
76439 |
- m_CorrespondingSourceObject: {fileID: 1223463166084774675, guid: 131b2a17860f9d543ab488c9500c4d1e, |
|
76440 |
- type: 3} |
|
76441 |
- m_PrefabInstance: {fileID: 7374293082236971603} |
|
76442 |
- m_PrefabAsset: {fileID: 0} |
|
76443 |
- m_GameObject: {fileID: 0} |
|
76444 |
- m_Enabled: 0 |
|
76445 |
- m_EditorHideFlags: 0 |
|
76446 |
- m_Script: {fileID: 11500000, guid: 7999730a4df19354c8ec56dbc0bdaa50, type: 3} |
|
76447 |
- m_Name: |
|
76448 |
- m_EditorClassIdentifier: |
|
76449 | 75920 |
--- !u!1001 &8284002424679263976 |
76450 | 75921 |
PrefabInstance: |
76451 | 75922 |
m_ObjectHideFlags: 0 |
... | ... | @@ -76574,12 +76045,6 @@ |
76574 | 76045 |
m_AddedGameObjects: [] |
76575 | 76046 |
m_AddedComponents: [] |
76576 | 76047 |
m_SourcePrefab: {fileID: 100100000, guid: 2e994b6e842a76447b142d82b6c6eefc, type: 3} |
76577 |
---- !u!1 &7555817891792917584 stripped |
|
76578 |
-GameObject: |
|
76579 |
- m_CorrespondingSourceObject: {fileID: 1886190239473531576, guid: 2e994b6e842a76447b142d82b6c6eefc, |
|
76580 |
- type: 3} |
|
76581 |
- m_PrefabInstance: {fileID: 8284002424679263976} |
|
76582 |
- m_PrefabAsset: {fileID: 0} |
|
76583 | 76048 |
--- !u!224 &7822145818673450381 stripped |
76584 | 76049 |
RectTransform: |
76585 | 76050 |
m_CorrespondingSourceObject: {fileID: 2196464129993991013, guid: 2e994b6e842a76447b142d82b6c6eefc, |
--- VRTK/Assets/VRRes/VRUI/Basic/Result.prefab
+++ VRTK/Assets/VRRes/VRUI/Basic/Result.prefab
... | ... | @@ -775,7 +775,7 @@ |
775 | 775 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
776 | 776 |
m_AnchorMin: {x: 0, y: 1} |
777 | 777 |
m_AnchorMax: {x: 0, y: 1} |
778 |
- m_AnchoredPosition: {x: 76, y: -29.5} |
|
778 |
+ m_AnchoredPosition: {x: 524.5, y: -89} |
|
779 | 779 |
m_SizeDelta: {x: 150, y: 8} |
780 | 780 |
m_Pivot: {x: 0.5, y: 0.5} |
781 | 781 |
--- !u!1 &1150820697446722527 |
... | ... | @@ -793,7 +793,7 @@ |
793 | 793 |
m_Icon: {fileID: 0} |
794 | 794 |
m_NavMeshLayer: 0 |
795 | 795 |
m_StaticEditorFlags: 0 |
796 |
- m_IsActive: 0 |
|
796 |
+ m_IsActive: 1 |
|
797 | 797 |
--- !u!224 &1236050295398920609 |
798 | 798 |
RectTransform: |
799 | 799 |
m_ObjectHideFlags: 0 |
... | ... | @@ -853,7 +853,7 @@ |
853 | 853 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
854 | 854 |
m_AnchorMin: {x: 0, y: 1} |
855 | 855 |
m_AnchorMax: {x: 0, y: 1} |
856 |
- m_AnchoredPosition: {x: 190, y: -10} |
|
856 |
+ m_AnchoredPosition: {x: 638.5, y: -10} |
|
857 | 857 |
m_SizeDelta: {x: 50, y: 20} |
858 | 858 |
m_Pivot: {x: 0.5, y: 0.5} |
859 | 859 |
--- !u!222 &1395655853628708285 |
... | ... | @@ -1122,7 +1122,7 @@ |
1122 | 1122 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1123 | 1123 |
m_AnchorMin: {x: 0, y: 1} |
1124 | 1124 |
m_AnchorMax: {x: 0, y: 1} |
1125 |
- m_AnchoredPosition: {x: 38.5, y: -10} |
|
1125 |
+ m_AnchoredPosition: {x: 487, y: -10} |
|
1126 | 1126 |
m_SizeDelta: {x: 70, y: 16} |
1127 | 1127 |
m_Pivot: {x: 0.5, y: 0.5} |
1128 | 1128 |
--- !u!114 &7700342267384721900 |
... | ... | @@ -1185,7 +1185,7 @@ |
1185 | 1185 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1186 | 1186 |
m_AnchorMin: {x: 0, y: 1} |
1187 | 1187 |
m_AnchorMax: {x: 0, y: 1} |
1188 |
- m_AnchoredPosition: {x: 76, y: -65.5} |
|
1188 |
+ m_AnchoredPosition: {x: 524.5, y: -125} |
|
1189 | 1189 |
m_SizeDelta: {x: 150, y: 8} |
1190 | 1190 |
m_Pivot: {x: 0.5, y: 0.5} |
1191 | 1191 |
--- !u!1 &2302732008868862653 |
... | ... | @@ -1839,7 +1839,7 @@ |
1839 | 1839 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
1840 | 1840 |
m_AnchorMin: {x: 0, y: 1} |
1841 | 1841 |
m_AnchorMax: {x: 0, y: 1} |
1842 |
- m_AnchoredPosition: {x: 76, y: -41.5} |
|
1842 |
+ m_AnchoredPosition: {x: 524.5, y: -101} |
|
1843 | 1843 |
m_SizeDelta: {x: 150, y: 8} |
1844 | 1844 |
m_Pivot: {x: 0.5, y: 0.5} |
1845 | 1845 |
--- !u!1 &3412362509385852820 |
... | ... | @@ -2481,7 +2481,7 @@ |
2481 | 2481 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
2482 | 2482 |
m_AnchorMin: {x: 0, y: 1} |
2483 | 2483 |
m_AnchorMax: {x: 0, y: 1} |
2484 |
- m_AnchoredPosition: {x: 76, y: -21} |
|
2484 |
+ m_AnchoredPosition: {x: 524.5, y: -80.5} |
|
2485 | 2485 |
m_SizeDelta: {x: 130, y: 1} |
2486 | 2486 |
m_Pivot: {x: 0.5, y: 0.5} |
2487 | 2487 |
--- !u!222 &7963095806061892301 |
... | ... | @@ -2827,7 +2827,7 @@ |
2827 | 2827 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
2828 | 2828 |
m_AnchorMin: {x: 0, y: 1} |
2829 | 2829 |
m_AnchorMax: {x: 0, y: 1} |
2830 |
- m_AnchoredPosition: {x: 76, y: -77.5} |
|
2830 |
+ m_AnchoredPosition: {x: 524.5, y: -137} |
|
2831 | 2831 |
m_SizeDelta: {x: 150, y: 8} |
2832 | 2832 |
m_Pivot: {x: 0.5, y: 0.5} |
2833 | 2833 |
--- !u!1 &4645700716138285744 |
... | ... | @@ -3002,7 +3002,7 @@ |
3002 | 3002 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
3003 | 3003 |
m_AnchorMin: {x: 0, y: 1} |
3004 | 3004 |
m_AnchorMax: {x: 0, y: 1} |
3005 |
- m_AnchoredPosition: {x: 82, y: -10} |
|
3005 |
+ m_AnchoredPosition: {x: 530.5, y: -10} |
|
3006 | 3006 |
m_SizeDelta: {x: 50, y: 20} |
3007 | 3007 |
m_Pivot: {x: 0.5, y: 0.5} |
3008 | 3008 |
--- !u!222 &4470532369124791013 |
... | ... | @@ -3357,7 +3357,7 @@ |
3357 | 3357 |
m_Icon: {fileID: 0} |
3358 | 3358 |
m_NavMeshLayer: 0 |
3359 | 3359 |
m_StaticEditorFlags: 0 |
3360 |
- m_IsActive: 1 |
|
3360 |
+ m_IsActive: 0 |
|
3361 | 3361 |
--- !u!224 &2561920016242020315 |
3362 | 3362 |
RectTransform: |
3363 | 3363 |
m_ObjectHideFlags: 0 |
... | ... | @@ -3581,7 +3581,7 @@ |
3581 | 3581 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
3582 | 3582 |
m_AnchorMin: {x: 0, y: 1} |
3583 | 3583 |
m_AnchorMax: {x: 0, y: 1} |
3584 |
- m_AnchoredPosition: {x: 76, y: -53.5} |
|
3584 |
+ m_AnchoredPosition: {x: 524.5, y: -113} |
|
3585 | 3585 |
m_SizeDelta: {x: 150, y: 8} |
3586 | 3586 |
m_Pivot: {x: 0.5, y: 0.5} |
3587 | 3587 |
--- !u!1 &7600424977908593800 |
... | ... | @@ -3889,7 +3889,7 @@ |
3889 | 3889 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
3890 | 3890 |
m_AnchorMin: {x: 0, y: 1} |
3891 | 3891 |
m_AnchorMax: {x: 0, y: 1} |
3892 |
- m_AnchoredPosition: {x: 113.5, y: -10} |
|
3892 |
+ m_AnchoredPosition: {x: 562, y: -10} |
|
3893 | 3893 |
m_SizeDelta: {x: 70, y: 16} |
3894 | 3894 |
m_Pivot: {x: 0.5, y: 0.5} |
3895 | 3895 |
--- !u!114 &2666120305675767611 |
... | ... | @@ -3952,7 +3952,7 @@ |
3952 | 3952 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
3953 | 3953 |
m_AnchorMin: {x: 0, y: 1} |
3954 | 3954 |
m_AnchorMax: {x: 0, y: 1} |
3955 |
- m_AnchoredPosition: {x: 76, y: -11.5} |
|
3955 |
+ m_AnchoredPosition: {x: 524.5, y: -71} |
|
3956 | 3956 |
m_SizeDelta: {x: 150, y: 10} |
3957 | 3957 |
m_Pivot: {x: 0.5, y: 0.5} |
3958 | 3958 |
--- !u!222 &1985629721377494059 |
... | ... | @@ -4090,7 +4090,7 @@ |
4090 | 4090 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
4091 | 4091 |
m_AnchorMin: {x: 0, y: 1} |
4092 | 4092 |
m_AnchorMax: {x: 0, y: 1} |
4093 |
- m_AnchoredPosition: {x: 136, y: -10} |
|
4093 |
+ m_AnchoredPosition: {x: 584.5, y: -10} |
|
4094 | 4094 |
m_SizeDelta: {x: 50, y: 20} |
4095 | 4095 |
m_Pivot: {x: 0.5, y: 0.5} |
4096 | 4096 |
--- !u!222 &9194498975477085914 |
... | ... | @@ -4223,7 +4223,7 @@ |
4223 | 4223 |
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} |
4224 | 4224 |
m_AnchorMin: {x: 0, y: 1} |
4225 | 4225 |
m_AnchorMax: {x: 0, y: 1} |
4226 |
- m_AnchoredPosition: {x: 76, y: -89.5} |
|
4226 |
+ m_AnchoredPosition: {x: 524.5, y: -149} |
|
4227 | 4227 |
m_SizeDelta: {x: 150, y: 8} |
4228 | 4228 |
m_Pivot: {x: 0.5, y: 0.5} |
4229 | 4229 |
--- !u!1001 &3582750783442711329 |
--- VRTK/Assets/VRRes/VR_Lobby/Tk_Gym.prefab
+++ VRTK/Assets/VRRes/VR_Lobby/tkgym.prefab
... | ... | @@ -355,7 +355,7 @@ |
355 | 355 |
- component: {fileID: 3734065279684019805} |
356 | 356 |
- component: {fileID: 1359853379741081847} |
357 | 357 |
m_Layer: 15 |
358 |
- m_Name: tk_gym |
|
358 |
+ m_Name: tkgym |
|
359 | 359 |
m_TagString: Untagged |
360 | 360 |
m_Icon: {fileID: 0} |
361 | 361 |
m_NavMeshLayer: 0 |
--- VRTK/Assets/VRRes/VR_Lobby/Tk_Gym.prefab.meta
+++ VRTK/Assets/VRRes/VR_Lobby/tkgym.prefab.meta
No changes |
--- VRTK/ProjectSettings/EditorBuildSettings.asset
+++ VRTK/ProjectSettings/EditorBuildSettings.asset
... | ... | @@ -5,13 +5,13 @@ |
5 | 5 |
m_ObjectHideFlags: 0 |
6 | 6 |
serializedVersion: 2 |
7 | 7 |
m_Scenes: |
8 |
- - enabled: 0 |
|
8 |
+ - enabled: 1 |
|
9 | 9 |
path: Assets/00.MAINSTREAM/Scenes/InitScene.unity |
10 | 10 |
guid: 5f4f9138efe79d1448dc037a021875be |
11 |
- - enabled: 0 |
|
11 |
+ - enabled: 1 |
|
12 | 12 |
path: Assets/00.MAINSTREAM/Scenes/PlayScene.unity |
13 | 13 |
guid: 14ff1613d7e77bb4baa1d0c0a984254f |
14 |
- - enabled: 1 |
|
14 |
+ - enabled: 0 |
|
15 | 15 |
path: Assets/01.Junil/Scenes/00.ModelIkTest.unity |
16 | 16 |
guid: dbe716d95baf0b1479d449c3ff9538fc |
17 | 17 |
- enabled: 0 |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?