Skip to content

Commit a2ceabe

Browse files
committed
NPCs examples accessories hierarchy order fixed
1 parent 1fadd17 commit a2ceabe

File tree

5 files changed

+205
-64
lines changed

5 files changed

+205
-64
lines changed

UOP1_Project/Assets/Prefabs/Characters/NPCs_Examples/Andre.prefab

Lines changed: 31 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@ PrefabInstance:
77
m_Modification:
88
m_TransformParent: {fileID: 0}
99
m_Modifications:
10+
- target: {fileID: 1132113797398714843, guid: 661c491ac76af4b429f8a8c0e6e8c762,
11+
type: 3}
12+
propertyPath: m_Lens.m_SensorSize.x
13+
value: 2.0060868
14+
objectReference: {fileID: 0}
1015
- target: {fileID: 3798993931151915321, guid: 661c491ac76af4b429f8a8c0e6e8c762,
1116
type: 3}
1217
propertyPath: m_Materials.Array.data[0]
@@ -17,6 +22,21 @@ PrefabInstance:
1722
propertyPath: m_Name
1823
value: Andre
1924
objectReference: {fileID: 0}
25+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
26+
type: 3}
27+
propertyPath: m_LocalPosition.x
28+
value: -0.00000047683716
29+
objectReference: {fileID: 0}
30+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
31+
type: 3}
32+
propertyPath: m_LocalRotation.y
33+
value: -0
34+
objectReference: {fileID: 0}
35+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
36+
type: 3}
37+
propertyPath: m_LocalRotation.z
38+
value: -0
39+
objectReference: {fileID: 0}
2040
- target: {fileID: 5579597578339563075, guid: 661c491ac76af4b429f8a8c0e6e8c762,
2141
type: 3}
2242
propertyPath: m_RootOrder
@@ -74,9 +94,9 @@ PrefabInstance:
7494
objectReference: {fileID: 0}
7595
m_RemovedComponents: []
7696
m_SourcePrefab: {fileID: 100100000, guid: 661c491ac76af4b429f8a8c0e6e8c762, type: 3}
77-
--- !u!4 &8683841676502515016 stripped
97+
--- !u!4 &2905015166066834466 stripped
7898
Transform:
79-
m_CorrespondingSourceObject: {fileID: 5579597578339563075, guid: 661c491ac76af4b429f8a8c0e6e8c762,
99+
m_CorrespondingSourceObject: {fileID: 2142915689959929641, guid: 661c491ac76af4b429f8a8c0e6e8c762,
80100
type: 3}
81101
m_PrefabInstance: {fileID: 3885908913776036619}
82102
m_PrefabAsset: {fileID: 0}
@@ -85,47 +105,47 @@ PrefabInstance:
85105
m_ObjectHideFlags: 0
86106
serializedVersion: 2
87107
m_Modification:
88-
m_TransformParent: {fileID: 8683841676502515016}
108+
m_TransformParent: {fileID: 2905015166066834466}
89109
m_Modifications:
90110
- target: {fileID: 3499421249221997169, guid: c87f5ac2d2b1bee43a1afec712ca6de5,
91111
type: 3}
92112
propertyPath: m_RootOrder
93-
value: 3
113+
value: 11
94114
objectReference: {fileID: 0}
95115
- target: {fileID: 3499421249221997169, guid: c87f5ac2d2b1bee43a1afec712ca6de5,
96116
type: 3}
97117
propertyPath: m_LocalPosition.x
98-
value: -0.033
118+
value: -0.39028567
99119
objectReference: {fileID: 0}
100120
- target: {fileID: 3499421249221997169, guid: c87f5ac2d2b1bee43a1afec712ca6de5,
101121
type: 3}
102122
propertyPath: m_LocalPosition.y
103-
value: 1.157
123+
value: 0.043077692
104124
objectReference: {fileID: 0}
105125
- target: {fileID: 3499421249221997169, guid: c87f5ac2d2b1bee43a1afec712ca6de5,
106126
type: 3}
107127
propertyPath: m_LocalPosition.z
108-
value: -0.109
128+
value: -0.019205093
109129
objectReference: {fileID: 0}
110130
- target: {fileID: 3499421249221997169, guid: c87f5ac2d2b1bee43a1afec712ca6de5,
111131
type: 3}
112132
propertyPath: m_LocalRotation.w
113-
value: 0.9996161
133+
value: 0.55560684
114134
objectReference: {fileID: 0}
115135
- target: {fileID: 3499421249221997169, guid: c87f5ac2d2b1bee43a1afec712ca6de5,
116136
type: 3}
117137
propertyPath: m_LocalRotation.x
118-
value: -0.001532418
138+
value: -0.44309986
119139
objectReference: {fileID: 0}
120140
- target: {fileID: 3499421249221997169, guid: c87f5ac2d2b1bee43a1afec712ca6de5,
121141
type: 3}
122142
propertyPath: m_LocalRotation.y
123-
value: 0.0019827655
143+
value: 0.557148
124144
objectReference: {fileID: 0}
125145
- target: {fileID: 3499421249221997169, guid: c87f5ac2d2b1bee43a1afec712ca6de5,
126146
type: 3}
127147
propertyPath: m_LocalRotation.z
128-
value: 0.027593512
148+
value: 0.4295925
129149
objectReference: {fileID: 0}
130150
- target: {fileID: 3499421249221997169, guid: c87f5ac2d2b1bee43a1afec712ca6de5,
131151
type: 3}

UOP1_Project/Assets/Prefabs/Characters/NPCs_Examples/Andy.prefab

Lines changed: 36 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -5,47 +5,47 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8-
m_TransformParent: {fileID: 8683841676502515016}
8+
m_TransformParent: {fileID: 2905015166066834466}
99
m_Modifications:
1010
- target: {fileID: 5865663965110154554, guid: a4e01f93ed10f7a4a8fb1e904b41e1dd,
1111
type: 3}
1212
propertyPath: m_RootOrder
13-
value: 3
13+
value: 11
1414
objectReference: {fileID: 0}
1515
- target: {fileID: 5865663965110154554, guid: a4e01f93ed10f7a4a8fb1e904b41e1dd,
1616
type: 3}
1717
propertyPath: m_LocalPosition.x
18-
value: 0
18+
value: -0.3117201
1919
objectReference: {fileID: 0}
2020
- target: {fileID: 5865663965110154554, guid: a4e01f93ed10f7a4a8fb1e904b41e1dd,
2121
type: 3}
2222
propertyPath: m_LocalPosition.y
23-
value: 1.096
23+
value: 0.09745701
2424
objectReference: {fileID: 0}
2525
- target: {fileID: 5865663965110154554, guid: a4e01f93ed10f7a4a8fb1e904b41e1dd,
2626
type: 3}
2727
propertyPath: m_LocalPosition.z
28-
value: -0.037
28+
value: -0.04860268
2929
objectReference: {fileID: 0}
3030
- target: {fileID: 5865663965110154554, guid: a4e01f93ed10f7a4a8fb1e904b41e1dd,
3131
type: 3}
3232
propertyPath: m_LocalRotation.w
33-
value: 0.9992678
33+
value: 0.550575
3434
objectReference: {fileID: 0}
3535
- target: {fileID: 5865663965110154554, guid: a4e01f93ed10f7a4a8fb1e904b41e1dd,
3636
type: 3}
3737
propertyPath: m_LocalRotation.x
38-
value: 0.004971432
38+
value: -0.43729383
3939
objectReference: {fileID: 0}
4040
- target: {fileID: 5865663965110154554, guid: a4e01f93ed10f7a4a8fb1e904b41e1dd,
4141
type: 3}
4242
propertyPath: m_LocalRotation.y
43-
value: 0.009340161
43+
value: 0.5680272
4444
objectReference: {fileID: 0}
4545
- target: {fileID: 5865663965110154554, guid: a4e01f93ed10f7a4a8fb1e904b41e1dd,
4646
type: 3}
4747
propertyPath: m_LocalRotation.z
48-
value: 0.036767285
48+
value: 0.42776915
4949
objectReference: {fileID: 0}
5050
- target: {fileID: 5865663965110154554, guid: a4e01f93ed10f7a4a8fb1e904b41e1dd,
5151
type: 3}
@@ -76,6 +76,11 @@ PrefabInstance:
7676
m_Modification:
7777
m_TransformParent: {fileID: 0}
7878
m_Modifications:
79+
- target: {fileID: 1132113797398714843, guid: 661c491ac76af4b429f8a8c0e6e8c762,
80+
type: 3}
81+
propertyPath: m_Lens.m_SensorSize.x
82+
value: 2.0060868
83+
objectReference: {fileID: 0}
7984
- target: {fileID: 3798993931151915321, guid: 661c491ac76af4b429f8a8c0e6e8c762,
8085
type: 3}
8186
propertyPath: m_Materials.Array.data[0]
@@ -86,6 +91,26 @@ PrefabInstance:
8691
propertyPath: m_Name
8792
value: Andy
8893
objectReference: {fileID: 0}
94+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
95+
type: 3}
96+
propertyPath: m_LocalPosition.x
97+
value: 0.00000047683716
98+
objectReference: {fileID: 0}
99+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
100+
type: 3}
101+
propertyPath: m_LocalPosition.z
102+
value: -10.000002
103+
objectReference: {fileID: 0}
104+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
105+
type: 3}
106+
propertyPath: m_LocalRotation.y
107+
value: -0.000000029802322
108+
objectReference: {fileID: 0}
109+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
110+
type: 3}
111+
propertyPath: m_LocalRotation.z
112+
value: -0.0000000018626451
113+
objectReference: {fileID: 0}
89114
- target: {fileID: 5579597578339563075, guid: 661c491ac76af4b429f8a8c0e6e8c762,
90115
type: 3}
91116
propertyPath: m_RootOrder
@@ -143,9 +168,9 @@ PrefabInstance:
143168
objectReference: {fileID: 0}
144169
m_RemovedComponents: []
145170
m_SourcePrefab: {fileID: 100100000, guid: 661c491ac76af4b429f8a8c0e6e8c762, type: 3}
146-
--- !u!4 &8683841676502515016 stripped
171+
--- !u!4 &2905015166066834466 stripped
147172
Transform:
148-
m_CorrespondingSourceObject: {fileID: 5579597578339563075, guid: 661c491ac76af4b429f8a8c0e6e8c762,
173+
m_CorrespondingSourceObject: {fileID: 2142915689959929641, guid: 661c491ac76af4b429f8a8c0e6e8c762,
149174
type: 3}
150175
m_PrefabInstance: {fileID: 3885908913776036619}
151176
m_PrefabAsset: {fileID: 0}

UOP1_Project/Assets/Prefabs/Characters/NPCs_Examples/Bronson.prefab

Lines changed: 56 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8-
m_TransformParent: {fileID: 8683841676502515016}
8+
m_TransformParent: {fileID: 7968907681957608140}
99
m_Modifications:
1010
- target: {fileID: 481795119017274549, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
1111
type: 3}
@@ -15,42 +15,42 @@ PrefabInstance:
1515
- target: {fileID: 5824075200685872879, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
1616
type: 3}
1717
propertyPath: m_RootOrder
18-
value: 3
18+
value: 0
1919
objectReference: {fileID: 0}
2020
- target: {fileID: 5824075200685872879, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
2121
type: 3}
2222
propertyPath: m_LocalPosition.x
23-
value: -0.066
23+
value: -0.060971748
2424
objectReference: {fileID: 0}
2525
- target: {fileID: 5824075200685872879, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
2626
type: 3}
2727
propertyPath: m_LocalPosition.y
28-
value: 1.004
28+
value: -0.0221515
2929
objectReference: {fileID: 0}
3030
- target: {fileID: 5824075200685872879, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
3131
type: 3}
3232
propertyPath: m_LocalPosition.z
33-
value: -0.005
33+
value: -0.08893016
3434
objectReference: {fileID: 0}
3535
- target: {fileID: 5824075200685872879, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
3636
type: 3}
3737
propertyPath: m_LocalRotation.w
38-
value: 0.99779814
38+
value: 0.7124702
3939
objectReference: {fileID: 0}
4040
- target: {fileID: 5824075200685872879, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
4141
type: 3}
4242
propertyPath: m_LocalRotation.x
43-
value: -0.061046407
43+
value: 0.018969445
4444
objectReference: {fileID: 0}
4545
- target: {fileID: 5824075200685872879, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
4646
type: 3}
4747
propertyPath: m_LocalRotation.y
48-
value: 0.0015832892
48+
value: 0.031686626
4949
objectReference: {fileID: 0}
5050
- target: {fileID: 5824075200685872879, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
5151
type: 3}
5252
propertyPath: m_LocalRotation.z
53-
value: 0.02587873
53+
value: 0.70072997
5454
objectReference: {fileID: 0}
5555
- target: {fileID: 5824075200685872879, guid: a7e7d9ab73933404e9fcf58a8bb6252d,
5656
type: 3}
@@ -74,7 +74,7 @@ PrefabInstance:
7474
m_ObjectHideFlags: 0
7575
serializedVersion: 2
7676
m_Modification:
77-
m_TransformParent: {fileID: 8683841676502515016}
77+
m_TransformParent: {fileID: 8164501186879128678}
7878
m_Modifications:
7979
- target: {fileID: 2637199739912340168, guid: e1393750177a5284799d90c5f1c7b4b2,
8080
type: 3}
@@ -84,42 +84,42 @@ PrefabInstance:
8484
- target: {fileID: 3446071324131858546, guid: e1393750177a5284799d90c5f1c7b4b2,
8585
type: 3}
8686
propertyPath: m_RootOrder
87-
value: 4
87+
value: 1
8888
objectReference: {fileID: 0}
8989
- target: {fileID: 3446071324131858546, guid: e1393750177a5284799d90c5f1c7b4b2,
9090
type: 3}
9191
propertyPath: m_LocalPosition.x
92-
value: -0.012
92+
value: 0.115351886
9393
objectReference: {fileID: 0}
9494
- target: {fileID: 3446071324131858546, guid: e1393750177a5284799d90c5f1c7b4b2,
9595
type: 3}
9696
propertyPath: m_LocalPosition.y
97-
value: 0.342
97+
value: -0.1653497
9898
objectReference: {fileID: 0}
9999
- target: {fileID: 3446071324131858546, guid: e1393750177a5284799d90c5f1c7b4b2,
100100
type: 3}
101101
propertyPath: m_LocalPosition.z
102-
value: 0.003
102+
value: 0.012304366
103103
objectReference: {fileID: 0}
104104
- target: {fileID: 3446071324131858546, guid: e1393750177a5284799d90c5f1c7b4b2,
105105
type: 3}
106106
propertyPath: m_LocalRotation.w
107-
value: 0.9987254
107+
value: 0.72188103
108108
objectReference: {fileID: 0}
109109
- target: {fileID: 3446071324131858546, guid: e1393750177a5284799d90c5f1c7b4b2,
110110
type: 3}
111111
propertyPath: m_LocalRotation.x
112-
value: -0
112+
value: -0.43388772
113113
objectReference: {fileID: 0}
114114
- target: {fileID: 3446071324131858546, guid: e1393750177a5284799d90c5f1c7b4b2,
115115
type: 3}
116116
propertyPath: m_LocalRotation.y
117-
value: -0
117+
value: -0.3840539
118118
objectReference: {fileID: 0}
119119
- target: {fileID: 3446071324131858546, guid: e1393750177a5284799d90c5f1c7b4b2,
120120
type: 3}
121121
propertyPath: m_LocalRotation.z
122-
value: 0.050473876
122+
value: -0.3783278
123123
objectReference: {fileID: 0}
124124
- target: {fileID: 3446071324131858546, guid: e1393750177a5284799d90c5f1c7b4b2,
125125
type: 3}
@@ -145,6 +145,11 @@ PrefabInstance:
145145
m_Modification:
146146
m_TransformParent: {fileID: 0}
147147
m_Modifications:
148+
- target: {fileID: 1132113797398714843, guid: 661c491ac76af4b429f8a8c0e6e8c762,
149+
type: 3}
150+
propertyPath: m_Lens.m_SensorSize.x
151+
value: 1.8599998
152+
objectReference: {fileID: 0}
148153
- target: {fileID: 3798993931151915321, guid: 661c491ac76af4b429f8a8c0e6e8c762,
149154
type: 3}
150155
propertyPath: m_Materials.Array.data[0]
@@ -155,6 +160,31 @@ PrefabInstance:
155160
propertyPath: m_Name
156161
value: Bronson
157162
objectReference: {fileID: 0}
163+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
164+
type: 3}
165+
propertyPath: m_LocalPosition.x
166+
value: 0.00000047683716
167+
objectReference: {fileID: 0}
168+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
169+
type: 3}
170+
propertyPath: m_LocalPosition.z
171+
value: -10.000003
172+
objectReference: {fileID: 0}
173+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
174+
type: 3}
175+
propertyPath: m_LocalRotation.x
176+
value: -0.046576764
177+
objectReference: {fileID: 0}
178+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
179+
type: 3}
180+
propertyPath: m_LocalRotation.y
181+
value: -0.000000029802322
182+
objectReference: {fileID: 0}
183+
- target: {fileID: 5385405162533204186, guid: 661c491ac76af4b429f8a8c0e6e8c762,
184+
type: 3}
185+
propertyPath: m_LocalRotation.z
186+
value: -0.0000000013969839
187+
objectReference: {fileID: 0}
158188
- target: {fileID: 5579597578339563075, guid: 661c491ac76af4b429f8a8c0e6e8c762,
159189
type: 3}
160190
propertyPath: m_RootOrder
@@ -212,9 +242,15 @@ PrefabInstance:
212242
objectReference: {fileID: 0}
213243
m_RemovedComponents: []
214244
m_SourcePrefab: {fileID: 100100000, guid: 661c491ac76af4b429f8a8c0e6e8c762, type: 3}
215-
--- !u!4 &8683841676502515016 stripped
245+
--- !u!4 &8164501186879128678 stripped
246+
Transform:
247+
m_CorrespondingSourceObject: {fileID: 4945980450985906029, guid: 661c491ac76af4b429f8a8c0e6e8c762,
248+
type: 3}
249+
m_PrefabInstance: {fileID: 3885908913776036619}
250+
m_PrefabAsset: {fileID: 0}
251+
--- !u!4 &7968907681957608140 stripped
216252
Transform:
217-
m_CorrespondingSourceObject: {fileID: 5579597578339563075, guid: 661c491ac76af4b429f8a8c0e6e8c762,
253+
m_CorrespondingSourceObject: {fileID: 6591786344275767751, guid: 661c491ac76af4b429f8a8c0e6e8c762,
218254
type: 3}
219255
m_PrefabInstance: {fileID: 3885908913776036619}
220256
m_PrefabAsset: {fileID: 0}

0 commit comments

Comments
 (0)