Skip to content

Commit 22ec0db

Browse files
committed
kickers: Use the same prefabs from the main project.
1 parent c4fb37f commit 22ec0db

16 files changed

+683
-823
lines changed
Lines changed: 136 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,136 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &2420819360404407618
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 5877270596738996132}
12+
- component: {fileID: -9013886439761726827}
13+
- component: {fileID: -2035473210646026864}
14+
- component: {fileID: 2254716409977562185}
15+
- component: {fileID: 9085684073653883757}
16+
m_Layer: 0
17+
m_Name: Kicker (parent)
18+
m_TagString: Untagged
19+
m_Icon: {fileID: 0}
20+
m_NavMeshLayer: 0
21+
m_StaticEditorFlags: 0
22+
m_IsActive: 1
23+
--- !u!4 &5877270596738996132
24+
Transform:
25+
m_ObjectHideFlags: 0
26+
m_CorrespondingSourceObject: {fileID: 0}
27+
m_PrefabInstance: {fileID: 0}
28+
m_PrefabAsset: {fileID: 0}
29+
m_GameObject: {fileID: 2420819360404407618}
30+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
31+
m_LocalPosition: {x: 0, y: 0, z: 0}
32+
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_ConstrainProportionsScale: 0
34+
m_Children: []
35+
m_Father: {fileID: 0}
36+
m_RootOrder: 0
37+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
38+
--- !u!114 &-9013886439761726827
39+
MonoBehaviour:
40+
m_ObjectHideFlags: 0
41+
m_CorrespondingSourceObject: {fileID: 0}
42+
m_PrefabInstance: {fileID: 0}
43+
m_PrefabAsset: {fileID: 0}
44+
m_GameObject: {fileID: 2420819360404407618}
45+
m_Enabled: 1
46+
m_EditorHideFlags: 0
47+
m_Script: {fileID: 11500000, guid: a226873d073ee074d9091d357ea35254, type: 3}
48+
m_Name:
49+
m_EditorClassIdentifier:
50+
_isLocked: 0
51+
_editorLayer: 0
52+
_editorLayerName:
53+
_editorLayerVisibility: 1
54+
Position: {x: 0, y: 0}
55+
Radius: 25
56+
Orientation: 0
57+
_surface: {fileID: 0}
58+
Coils:
59+
- Name: Default
60+
Id:
61+
Speed: 3
62+
Angle: 90
63+
Inclination: 0
64+
KickerType: 0
65+
MeshName:
66+
--- !u!114 &-2035473210646026864
67+
MonoBehaviour:
68+
m_ObjectHideFlags: 0
69+
m_CorrespondingSourceObject: {fileID: 0}
70+
m_PrefabInstance: {fileID: 0}
71+
m_PrefabAsset: {fileID: 0}
72+
m_GameObject: {fileID: 2420819360404407618}
73+
m_Enabled: 1
74+
m_EditorHideFlags: 0
75+
m_Script: {fileID: 11500000, guid: 5693908cb88108f45a2fe3f59adeeabb, type: 3}
76+
m_Name:
77+
m_EditorClassIdentifier:
78+
PhysicsMaterial: {fileID: 0}
79+
ShowColliderMesh: 0
80+
ShowAabbs: 0
81+
Scatter: 0
82+
HitAccuracy: 0.7
83+
HitHeight: 40
84+
FallThrough: 0
85+
FallIn: 1
86+
LegacyMode: 1
87+
--- !u!33 &2254716409977562185
88+
MeshFilter:
89+
m_ObjectHideFlags: 0
90+
m_CorrespondingSourceObject: {fileID: 0}
91+
m_PrefabInstance: {fileID: 0}
92+
m_PrefabAsset: {fileID: 0}
93+
m_GameObject: {fileID: 2420819360404407618}
94+
m_Mesh: {fileID: 0}
95+
--- !u!23 &9085684073653883757
96+
MeshRenderer:
97+
m_ObjectHideFlags: 0
98+
m_CorrespondingSourceObject: {fileID: 0}
99+
m_PrefabInstance: {fileID: 0}
100+
m_PrefabAsset: {fileID: 0}
101+
m_GameObject: {fileID: 2420819360404407618}
102+
m_Enabled: 1
103+
m_CastShadows: 1
104+
m_ReceiveShadows: 1
105+
m_DynamicOccludee: 1
106+
m_StaticShadowCaster: 0
107+
m_MotionVectors: 1
108+
m_LightProbeUsage: 1
109+
m_ReflectionProbeUsage: 1
110+
m_RayTracingMode: 2
111+
m_RayTraceProcedural: 0
112+
m_RenderingLayerMask: 1
113+
m_RendererPriority: 0
114+
m_Materials:
115+
- {fileID: 0}
116+
m_StaticBatchInfo:
117+
firstSubMesh: 0
118+
subMeshCount: 0
119+
m_StaticBatchRoot: {fileID: 0}
120+
m_ProbeAnchor: {fileID: 0}
121+
m_LightProbeVolumeOverride: {fileID: 0}
122+
m_ScaleInLightmap: 1
123+
m_ReceiveGI: 1
124+
m_PreserveUVs: 0
125+
m_IgnoreNormalsForChartDetection: 0
126+
m_ImportantGI: 0
127+
m_StitchLightmapSeams: 1
128+
m_SelectedEditorRenderState: 3
129+
m_MinimumChartSize: 4
130+
m_AutoUVMaxDistance: 0.5
131+
m_AutoUVMaxAngle: 89
132+
m_LightmapParameters: {fileID: 0}
133+
m_SortingLayerID: 0
134+
m_SortingLayer: 0
135+
m_SortingOrder: 0
136+
m_AdditionalVertexStreams: {fileID: 0}

