Skip to content

Commit 73f4164

Browse files
committed
dots: Remove ConvertToEntity from prefabs.
1 parent d6a122f commit 73f4164

File tree

8 files changed

+38
-117
lines changed

8 files changed

+38
-117
lines changed

Assets/Resources/Prefabs/Ball.prefab

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ MeshRenderer:
6161
m_RenderingLayerMask: 257
6262
m_RendererPriority: 0
6363
m_Materials:
64-
- {fileID: 2100000, guid: 79985de3d41621e48b3a53aab448423c, type: 2}
64+
- {fileID: 2100000, guid: 7dce63ba66cc72244b90caea9680902f, type: 2}
6565
m_StaticBatchInfo:
6666
firstSubMesh: 0
6767
subMeshCount: 0

Assets/Resources/Prefabs/Bumper.prefab

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ GameObject:
1111
- component: {fileID: 8936098568141045026}
1212
- component: {fileID: 197865258511769274}
1313
- component: {fileID: 1813312543483188556}
14-
- component: {fileID: 558255656085877858}
1514
m_Layer: 0
1615
m_Name: Bumper
1716
m_TagString: Untagged
@@ -78,19 +77,6 @@ MonoBehaviour:
7877
Force: 15
7978
Scatter: 0
8079
HitEvent: 1
81-
--- !u!114 &558255656085877858
82-
MonoBehaviour:
83-
m_ObjectHideFlags: 0
84-
m_CorrespondingSourceObject: {fileID: 0}
85-
m_PrefabInstance: {fileID: 0}
86-
m_PrefabAsset: {fileID: 0}
87-
m_GameObject: {fileID: 642515788050218447}
88-
m_Enabled: 1
89-
m_EditorHideFlags: 0
90-
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
91-
m_Name:
92-
m_EditorClassIdentifier:
93-
ConversionMode: 1
9480
--- !u!1 &2782857395794746971
9581
GameObject:
9682
m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Drop Target.prefab

Lines changed: 4 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ GameObject:
1414
- component: {fileID: -5747639960802619407}
1515
- component: {fileID: 8307013672536159350}
1616
- component: {fileID: 16544014384142367}
17-
- component: {fileID: 531720702824142340}
1817
m_Layer: 0
1918
m_Name: Drop Target
2019
m_TagString: Untagged
@@ -32,6 +31,7 @@ Transform:
3231
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3332
m_LocalPosition: {x: 0, y: 0, z: 0}
3433
m_LocalScale: {x: 1, y: 1, z: 1}
34+
m_ConstrainProportionsScale: 0
3535
m_Children: []
3636
m_Father: {fileID: 0}
3737
m_RootOrder: 0
@@ -55,7 +55,8 @@ MonoBehaviour:
5555
Position: {x: 0, y: 0, z: 0}
5656
Rotation: 0
5757
Size: {x: 32, y: 32, z: 32}
58-
MeshName:
58+
_targetType: 1
59+
_meshName:
5960
--- !u!114 &396633086941765575
6061
MonoBehaviour:
6162
m_ObjectHideFlags: 0
@@ -113,6 +114,7 @@ MeshRenderer:
113114
m_CastShadows: 1
114115
m_ReceiveShadows: 1
115116
m_DynamicOccludee: 1
117+
m_StaticShadowCaster: 0
116118
m_MotionVectors: 1
117119
m_LightProbeUsage: 1
118120
m_ReflectionProbeUsage: 1
@@ -143,16 +145,3 @@ MeshRenderer:
143145
m_SortingLayer: 0
144146
m_SortingOrder: 0
145147
m_AdditionalVertexStreams: {fileID: 0}
146-
--- !u!114 &531720702824142340
147-
MonoBehaviour:
148-
m_ObjectHideFlags: 0
149-
m_CorrespondingSourceObject: {fileID: 0}
150-
m_PrefabInstance: {fileID: 0}
151-
m_PrefabAsset: {fileID: 0}
152-
m_GameObject: {fileID: 4811490838886355864}
153-
m_Enabled: 1
154-
m_EditorHideFlags: 0
155-
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
156-
m_Name:
157-
m_EditorClassIdentifier:
158-
ConversionMode: 1

