Skip to content

Commit 6a5c31d

Browse files
uChemauChema
committed
Integrating Cutscenes and Questlines in final scenes
1 parent d865ded commit 6a5c31d

File tree

11 files changed

+1189
-503
lines changed

11 files changed

+1189
-503
lines changed

‎UOP1_Project/Assets/Prefabs/Droppable/Collectable_GoldenEgg.prefab

Lines changed: 26 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -81,92 +81,87 @@ Transform:
8181
type: 3}
8282
m_PrefabInstance: {fileID: 3188807241090914430}
8383
m_PrefabAsset: {fileID: 0}
84-
--- !u!1001 &4659187227949348480
84+
--- !u!1001 &7631477949038211733
8585
PrefabInstance:
8686
m_ObjectHideFlags: 0
8787
serializedVersion: 2
8888
m_Modification:
8989
m_TransformParent: {fileID: 4778863221402171844}
9090
m_Modifications:
91-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
91+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
9292
type: 3}
9393
propertyPath: m_RootOrder
9494
value: 0
9595
objectReference: {fileID: 0}
96-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
96+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
9797
type: 3}
9898
propertyPath: m_LocalScale.x
99-
value: 5.020923
99+
value: 1.2583
100100
objectReference: {fileID: 0}
101-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
101+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
102102
type: 3}
103103
propertyPath: m_LocalScale.y
104-
value: 5.020923
104+
value: 1.2583
105105
objectReference: {fileID: 0}
106-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
106+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
107107
type: 3}
108108
propertyPath: m_LocalScale.z
109-
value: 5.020923
109+
value: 1.2583
110110
objectReference: {fileID: 0}
111-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
111+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
112112
type: 3}
113113
propertyPath: m_LocalPosition.x
114-
value: 0
114+
value: 0.0025351
115115
objectReference: {fileID: 0}
116-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
116+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
117117
type: 3}
118118
propertyPath: m_LocalPosition.y
119-
value: 0.1533
119+
value: -0.030774
120120
objectReference: {fileID: 0}
121-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
121+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
122122
type: 3}
123123
propertyPath: m_LocalPosition.z
124-
value: 0.0001
124+
value: 0.00071667
125125
objectReference: {fileID: 0}
126-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
126+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
127127
type: 3}
128128
propertyPath: m_LocalRotation.w
129129
value: 1
130130
objectReference: {fileID: 0}
131-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
131+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
132132
type: 3}
133133
propertyPath: m_LocalRotation.x
134134
value: 0
135135
objectReference: {fileID: 0}
136-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
136+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
137137
type: 3}
138138
propertyPath: m_LocalRotation.y
139-
value: -0
139+
value: 0
140140
objectReference: {fileID: 0}
141-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
141+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
142142
type: 3}
143143
propertyPath: m_LocalRotation.z
144-
value: -0
144+
value: 0
145145
objectReference: {fileID: 0}
146-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
146+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
147147
type: 3}
148148
propertyPath: m_LocalEulerAnglesHint.x
149149
value: 0
150150
objectReference: {fileID: 0}
151-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
151+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
152152
type: 3}
153153
propertyPath: m_LocalEulerAnglesHint.y
154154
value: 0
155155
objectReference: {fileID: 0}
156-
- target: {fileID: -8679921383154817045, guid: 39c4f10d38fdc744e932e20b293735b8,
156+
- target: {fileID: 5818991929694988880, guid: b3a646508a4a1764a98eabb43a74671b,
157157
type: 3}
158158
propertyPath: m_LocalEulerAnglesHint.z
159159
value: 0
160160
objectReference: {fileID: 0}
161-
- target: {fileID: -7511558181221131132, guid: 39c4f10d38fdc744e932e20b293735b8,
162-
type: 3}
163-
propertyPath: m_Materials.Array.data[0]
164-
value:
165-
objectReference: {fileID: 2100000, guid: 2b4f625958f22ee47bfd4483b881a085, type: 2}
166-
- target: {fileID: 919132149155446097, guid: 39c4f10d38fdc744e932e20b293735b8,
161+
- target: {fileID: 6596338561138946282, guid: b3a646508a4a1764a98eabb43a74671b,
167162
type: 3}
168163
propertyPath: m_Name
169-
value: rockCritterEgg
164+
value: RockCritter_GoldenEgg
170165
objectReference: {fileID: 0}
171166
m_RemovedComponents: []
172-
m_SourcePrefab: {fileID: 100100000, guid: 39c4f10d38fdc744e932e20b293735b8, type: 3}
167+
m_SourcePrefab: {fileID: 100100000, guid: b3a646508a4a1764a98eabb43a74671b, type: 3}

‎UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Cave.prefab

Lines changed: 32 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Transform:
2323
m_PrefabInstance: {fileID: 0}
2424
m_PrefabAsset: {fileID: 0}
2525
m_GameObject: {fileID: 5422772742601145822}
26-
m_LocalRotation: {x: -0, y: 0.32241195, z: -0, w: 0.9465995}
26+
m_LocalRotation: {x: 0, y: 0.32241437, z: 0, w: 0.9465986}
2727
m_LocalPosition: {x: -34.21, y: -14.4, z: 120.48}
2828
m_LocalScale: {x: 1, y: 1, z: 1}
2929
m_Children:
@@ -35,14 +35,19 @@ Transform:
3535
- {fileID: 1981787520678023078}
3636
m_Father: {fileID: 0}
3737
m_RootOrder: 0
38-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
38+
m_LocalEulerAnglesHint: {x: 0, y: 37.618, z: 0}
3939
--- !u!1001 &5422772742535092266
4040
PrefabInstance:
4141
m_ObjectHideFlags: 0
4242
serializedVersion: 2
4343
m_Modification:
4444
m_TransformParent: {fileID: 5422772742601145823}
4545
m_Modifications:
46+
- target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
47+
propertyPath: _droppableRewardSO
48+
value:
49+
objectReference: {fileID: 11400000, guid: 7b5acbea6cb73ba4fb8e73103dbf326d,
50+
type: 2}
4651
- target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
4752
type: 3}
4853
propertyPath: m_RootOrder
@@ -118,6 +123,11 @@ PrefabInstance:
118123
m_Modification:
119124
m_TransformParent: {fileID: 5422772742601145823}
120125
m_Modifications:
126+
- target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
127+
propertyPath: _droppableRewardSO
128+
value:
129+
objectReference: {fileID: 11400000, guid: 7b5acbea6cb73ba4fb8e73103dbf326d,
130+
type: 2}
121131
- target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
122132
type: 3}
123133
propertyPath: m_RootOrder
@@ -193,6 +203,11 @@ PrefabInstance:
193203
m_Modification:
194204
m_TransformParent: {fileID: 5422772742601145823}
195205
m_Modifications:
206+
- target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
207+
propertyPath: _droppableRewardSO
208+
value:
209+
objectReference: {fileID: 11400000, guid: 7b5acbea6cb73ba4fb8e73103dbf326d,
210+
type: 2}
196211
- target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
197212
type: 3}
198213
propertyPath: m_RootOrder
@@ -268,6 +283,11 @@ PrefabInstance:
268283
m_Modification:
269284
m_TransformParent: {fileID: 5422772742601145823}
270285
m_Modifications:
286+
- target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
287+
propertyPath: _droppableRewardSO
288+
value:
289+
objectReference: {fileID: 11400000, guid: 5bbd8876e11015c4abb5280e97c1615b,
290+
type: 2}
271291
- target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
272292
type: 3}
273293
propertyPath: m_RootOrder
@@ -358,6 +378,11 @@ PrefabInstance:
358378
m_Modification:
359379
m_TransformParent: {fileID: 5422772742601145823}
360380
m_Modifications:
381+
- target: {fileID: 1419279369, guid: b4583a7f005d6724798206eee4608f75, type: 3}
382+
propertyPath: _droppableRewardSO
383+
value:
384+
objectReference: {fileID: 11400000, guid: 7b5acbea6cb73ba4fb8e73103dbf326d,
385+
type: 2}
361386
- target: {fileID: 2603716432372836042, guid: b4583a7f005d6724798206eee4608f75,
362387
type: 3}
363388
propertyPath: m_RootOrder
@@ -523,6 +548,11 @@ PrefabInstance:
523548
propertyPath: m_Name
524549
value: RockCritter_GoldenEgg
525550
objectReference: {fileID: 0}
551+
- target: {fileID: 6596338561138946282, guid: b3a646508a4a1764a98eabb43a74671b,
552+
type: 3}
553+
propertyPath: m_IsActive
554+
value: 0
555+
objectReference: {fileID: 0}
526556
m_RemovedComponents: []
527557
m_SourcePrefab: {fileID: 100100000, guid: b3a646508a4a1764a98eabb43a74671b, type: 3}
528558
--- !u!4 &1981787520678023078 stripped