Assets/Library/Kickers/VPX/Kicker (parent).prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 71 additions & 130 deletions
Original file line numberDiff line numberDiff line change
@@ -1,134 +1,75 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &6218589368341597124
4-
GameObject:
3+
--- !u!1001 &4885625883560994726
4+
PrefabInstance:
55
m_ObjectHideFlags: 0
6-
m_CorrespondingSourceObject: {fileID: 0}
7-
m_PrefabInstance: {fileID: 0}
8-
m_PrefabAsset: {fileID: 0}
9-
serializedVersion: 6
10-
m_Component:
11-
- component: {fileID: 2757581774249220386}
12-
- component: {fileID: 8447796871057128467}
13-
- component: {fileID: 1446833687152831254}
14-
- component: {fileID: 4686334563305018427}
15-
- component: {fileID: 25506738236851100}
16-
m_Layer: 0
17-
m_Name: Kicker - Cup 1 (VPX)
18-
m_TagString: Untagged
19-
m_Icon: {fileID: 0}
20-
m_NavMeshLayer: 0
21-
m_StaticEditorFlags: 0
22-
m_IsActive: 1
23-
--- !u!4 &2757581774249220386
24-
Transform:
25-
m_ObjectHideFlags: 0
26-
m_CorrespondingSourceObject: {fileID: 0}
27-
m_PrefabInstance: {fileID: 0}
28-
m_PrefabAsset: {fileID: 0}
29-
m_GameObject: {fileID: 6218589368341597124}
306
serializedVersion: 2
31-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
32-
m_LocalPosition: {x: 0, y: 0, z: 0}
33-
m_LocalScale: {x: 1, y: 1, z: 1}
34-
m_ConstrainProportionsScale: 0
35-
m_Children: []
36-
m_Father: {fileID: 0}
37-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
38-
--- !u!114 &8447796871057128467
39-
MonoBehaviour:
40-
m_ObjectHideFlags: 0
41-
m_CorrespondingSourceObject: {fileID: 0}
42-
m_PrefabInstance: {fileID: 0}
43-
m_PrefabAsset: {fileID: 0}
44-
m_GameObject: {fileID: 6218589368341597124}
45-
m_Enabled: 1
46-
m_EditorHideFlags: 0
47-
m_Script: {fileID: 11500000, guid: a226873d073ee074d9091d357ea35254, type: 3}
48-
m_Name:
49-
m_EditorClassIdentifier:
50-
_isLocked: 0
51-
_editorLayer: 0
52-
_editorLayerName:
53-
_editorLayerVisibility: 1
54-
Orientation: 0
55-
Coils:
56-
- Name: Default
57-
Id: coil_142261ec
58-
Speed: 3
59-
Angle: 90
60-
Inclination: 0
61-
KickerType: 0
62-
MeshName: Custom Mesh
63-
--- !u!114 &1446833687152831254
64-
MonoBehaviour:
65-
m_ObjectHideFlags: 0
66-
m_CorrespondingSourceObject: {fileID: 0}
67-
m_PrefabInstance: {fileID: 0}
68-
m_PrefabAsset: {fileID: 0}
69-
m_GameObject: {fileID: 6218589368341597124}
70-
m_Enabled: 1
71-
m_EditorHideFlags: 0
72-
m_Script: {fileID: 11500000, guid: 5693908cb88108f45a2fe3f59adeeabb, type: 3}
73-
m_Name:
74-
m_EditorClassIdentifier:
75-
PhysicsMaterial: {fileID: 0}
76-
ShowColliderMesh: 1
77-
ShowColliderOctree: 0
78-
ShowAabbs: 0
79-
Scatter: 0
80-
HitAccuracy: 0.7
81-
HitHeight: 40
82-
FallThrough: 0
83-
FallIn: 1
84-
LegacyMode: 1
85-
--- !u!23 &4686334563305018427
86-
MeshRenderer:
87-
m_ObjectHideFlags: 0
88-
m_CorrespondingSourceObject: {fileID: 0}
89-
m_PrefabInstance: {fileID: 0}
90-
m_PrefabAsset: {fileID: 0}
91-
m_GameObject: {fileID: 6218589368341597124}
92-
m_Enabled: 1
93-
m_CastShadows: 1
94-
m_ReceiveShadows: 1
95-
m_DynamicOccludee: 1
96-
m_StaticShadowCaster: 0
97-
m_MotionVectors: 1
98-
m_LightProbeUsage: 1
99-
m_ReflectionProbeUsage: 1
100-
m_RayTracingMode: 2
101-
m_RayTraceProcedural: 0
102-
m_RenderingLayerMask: 257
103-
m_RendererPriority: 0
104-
m_Materials:
105-
- {fileID: 2100000, guid: 3cb1ee6b949d6bb47b23811d8ce45243, type: 2}
106-
m_StaticBatchInfo:
107-
firstSubMesh: 0
108-
subMeshCount: 0
109-
m_StaticBatchRoot: {fileID: 0}
110-
m_ProbeAnchor: {fileID: 0}
111-
m_LightProbeVolumeOverride: {fileID: 0}
112-
m_ScaleInLightmap: 1
113-
m_ReceiveGI: 1
114-
m_PreserveUVs: 0
115-
m_IgnoreNormalsForChartDetection: 0
116-
m_ImportantGI: 0
117-
m_StitchLightmapSeams: 1
118-
m_SelectedEditorRenderState: 3
119-
m_MinimumChartSize: 4
120-
m_AutoUVMaxDistance: 0.5
121-
m_AutoUVMaxAngle: 89
122-
m_LightmapParameters: {fileID: 0}
123-
m_SortingLayerID: 0
124-
m_SortingLayer: 0
125-
m_SortingOrder: 0
126-
m_AdditionalVertexStreams: {fileID: 0}
127-
--- !u!33 &25506738236851100
128-
MeshFilter:
129-
m_ObjectHideFlags: 0
130-
m_CorrespondingSourceObject: {fileID: 0}
131-
m_PrefabInstance: {fileID: 0}
132-
m_PrefabAsset: {fileID: 0}
133-
m_GameObject: {fileID: 6218589368341597124}
134-
m_Mesh: {fileID: -2332385489447507028, guid: 3e569e965b140ae4fb420886bdcaeb90, type: 3}
7+
m_Modification:
8+
serializedVersion: 3
9+
m_TransformParent: {fileID: 0}
10+
m_Modifications:
11+
- target: {fileID: -9013886439761726827, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
12+
propertyPath: Coils.Array.data[0].Id
13+
value: coil_0ddb1baf
14+
objectReference: {fileID: 0}
15+
- target: {fileID: 2254716409977562185, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
16+
propertyPath: m_Mesh
17+
value:
18+
objectReference: {fileID: -2332385489447507028, guid: 3e569e965b140ae4fb420886bdcaeb90, type: 3}
19+
- target: {fileID: 2420819360404407618, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
20+
propertyPath: m_Name
21+
value: Kicker - Cup 1 (VPX)
22+
objectReference: {fileID: 0}
23+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
24+
propertyPath: m_RootOrder
25+
value: 0
26+
objectReference: {fileID: 0}
27+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
28+
propertyPath: m_LocalPosition.x
29+
value: 0
30+
objectReference: {fileID: 0}
31+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
32+
propertyPath: m_LocalPosition.y
33+
value: 0
34+
objectReference: {fileID: 0}
35+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
36+
propertyPath: m_LocalPosition.z
37+
value: 0
38+
objectReference: {fileID: 0}
39+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
40+
propertyPath: m_LocalRotation.w
41+
value: 1
42+
objectReference: {fileID: 0}
43+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
44+
propertyPath: m_LocalRotation.x
45+
value: 0
46+
objectReference: {fileID: 0}
47+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
48+
propertyPath: m_LocalRotation.y
49+
value: 0
50+
objectReference: {fileID: 0}
51+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
52+
propertyPath: m_LocalRotation.z
53+
value: 0
54+
objectReference: {fileID: 0}
55+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
56+
propertyPath: m_LocalEulerAnglesHint.x
57+
value: 0
58+
objectReference: {fileID: 0}
59+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
60+
propertyPath: m_LocalEulerAnglesHint.y
61+
value: 0
62+
objectReference: {fileID: 0}
63+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
64+
propertyPath: m_LocalEulerAnglesHint.z
65+
value: 0
66+
objectReference: {fileID: 0}
67+
- target: {fileID: 9085684073653883757, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
68+
propertyPath: m_Materials.Array.data[0]
69+
value:
70+
objectReference: {fileID: 2100000, guid: 3cb1ee6b949d6bb47b23811d8ce45243, type: 2}
71+
m_RemovedComponents: []
72+
m_RemovedGameObjects: []
73+
m_AddedGameObjects: []
74+
m_AddedComponents: []
75+
m_SourcePrefab: {fileID: 100100000, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}

Assets/Library/Kickers/VPX/Kicker - Cup 1 (VPX).prefab.meta

Lines changed: 7 additions & 7 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)