Assets/Resources/Prefabs/Gate.prefab

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ GameObject:
1111
- component: {fileID: 7014708109448554416}
1212
- component: {fileID: 3468265542873711340}
1313
- component: {fileID: 3496935618586042827}
14-
- component: {fileID: 1725632542917862126}
1514
m_Layer: 0
1615
m_Name: Gate
1716
m_TagString: Gate
@@ -80,19 +79,6 @@ MonoBehaviour:
8079
Friction: 0.02
8180
GravityFactor: 0.25
8281
_twoWay: 0
83-
--- !u!114 &1725632542917862126
84-
MonoBehaviour:
85-
m_ObjectHideFlags: 0
86-
m_CorrespondingSourceObject: {fileID: 0}
87-
m_PrefabInstance: {fileID: 0}
88-
m_PrefabAsset: {fileID: 0}
89-
m_GameObject: {fileID: 4689510019247135382}
90-
m_Enabled: 1
91-
m_EditorHideFlags: 0
92-
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
93-
m_Name:
94-
m_EditorClassIdentifier:
95-
ConversionMode: 1
9682
--- !u!1 &6497995796854627700
9783
GameObject:
9884
m_ObjectHideFlags: 0

Assets/Resources/Prefabs/Hit Target.prefab

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ GameObject:
1414
- component: {fileID: 6578353461332218210}
1515
- component: {fileID: 8307013672536159350}
1616
- component: {fileID: 16544014384142367}
17-
- component: {fileID: 531720702824142340}
1817
m_Layer: 0
1918
m_Name: Hit Target
2019
m_TagString: Untagged
@@ -32,6 +31,7 @@ Transform:
3231
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3332
m_LocalPosition: {x: 0, y: 0, z: 0}
3433
m_LocalScale: {x: 1, y: 1, z: 1}
34+
m_ConstrainProportionsScale: 0
3535
m_Children: []
3636
m_Father: {fileID: 0}
3737
m_RootOrder: 0
@@ -55,7 +55,8 @@ MonoBehaviour:
5555
Position: {x: 0, y: 0, z: 0}
5656
Rotation: 0
5757
Size: {x: 32, y: 32, z: 32}
58-
MeshName:
58+
_targetType: 1
59+
_meshName:
5960
--- !u!114 &5761113403998387957
6061
MonoBehaviour:
6162
m_ObjectHideFlags: 0
@@ -75,10 +76,8 @@ MonoBehaviour:
7576
ElasticityFalloff: 0.5
7677
Friction: 0.2
7778
Scatter: 5
78-
IsLegacy: 0
7979
OverwritePhysics: 1
8080
Threshold: 2
81-
UseHitEvent: 1
8281
--- !u!114 &6578353461332218210
8382
MonoBehaviour:
8483
m_ObjectHideFlags: 0
@@ -112,6 +111,7 @@ MeshRenderer:
112111
m_CastShadows: 1
113112
m_ReceiveShadows: 1
114113
m_DynamicOccludee: 1
114+
m_StaticShadowCaster: 0
115115
m_MotionVectors: 1
116116
m_LightProbeUsage: 1
117117
m_ReflectionProbeUsage: 1
@@ -142,16 +142,3 @@ MeshRenderer:
142142
m_SortingLayer: 0
143143
m_SortingOrder: 0
144144
m_AdditionalVertexStreams: {fileID: 0}
145-
--- !u!114 &531720702824142340
146-
MonoBehaviour:
147-
m_ObjectHideFlags: 0
148-
m_CorrespondingSourceObject: {fileID: 0}
149-
m_PrefabInstance: {fileID: 0}
150-
m_PrefabAsset: {fileID: 0}
151-
m_GameObject: {fileID: 4811490838886355864}
152-
m_Enabled: 1
153-
m_EditorHideFlags: 0
154-
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
155-
m_Name:
156-
m_EditorClassIdentifier:
157-
ConversionMode: 1

