Skip to content

Commit bbad229

Browse files
committed
gates: Replace plate and axis of arch with common items.
1 parent cf3f1df commit bbad229

16 files changed

+836
-1330
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:2728aee88d3e87a57def5b0c82bb53ec16bbe395615dcb23ff65d809f5fca3ce
3-
size 63180
2+
oid sha256:5a4f89e2800f8fa433fe4185006aafe8aed3f5de10d4de40e47f6d1c7545417c
3+
size 43052

Assets/Library/Gates/Ball Gate Arch Rebound, Gottlieb/Ball Gate Arch Rebound, Left, Gottlieb.prefab

Lines changed: 135 additions & 193 deletions
Original file line numberDiff line numberDiff line change
@@ -32,11 +32,11 @@ Transform:
3232
m_LocalScale: {x: 1, y: 1, z: 1}
3333
m_ConstrainProportionsScale: 0
3434
m_Children:
35+
- {fileID: 8820207494531329820}
36+
- {fileID: 3158140599773056088}
37+
- {fileID: 6770366487266600797}
3538
- {fileID: 4956672996321565867}
3639
- {fileID: 5623052907501528436}
37-
- {fileID: 8485115002089211458}
38-
- {fileID: 8820207494531329820}
39-
- {fileID: 102344307827100770}
4040
m_Father: {fileID: 0}
4141
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4242
--- !u!114 &6932130640792513923
@@ -77,7 +77,7 @@ MonoBehaviour:
7777
_angleMax: 32.48
7878
_angleMin: -12.09
7979
ZLow: -0.2
80-
Distance: 31.5
80+
Distance: -32
8181
Damping: 0.985
8282
Elasticity: 0.3
8383
Friction: 0.02
@@ -103,92 +103,6 @@ MonoBehaviour:
103103
StartWhen: 0
104104
StopWhen: 0
105105
SwitchName: gate_switch
106-
--- !u!1 &4411154278425442651
107-
GameObject:
108-
m_ObjectHideFlags: 0
109-
m_CorrespondingSourceObject: {fileID: 0}
110-
m_PrefabInstance: {fileID: 0}
111-
m_PrefabAsset: {fileID: 0}
112-
serializedVersion: 6
113-
m_Component:
114-
- component: {fileID: 102344307827100770}
115-
- component: {fileID: 1291665649362218135}
116-
- component: {fileID: 6572399561499553740}
117-
m_Layer: 0
118-
m_Name: Ball Gate Arch Rebound, Gottlieb, Axis
119-
m_TagString: Untagged
120-
m_Icon: {fileID: 0}
121-
m_NavMeshLayer: 0
122-
m_StaticEditorFlags: 0
123-
m_IsActive: 1
124-
--- !u!4 &102344307827100770
125-
Transform:
126-
m_ObjectHideFlags: 0
127-
m_CorrespondingSourceObject: {fileID: 0}
128-
m_PrefabInstance: {fileID: 0}
129-
m_PrefabAsset: {fileID: 0}
130-
m_GameObject: {fileID: 4411154278425442651}
131-
serializedVersion: 2
132-
m_LocalRotation: {x: 0, y: 0.96755284, z: 0.25266898, w: 0}
133-
m_LocalPosition: {x: -0, y: 0.037728086, z: 0}
134-
m_LocalScale: {x: 1, y: 1, z: 1}
135-
m_ConstrainProportionsScale: 0
136-
m_Children: []
137-
m_Father: {fileID: 7285404555585865920}
138-
m_LocalEulerAnglesHint: {x: -29.271, y: 180, z: 0}
139-
--- !u!33 &1291665649362218135
140-
MeshFilter:
141-
m_ObjectHideFlags: 0
142-
m_CorrespondingSourceObject: {fileID: 0}
143-
m_PrefabInstance: {fileID: 0}
144-
m_PrefabAsset: {fileID: 0}
145-
m_GameObject: {fileID: 4411154278425442651}
146-
m_Mesh: {fileID: -2665206112861668853, guid: 9f14974272b3e2d44b41b84e3a4c0ad3, type: 3}
147-
--- !u!23 &6572399561499553740
148-
MeshRenderer:
149-
m_ObjectHideFlags: 0
150-
m_CorrespondingSourceObject: {fileID: 0}
151-
m_PrefabInstance: {fileID: 0}
152-
m_PrefabAsset: {fileID: 0}
153-
m_GameObject: {fileID: 4411154278425442651}
154-
m_Enabled: 1
155-
m_CastShadows: 1
156-
m_ReceiveShadows: 1
157-
m_DynamicOccludee: 1
158-
m_StaticShadowCaster: 0
159-
m_MotionVectors: 1
160-
m_LightProbeUsage: 1
161-
m_ReflectionProbeUsage: 1
162-
m_RayTracingMode: 2
163-
m_RayTraceProcedural: 0
164-
m_RayTracingAccelStructBuildFlagsOverride: 0
165-
m_RayTracingAccelStructBuildFlags: 1
166-
m_SmallMeshCulling: 1
167-
m_RenderingLayerMask: 1
168-
m_RendererPriority: 0
169-
m_Materials:
170-
- {fileID: 2100000, guid: e4ba32e7d295cc34198629ba5d3150d3, type: 2}
171-
m_StaticBatchInfo:
172-
firstSubMesh: 0
173-
subMeshCount: 0
174-
m_StaticBatchRoot: {fileID: 0}
175-
m_ProbeAnchor: {fileID: 0}
176-
m_LightProbeVolumeOverride: {fileID: 0}
177-
m_ScaleInLightmap: 1
178-
m_ReceiveGI: 1
179-
m_PreserveUVs: 0
180-
m_IgnoreNormalsForChartDetection: 0
181-
m_ImportantGI: 0
182-
m_StitchLightmapSeams: 1
183-
m_SelectedEditorRenderState: 3
184-
m_MinimumChartSize: 4
185-
m_AutoUVMaxDistance: 0.5
186-
m_AutoUVMaxAngle: 89
187-
m_LightmapParameters: {fileID: 0}
188-
m_SortingLayerID: 0
189-
m_SortingLayer: 0
190-
m_SortingOrder: 0
191-
m_AdditionalVertexStreams: {fileID: 0}
192106
--- !u!1 &4876961793055820987
193107
GameObject:
194108
m_ObjectHideFlags: 0
@@ -215,13 +129,13 @@ Transform:
215129
m_PrefabAsset: {fileID: 0}
216130
m_GameObject: {fileID: 4876961793055820987}
217131
serializedVersion: 2
218-
m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
219-
m_LocalPosition: {x: -0, y: 0, z: 0}
132+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
133+
m_LocalPosition: {x: 0, y: 0, z: 0}
220134
m_LocalScale: {x: 1, y: 1, z: 1}
221135
m_ConstrainProportionsScale: 0
222136
m_Children: []
223137
m_Father: {fileID: 7285404555585865920}
224-
m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
138+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
225139
--- !u!33 &3192541236606743857
226140
MeshFilter:
227141
m_ObjectHideFlags: 0
@@ -275,106 +189,68 @@ MeshRenderer:
275189
m_SortingLayer: 0
276190
m_SortingOrder: 0
277191
m_AdditionalVertexStreams: {fileID: 0}
278-
--- !u!1 &6541139908572975409
279-
GameObject:
280-
m_ObjectHideFlags: 0
281-
m_CorrespondingSourceObject: {fileID: 0}
282-
m_PrefabInstance: {fileID: 0}
283-
m_PrefabAsset: {fileID: 0}
284-
serializedVersion: 6
285-
m_Component:
286-
- component: {fileID: 8485115002089211458}
287-
- component: {fileID: 402888661443102336}
288-
- component: {fileID: 2386276954026782664}
289-
- component: {fileID: 1952167319634269553}
290-
m_Layer: 0
291-
m_Name: Ball Gate Arch Rebound, Plate, Gottlieb
292-
m_TagString: Untagged
293-
m_Icon: {fileID: 0}
294-
m_NavMeshLayer: 0
295-
m_StaticEditorFlags: 0
296-
m_IsActive: 1
297-
--- !u!4 &8485115002089211458
298-
Transform:
192+
--- !u!1001 &2749628197676718483
193+
PrefabInstance:
299194
m_ObjectHideFlags: 0
300-
m_CorrespondingSourceObject: {fileID: 0}
301-
m_PrefabInstance: {fileID: 0}
302-
m_PrefabAsset: {fileID: 0}
303-
m_GameObject: {fileID: 6541139908572975409}
304195
serializedVersion: 2
305-
m_LocalRotation: {x: -0.07777185, y: 0, z: 0, w: 0.9969712}
306-
m_LocalPosition: {x: 0, y: 0.037847236, z: 0}
307-
m_LocalScale: {x: 1, y: 1, z: 1}
308-
m_ConstrainProportionsScale: 0
309-
m_Children: []
310-
m_Father: {fileID: 7285404555585865920}
311-
m_LocalEulerAnglesHint: {x: -8.921, y: 0, z: 0}
312-
--- !u!114 &402888661443102336
313-
MonoBehaviour:
314-
m_ObjectHideFlags: 0
315-
m_CorrespondingSourceObject: {fileID: 0}
316-
m_PrefabInstance: {fileID: 0}
317-
m_PrefabAsset: {fileID: 0}
318-
m_GameObject: {fileID: 6541139908572975409}
319-
m_Enabled: 1
320-
m_EditorHideFlags: 0
321-
m_Script: {fileID: 11500000, guid: a3246946b24b0f940b90770737255e03, type: 3}
322-
m_Name:
323-
m_EditorClassIdentifier:
324-
RotationAngle: {x: 1, y: 0, z: 0}
325-
--- !u!33 &2386276954026782664
326-
MeshFilter:
327-
m_ObjectHideFlags: 0
328-
m_CorrespondingSourceObject: {fileID: 0}
329-
m_PrefabInstance: {fileID: 0}
330-
m_PrefabAsset: {fileID: 0}
331-
m_GameObject: {fileID: 6541139908572975409}
332-
m_Mesh: {fileID: 939032765412504438, guid: ab7f95ae58f30c94c8827ba0571d6383, type: 3}
333-
--- !u!23 &1952167319634269553
334-
MeshRenderer:
335-
m_ObjectHideFlags: 0
336-
m_CorrespondingSourceObject: {fileID: 0}
337-
m_PrefabInstance: {fileID: 0}
196+
m_Modification:
197+
serializedVersion: 3
198+
m_TransformParent: {fileID: 7285404555585865920}
199+
m_Modifications:
200+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
201+
propertyPath: m_LocalPosition.x
202+
value: 0
203+
objectReference: {fileID: 0}
204+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
205+
propertyPath: m_LocalPosition.y
206+
value: 0.037847236
207+
objectReference: {fileID: 0}
208+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
209+
propertyPath: m_LocalPosition.z
210+
value: 0
211+
objectReference: {fileID: 0}
212+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
213+
propertyPath: m_LocalRotation.w
214+
value: 0
215+
objectReference: {fileID: 0}
216+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
217+
propertyPath: m_LocalRotation.x
218+
value: 0
219+
objectReference: {fileID: 0}
220+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
221+
propertyPath: m_LocalRotation.y
222+
value: 0.9969712
223+
objectReference: {fileID: 0}
224+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
225+
propertyPath: m_LocalRotation.z
226+
value: 0.07777185
227+
objectReference: {fileID: 0}
228+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
229+
propertyPath: m_LocalEulerAnglesHint.x
230+
value: -8.921
231+
objectReference: {fileID: 0}
232+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
233+
propertyPath: m_LocalEulerAnglesHint.y
234+
value: 180
235+
objectReference: {fileID: 0}
236+
- target: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
237+
propertyPath: m_LocalEulerAnglesHint.z
238+
value: 0
239+
objectReference: {fileID: 0}
240+
- target: {fileID: 5447225011756753713, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
241+
propertyPath: m_Name
242+
value: Ball Gate, Plate 01
243+
objectReference: {fileID: 0}
244+
m_RemovedComponents: []
245+
m_RemovedGameObjects: []
246+
m_AddedGameObjects: []
247+
m_AddedComponents: []
248+
m_SourcePrefab: {fileID: 100100000, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
249+
--- !u!4 &3158140599773056088 stripped
250+
Transform:
251+
m_CorrespondingSourceObject: {fileID: 1007500524248716747, guid: 597a7d540451bc14691ac350ad7f1d8d, type: 3}
252+
m_PrefabInstance: {fileID: 2749628197676718483}
338253
m_PrefabAsset: {fileID: 0}
339-
m_GameObject: {fileID: 6541139908572975409}
340-
m_Enabled: 1
341-
m_CastShadows: 1
342-
m_ReceiveShadows: 1
343-
m_DynamicOccludee: 1
344-
m_StaticShadowCaster: 0
345-
m_MotionVectors: 1
346-
m_LightProbeUsage: 1
347-
m_ReflectionProbeUsage: 1
348-
m_RayTracingMode: 2
349-
m_RayTraceProcedural: 0
350-
m_RayTracingAccelStructBuildFlagsOverride: 0
351-
m_RayTracingAccelStructBuildFlags: 1
352-
m_SmallMeshCulling: 1
353-
m_RenderingLayerMask: 1
354-
m_RendererPriority: 0
355-
m_Materials:
356-
- {fileID: 2100000, guid: c985292470eb80b45a95c8d4ed032066, type: 2}
357-
m_StaticBatchInfo:
358-
firstSubMesh: 0
359-
subMeshCount: 0
360-
m_StaticBatchRoot: {fileID: 0}
361-
m_ProbeAnchor: {fileID: 0}
362-
m_LightProbeVolumeOverride: {fileID: 0}
363-
m_ScaleInLightmap: 1
364-
m_ReceiveGI: 1
365-
m_PreserveUVs: 0
366-
m_IgnoreNormalsForChartDetection: 0
367-
m_ImportantGI: 0
368-
m_StitchLightmapSeams: 1
369-
m_SelectedEditorRenderState: 3
370-
m_MinimumChartSize: 4
371-
m_AutoUVMaxDistance: 0.5
372-
m_AutoUVMaxAngle: 89
373-
m_LightmapParameters: {fileID: 0}
374-
m_SortingLayerID: 0
375-
m_SortingLayer: 0
376-
m_SortingOrder: 0
377-
m_AdditionalVertexStreams: {fileID: 0}
378254
--- !u!1001 &3990181110621131132
379255
PrefabInstance:
380256
m_ObjectHideFlags: 0
@@ -389,7 +265,7 @@ PrefabInstance:
389265
objectReference: {fileID: 0}
390266
- target: {fileID: 8328944892739800535, guid: a74fe79b6e5dfdd43840bf3f7edc21ae, type: 3}
391267
propertyPath: m_LocalPosition.x
392-
value: 0.0407
268+
value: -0.0405
393269
objectReference: {fileID: 0}
394270
- target: {fileID: 8328944892739800535, guid: a74fe79b6e5dfdd43840bf3f7edc21ae, type: 3}
395271
propertyPath: m_LocalPosition.y
@@ -447,11 +323,11 @@ PrefabInstance:
447323
m_Modifications:
448324
- target: {fileID: 6247617670466103978, guid: a74fe79b6e5dfdd43840bf3f7edc21ae, type: 3}
449325
propertyPath: m_Name
450-
value: Screw, Phillips, Decorative, 0.25in (6-32)_001
326+
value: Screw, Phillips, Decorative, 0.25in (6-32)
451327
objectReference: {fileID: 0}
452328
- target: {fileID: 8328944892739800535, guid: a74fe79b6e5dfdd43840bf3f7edc21ae, type: 3}
453329
propertyPath: m_LocalPosition.x
454-
value: 0.0407
330+
value: -0.0405
455331
objectReference: {fileID: 0}
456332
- target: {fileID: 8328944892739800535, guid: a74fe79b6e5dfdd43840bf3f7edc21ae, type: 3}
457333
propertyPath: m_LocalPosition.y
@@ -499,3 +375,69 @@ Transform:
499375
m_CorrespondingSourceObject: {fileID: 8328944892739800535, guid: a74fe79b6e5dfdd43840bf3f7edc21ae, type: 3}
500376
m_PrefabInstance: {fileID: 4440342058755188899}
501377
m_PrefabAsset: {fileID: 0}
378+
--- !u!1001 &7502762915863249671
379+
PrefabInstance:
380+
m_ObjectHideFlags: 0
381+
serializedVersion: 2
382+
m_Modification:
383+
serializedVersion: 3
384+
m_TransformParent: {fileID: 7285404555585865920}
385+
m_Modifications:
386+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
387+
propertyPath: m_LocalPosition.x
388+
value: 0
389+
objectReference: {fileID: 0}
390+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
391+
propertyPath: m_LocalPosition.y
392+
value: 0.037728086
393+
objectReference: {fileID: 0}
394+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
395+
propertyPath: m_LocalPosition.z
396+
value: 0
397+
objectReference: {fileID: 0}
398+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
399+
propertyPath: m_LocalRotation.w
400+
value: 0.9659259
401+
objectReference: {fileID: 0}
402+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
403+
propertyPath: m_LocalRotation.x
404+
value: -0.258819
405+
objectReference: {fileID: 0}
406+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
407+
propertyPath: m_LocalRotation.y
408+
value: -0
409+
objectReference: {fileID: 0}
410+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
411+
propertyPath: m_LocalRotation.z
412+
value: -0
413+
objectReference: {fileID: 0}
414+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
415+
propertyPath: m_LocalEulerAnglesHint.x
416+
value: -30
417+
objectReference: {fileID: 0}
418+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
419+
propertyPath: m_LocalEulerAnglesHint.y
420+
value: 0
421+
objectReference: {fileID: 0}
422+
- target: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
423+
propertyPath: m_LocalEulerAnglesHint.z
424+
value: 0
425+
objectReference: {fileID: 0}
426+
- target: {fileID: 8744735949239596267, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
427+
propertyPath: m_Name
428+
value: Ball Gate, Axis
429+
objectReference: {fileID: 0}
430+
- target: {fileID: 8744735949239596267, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
431+
propertyPath: m_IsActive
432+
value: 1
433+
objectReference: {fileID: 0}
434+
m_RemovedComponents: []
435+
m_RemovedGameObjects: []
436+
m_AddedGameObjects: []
437+
m_AddedComponents: []
438+
m_SourcePrefab: {fileID: 100100000, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
439+
--- !u!4 &6770366487266600797 stripped
440+
Transform:
441+
m_CorrespondingSourceObject: {fileID: 3884925797097333850, guid: 5c013758e78502949a6d4866f0a901f6, type: 3}
442+
m_PrefabInstance: {fileID: 7502762915863249671}
443+
m_PrefabAsset: {fileID: 0}

0 commit comments

Comments
 (0)