‎UOP1_Project/Assets/Prefabs/_SceneChunks/Interactables/Interactables_Farms.prefab

Lines changed: 164 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ Transform:
3030
- {fileID: 8040769610452317586}
3131
- {fileID: 8040769610564248312}
3232
- {fileID: 8040769609122690780}
33+
- {fileID: 67130411264315143}
34+
- {fileID: 67130411297963406}
3335
m_Father: {fileID: 8032437784309596759}
3436
m_RootOrder: 0
3537
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -143,6 +145,168 @@ Transform:
143145
type: 3}
144146
m_PrefabInstance: {fileID: 799974963}
145147
m_PrefabAsset: {fileID: 0}
148+
--- !u!1001 &1350318932
149+
PrefabInstance:
150+
m_ObjectHideFlags: 0
151+
serializedVersion: 2
152+
m_Modification:
153+
m_TransformParent: {fileID: 8032437784199091367}
154+
m_Modifications:
155+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
156+
type: 3}
157+
propertyPath: m_RootOrder
158+
value: 4
159+
objectReference: {fileID: 0}
160+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
161+
type: 3}
162+
propertyPath: m_LocalPosition.x
163+
value: 55.41
164+
objectReference: {fileID: 0}
165+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
166+
type: 3}
167+
propertyPath: m_LocalPosition.y
168+
value: 2.166
169+
objectReference: {fileID: 0}
170+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
171+
type: 3}
172+
propertyPath: m_LocalPosition.z
173+
value: -123.78
174+
objectReference: {fileID: 0}
175+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
176+
type: 3}
177+
propertyPath: m_LocalRotation.w
178+
value: 0.5733645
179+
objectReference: {fileID: 0}
180+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
181+
type: 3}
182+
propertyPath: m_LocalRotation.x
183+
value: -0
184+
objectReference: {fileID: 0}
185+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
186+
type: 3}
187+
propertyPath: m_LocalRotation.y
188+
value: 0.8193005
189+
objectReference: {fileID: 0}
190+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
191+
type: 3}
192+
propertyPath: m_LocalRotation.z
193+
value: -0
194+
objectReference: {fileID: 0}
195+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
196+
type: 3}
197+
propertyPath: m_LocalEulerAnglesHint.x
198+
value: 0
199+
objectReference: {fileID: 0}
200+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
201+
type: 3}
202+
propertyPath: m_LocalEulerAnglesHint.y
203+
value: 110.03
204+
objectReference: {fileID: 0}
205+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
206+
type: 3}
207+
propertyPath: m_LocalEulerAnglesHint.z
208+
value: 0
209+
objectReference: {fileID: 0}
210+
- target: {fileID: 839268684819471456, guid: 56a7aec3927ab6a4e85add83fc22eabb,
211+
type: 3}
212+
propertyPath: m_Name
213+
value: Gluecose_FarmAttack (4)
214+
objectReference: {fileID: 0}
215+
- target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
216+
type: 3}
217+
propertyPath: _npcMovementConfig
218+
value:
219+
objectReference: {fileID: 11400000, guid: fa5d257c17e2c2a49bcaad7e13ade621,
220+
type: 2}
221+
m_RemovedComponents: []
222+
m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
223+
--- !u!4 &67130411297963406 stripped
224+
Transform:
225+
m_CorrespondingSourceObject: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
226+
type: 3}
227+
m_PrefabInstance: {fileID: 1350318932}
228+
m_PrefabAsset: {fileID: 0}
229+
--- !u!1001 &1384073693
230+
PrefabInstance:
231+
m_ObjectHideFlags: 0
232+
serializedVersion: 2
233+
m_Modification:
234+
m_TransformParent: {fileID: 8032437784199091367}
235+
m_Modifications:
236+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
237+
type: 3}
238+
propertyPath: m_RootOrder
239+
value: 3
240+
objectReference: {fileID: 0}
241+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
242+
type: 3}
243+
propertyPath: m_LocalPosition.x
244+
value: 37.910084
245+
objectReference: {fileID: 0}
246+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
247+
type: 3}
248+
propertyPath: m_LocalPosition.y
249+
value: 2.445
250+
objectReference: {fileID: 0}
251+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
252+
type: 3}
253+
propertyPath: m_LocalPosition.z
254+
value: -140.48
255+
objectReference: {fileID: 0}
256+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
257+
type: 3}
258+
propertyPath: m_LocalRotation.w
259+
value: 0.4177068
260+
objectReference: {fileID: 0}
261+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
262+
type: 3}
263+
propertyPath: m_LocalRotation.x
264+
value: -0
265+
objectReference: {fileID: 0}
266+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
267+
type: 3}
268+
propertyPath: m_LocalRotation.y
269+
value: 0.908582
270+
objectReference: {fileID: 0}
271+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
272+
type: 3}
273+
propertyPath: m_LocalRotation.z
274+
value: -0
275+
objectReference: {fileID: 0}
276+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
277+
type: 3}
278+
propertyPath: m_LocalEulerAnglesHint.x
279+
value: 0
280+
objectReference: {fileID: 0}
281+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
282+
type: 3}
283+
propertyPath: m_LocalEulerAnglesHint.y
284+
value: 130.62
285+
objectReference: {fileID: 0}
286+
- target: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
287+
type: 3}
288+
propertyPath: m_LocalEulerAnglesHint.z
289+
value: 0
290+
objectReference: {fileID: 0}
291+
- target: {fileID: 839268684819471456, guid: 56a7aec3927ab6a4e85add83fc22eabb,
292+
type: 3}
293+
propertyPath: m_Name
294+
value: Gluecose_FarmAttack (3)
295+
objectReference: {fileID: 0}
296+
- target: {fileID: 3641242757122071620, guid: 56a7aec3927ab6a4e85add83fc22eabb,
297+
type: 3}
298+
propertyPath: _npcMovementConfig
299+
value:
300+
objectReference: {fileID: 11400000, guid: fa5d257c17e2c2a49bcaad7e13ade621,
301+
type: 2}
302+
m_RemovedComponents: []
303+
m_SourcePrefab: {fileID: 100100000, guid: 56a7aec3927ab6a4e85add83fc22eabb, type: 3}
304+
--- !u!4 &67130411264315143 stripped
305+
Transform:
306+
m_CorrespondingSourceObject: {fileID: 67130409962850010, guid: 56a7aec3927ab6a4e85add83fc22eabb,
307+
type: 3}
308+
m_PrefabInstance: {fileID: 1384073693}
309+
m_PrefabAsset: {fileID: 0}
146310
--- !u!1001 &8032437782536457977
147311
PrefabInstance:
148312
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)