Assets/Resources/Prefabs/Kicker - Hole.prefab

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,18 @@ PrefabInstance:
1919
propertyPath: m_RootOrder
2020
value: 0
2121
objectReference: {fileID: 0}
22+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
23+
propertyPath: m_LocalScale.x
24+
value: 0.013493748
25+
objectReference: {fileID: 0}
26+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
27+
propertyPath: m_LocalScale.y
28+
value: 0.013493748
29+
objectReference: {fileID: 0}
30+
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
31+
propertyPath: m_LocalScale.z
32+
value: 0.013493748
33+
objectReference: {fileID: 0}
2234
- target: {fileID: 5877270596738996132, guid: bf12624bf24e9494c84eaa42ff312f50, type: 3}
2335
propertyPath: m_LocalPosition.x
2436
value: 0

Assets/Resources/Prefabs/Kicker.prefab

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ GameObject:
1313
- component: {fileID: -2035473210646026864}
1414
- component: {fileID: 2254716409977562185}
1515
- component: {fileID: 9085684073653883757}
16-
- component: {fileID: 5688332318531931923}
1716
m_Layer: 0
1817
m_Name: Kicker
1918
m_TagString: Untagged
@@ -31,6 +30,7 @@ Transform:
3130
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3231
m_LocalPosition: {x: 0, y: 0, z: 0}
3332
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_ConstrainProportionsScale: 0
3434
m_Children: []
3535
m_Father: {fileID: 0}
3636
m_RootOrder: 0
@@ -62,6 +62,7 @@ MonoBehaviour:
6262
Angle: 90
6363
Inclination: 0
6464
KickerType: 0
65+
MeshName:
6566
--- !u!114 &-2035473210646026864
6667
MonoBehaviour:
6768
m_ObjectHideFlags: 0
@@ -81,9 +82,8 @@ MonoBehaviour:
8182
HitAccuracy: 0.7
8283
HitHeight: 40
8384
FallThrough: 0
85+
FallIn: 1
8486
LegacyMode: 1
85-
EjectAngle: 90
86-
EjectSpeed: 3
8787
--- !u!33 &2254716409977562185
8888
MeshFilter:
8989
m_ObjectHideFlags: 0
@@ -103,6 +103,7 @@ MeshRenderer:
103103
m_CastShadows: 1
104104
m_ReceiveShadows: 1
105105
m_DynamicOccludee: 1
106+
m_StaticShadowCaster: 0
106107
m_MotionVectors: 1
107108
m_LightProbeUsage: 1
108109
m_ReflectionProbeUsage: 1
@@ -133,16 +134,3 @@ MeshRenderer:
133134
m_SortingLayer: 0
134135
m_SortingOrder: 0
135136
m_AdditionalVertexStreams: {fileID: 0}
136-
--- !u!114 &5688332318531931923
137-
MonoBehaviour:
138-
m_ObjectHideFlags: 0
139-
m_CorrespondingSourceObject: {fileID: 0}
140-
m_PrefabInstance: {fileID: 0}
141-
m_PrefabAsset: {fileID: 0}
142-
m_GameObject: {fileID: 2420819360404407618}
143-
m_Enabled: 1
144-
m_EditorHideFlags: 0
145-
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
146-
m_Name:
147-
m_EditorClassIdentifier:
148-
ConversionMode: 1

Assets/Resources/Prefabs/Spinner.prefab

Lines changed: 13 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ Transform:
2929
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
3030
m_LocalPosition: {x: 0, y: 0, z: 0}
3131
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_ConstrainProportionsScale: 0
3233
m_Children: []
3334
m_Father: {fileID: 1544373133874741422}
3435
m_RootOrder: 1
@@ -64,6 +65,7 @@ MeshRenderer:
6465
m_CastShadows: 1
6566
m_ReceiveShadows: 1
6667
m_DynamicOccludee: 1
68+
m_StaticShadowCaster: 0
6769
m_MotionVectors: 1
6870
m_LightProbeUsage: 1
6971
m_ReflectionProbeUsage: 1
@@ -105,7 +107,6 @@ GameObject:
105107
- component: {fileID: 1544373133874741422}
106108
- component: {fileID: 4041090927828039183}
107109
- component: {fileID: -8167358012222226486}
108-
- component: {fileID: 8363762864822562217}
109110
m_Layer: 0
110111
m_Name: Spinner
111112
m_TagString: Untagged
@@ -123,6 +124,7 @@ Transform:
123124
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
124125
m_LocalPosition: {x: 0, y: 0, z: 0}
125126
m_LocalScale: {x: 1, y: 1, z: 1}
127+
m_ConstrainProportionsScale: 0
126128
m_Children:
127129
- {fileID: 6219072693502205359}
128130
- {fileID: 7410166794513211746}
@@ -141,37 +143,18 @@ MonoBehaviour:
141143
m_Script: {fileID: 11500000, guid: 4a0a88e7fbbf4524f8563c0a2dc75691, type: 3}
142144
m_Name:
143145
m_EditorClassIdentifier:
144-
_data:
145-
StoragePrefix: 0
146-
StorageIndex: -1
147-
IsLocked: 0
148-
EditorLayerName:
149-
EditorLayerVisibility: 1
150-
Name:
151-
Center:
152-
X: 0
153-
Y: 0
154-
Rotation: 0
155-
Material:
156-
ShowBracket: 1
157-
Height: 60
158-
Length: 80
159-
Damping: 0.9879
160-
AngleMax: 0
161-
AngleMin: 0
162-
Elasticity: 0.3
163-
IsVisible: 1
164-
Image:
165-
Surface:
166-
IsTimerEnabled: 0
167-
TimerInterval: 0
146+
_isLocked: 0
147+
_editorLayer: 0
148+
_editorLayerName:
149+
_editorLayerVisibility: 1
150+
Position: {x: 0, y: 0}
168151
Height: 60
152+
Rotation: 0
169153
Length: 80
170154
Damping: 0.9879
171155
AngleMax: 0
172156
AngleMin: 0
173-
Elasticity: 0.3
174-
Surface: {fileID: 0}
157+
_surface: {fileID: 0}
175158
--- !u!114 &-8167358012222226486
176159
MonoBehaviour:
177160
m_ObjectHideFlags: 0
@@ -187,19 +170,7 @@ MonoBehaviour:
187170
PhysicsMaterial: {fileID: 0}
188171
ShowColliderMesh: 0
189172
ShowAabbs: 0
190-
--- !u!114 &8363762864822562217
191-
MonoBehaviour:
192-
m_ObjectHideFlags: 0
193-
m_CorrespondingSourceObject: {fileID: 0}
194-
m_PrefabInstance: {fileID: 0}
195-
m_PrefabAsset: {fileID: 0}
196-
m_GameObject: {fileID: 6563151203485904801}
197-
m_Enabled: 1
198-
m_EditorHideFlags: 0
199-
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
200-
m_Name:
201-
m_EditorClassIdentifier:
202-
ConversionMode: 1
173+
Elasticity: 0.3
203174
--- !u!1 &7122666291571779558
204175
GameObject:
205176
m_ObjectHideFlags: 0
@@ -228,6 +199,7 @@ Transform:
228199
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
229200
m_LocalPosition: {x: 0, y: 0, z: 0}
230201
m_LocalScale: {x: 1, y: 1, z: 1}
202+
m_ConstrainProportionsScale: 0
231203
m_Children: []
232204
m_Father: {fileID: 1544373133874741422}
233205
m_RootOrder: 0
@@ -251,6 +223,7 @@ MeshRenderer:
251223
m_CastShadows: 1
252224
m_ReceiveShadows: 1
253225
m_DynamicOccludee: 1
226+
m_StaticShadowCaster: 0
254227
m_MotionVectors: 1
255228
m_LightProbeUsage: 1
256229
m_ReflectionProbeUsage: 1

0 commit comments

Comments
 (0)