Skip to content

Commit 1997c4b

Browse files
freezyfreezy
committed
Update: prefabs.
1 parent 9065c4f commit 1997c4b

File tree

4 files changed

+60
-30
lines changed

4 files changed

+60
-30
lines changed

‎Assets/Resources/Prefabs/Flipper.prefab‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@ MonoBehaviour:
4545
m_Script: {fileID: 11500000, guid: 8e6fc321830c03547890119a04997404, type: 3}
4646
m_Name:
4747
m_EditorClassIdentifier:
48+
_playfieldDimensions: {x: 0, y: 0}
4849
_instanceID: 51956
4950
--- !u!33 &4778019510121147183
5051
MeshFilter:
@@ -99,6 +100,7 @@ MonoBehaviour:
99100
m_Script: {fileID: 11500000, guid: 89e3c1c147bb7a049b0510709f1ad9f2, type: 3}
100101
m_Name:
101102
m_EditorClassIdentifier:
103+
_playfieldDimensions: {x: 0, y: 0}
102104
_instanceID: 51936
103105
--- !u!33 &8383588224779965405
104106
MeshFilter:
@@ -156,14 +158,10 @@ MonoBehaviour:
156158
m_Script: {fileID: 11500000, guid: 545ad741f74d2444faf5d2882fba6b69, type: 3}
157159
m_Name:
158160
m_EditorClassIdentifier:
159-
_isLocked: 0
160161
_editorLayer: 0
161162
_editorLayerName:
162163
_editorLayerVisibility: 1
163-
Position: {x: 0, y: 0}
164-
_startAngle: 121
165164
EndAngle: 70
166-
_surface: {fileID: 0}
167165
IsEnabled: 1
168166
IsDualWound: 0
169167
_height: 50
@@ -175,7 +173,6 @@ MonoBehaviour:
175173
_rubberHeight: 19
176174
_rubberWidth: 24
177175
InstantiateAsPrefab: 0
178-
_originalRotateZ: 0
179176
--- !u!114 &8750544366699972018
180177
MonoBehaviour:
181178
m_ObjectHideFlags: 0
@@ -192,6 +189,7 @@ MonoBehaviour:
192189
ShowColliderMesh: 1
193190
ShowColliderOctree: 0
194191
ShowAabbs: 0
192+
_isKinematic: 0
195193
Mass: 1
196194
Strength: 2200
197195
Elasticity: 0.8
@@ -203,6 +201,7 @@ MonoBehaviour:
203201
TorqueDampingAngle: 6
204202
Scatter: 0
205203
FlipperCorrection: {fileID: 11400000, guid: f8799be363ab20a459dd185669ece8aa, type: 2}
204+
TriggerItemId: 0
206205
useFlipperTricksPhysics: 0
207206
SOSRampUp: 2.5
208207
SOSEM: 0.85
@@ -232,9 +231,11 @@ MonoBehaviour:
232231
m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3}
233232
m_Name:
234233
m_EditorClassIdentifier:
235-
_soundAsset: {fileID: 11400000, guid: e410f0a19022a1a49b7a2dd9226ae7d1, type: 2}
236-
_interrupt: 0
237-
_volume: 1
238-
_startWhen: 0
239-
_stopWhen: 0
240-
_coilName: main_coil
234+
SoundAsset: {fileID: 0}
235+
MultiPlayMode: 0
236+
Volume: 1
237+
Priority: 2
238+
CalloutMaxQueueTime: -1
239+
StartWhen: 0
240+
StopWhen: 0
241+
CoilName: main_coil

‎Assets/Resources/Prefabs/Plunger.prefab‎

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ GameObject:
1111
- component: {fileID: 2688967276888975725}
1212
- component: {fileID: 8461769246571476234}
1313
- component: {fileID: 4360165373544367127}
14+
- component: {fileID: 5176043116475604806}
1415
- component: {fileID: 758323825446027854}
1516
- component: {fileID: 6875191637992584632}
1617
m_Layer: 0
@@ -49,15 +50,11 @@ MonoBehaviour:
4950
m_Script: {fileID: 11500000, guid: c1591b5a0bc15604fb622d417b509185, type: 3}
5051
m_Name:
5152
m_EditorClassIdentifier:
52-
_isLocked: 0
5353
_editorLayer: 0
5454
_editorLayerName:
5555
_editorLayerVisibility: 1
56-
Position: {x: 0, y: 0}
5756
Width: 25
5857
Height: 20
59-
ZAdjust: 0
60-
_surface: {fileID: 0}
6158
analogPlungerAction: {fileID: 0}
6259
--- !u!114 &4360165373544367127
6360
MonoBehaviour:
@@ -75,6 +72,7 @@ MonoBehaviour:
7572
ShowColliderMesh: 1
7673
ShowColliderOctree: 0
7774
ShowAabbs: 0
75+
_isKinematic: 0
7876
SpeedPull: 0.5
7977
SpeedFire: 80
8078
Stroke: 80
@@ -84,6 +82,19 @@ MonoBehaviour:
8482
MechStrength: 85
8583
MomentumXfer: 1
8684
ParkPosition: 0.16666667
85+
--- !u!114 &5176043116475604806
86+
MonoBehaviour:
87+
m_ObjectHideFlags: 0
88+
m_CorrespondingSourceObject: {fileID: 0}
89+
m_PrefabInstance: {fileID: 0}
90+
m_PrefabAsset: {fileID: 0}
91+
m_GameObject: {fileID: 3492958815385962431}
92+
m_Enabled: 1
93+
m_EditorHideFlags: 0
94+
m_Script: {fileID: 11500000, guid: c6b1de2c064d491a918191247fa07588, type: 3}
95+
m_Name:
96+
m_EditorClassIdentifier:
97+
_emitter: {fileID: 0}
8798
--- !u!114 &758323825446027854
8899
MonoBehaviour:
89100
m_ObjectHideFlags: 0
@@ -96,12 +107,14 @@ MonoBehaviour:
96107
m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3}
97108
m_Name:
98109
m_EditorClassIdentifier:
99-
_soundAsset: {fileID: 11400000, guid: 29e4e44178845b941a136cf944a6b484, type: 2}
100-
_interrupt: 0
101-
_volume: 1
102-
_startWhen: 0
103-
_stopWhen: 0
104-
_coilName: c_pull
110+
SoundAsset: {fileID: 0}
111+
MultiPlayMode: 0
112+
Volume: 1
113+
Priority: 2
114+
CalloutMaxQueueTime: -1
115+
StartWhen: 0
116+
StopWhen: 0
117+
CoilName: c_pull
105118
--- !u!114 &6875191637992584632
106119
MonoBehaviour:
107120
m_ObjectHideFlags: 0
@@ -114,12 +127,14 @@ MonoBehaviour:
114127
m_Script: {fileID: 11500000, guid: b1b4677b6b0e8bc419afb6cd7a22cf3a, type: 3}
115128
m_Name:
116129
m_EditorClassIdentifier:
117-
_soundAsset: {fileID: 11400000, guid: 1db86f03e09f46740a32096157585e5d, type: 2}
118-
_interrupt: 0
119-
_volume: 1
120-
_startWhen: 1
121-
_stopWhen: 0
122-
_coilName: c_pull
130+
SoundAsset: {fileID: 0}
131+
MultiPlayMode: 0
132+
Volume: 1
133+
Priority: 2
134+
CalloutMaxQueueTime: -1
135+
StartWhen: 0
136+
StopWhen: 0
137+
CoilName: c_pull
123138
--- !u!1 &3501041183407321805
124139
GameObject:
125140
m_ObjectHideFlags: 0
@@ -165,7 +180,8 @@ MonoBehaviour:
165180
m_Script: {fileID: 11500000, guid: 8506b0486aacff543b92dd7de914f936, type: 3}
166181
m_Name:
167182
m_EditorClassIdentifier:
168-
_instanceID: 53948
183+
_playfieldDimensions: {x: 0, y: 0}
184+
_instanceID: 573442
169185
SpringDiam: 0.77
170186
SpringGauge: 1.38
171187
SpringLoops: 8
@@ -223,7 +239,8 @@ MonoBehaviour:
223239
m_Script: {fileID: 11500000, guid: 6e7622b4c6837354c8190ee471830c31, type: 3}
224240
m_Name:
225241
m_EditorClassIdentifier:
226-
_instanceID: 53944
242+
_playfieldDimensions: {x: 0, y: 0}
243+
_instanceID: 573438
227244
RodDiam: 0.6
228245
RingGap: 2
229246
RingDiam: 0.94

‎Editor/PrefabProvider.cs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,16 +91,22 @@ public GameObject CreateHitTarget(int type)
9191
var targetsPath = $"{AssetLibraryPath}/Targets/VPX";
9292
switch (type) {
9393
case TargetType.HitFatTargetRectangle:
94+
// -6.65565 mm
9495
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Rectangle, Fat (VPX).prefab");
9596
case TargetType.HitFatTargetSlim:
97+
// -6.31809 mm
9698
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Narrow, Fat (VPX).prefab");
9799
case TargetType.HitFatTargetSquare:
100+
// -6.67557 mm
98101
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Square, Fat (VPX).prefab");
99102
case TargetType.HitTargetRectangle:
103+
// -4.96337 mm
100104
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Rectangle (VPX).prefab");
101105
case TargetType.HitTargetRound:
106+
// -4.97161 mm
102107
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Round (VPX).prefab");
103108
case TargetType.HitTargetSlim:
109+
// -7.94514 mm
104110
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Hit Target - Narrow (VPX).prefab");
105111
default:
106112
throw new ArgumentException(nameof(type), $"Unknown hit target type {type}.");
@@ -112,10 +118,13 @@ public GameObject CreateDropTarget(int type)
112118
var targetsPath = $"{AssetLibraryPath}/Targets/VPX";
113119
switch (type) {
114120
case TargetType.DropTargetBeveled:
121+
// -5.22032 mm
115122
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Drop Target - Beveled (VPX).prefab");
116123
case TargetType.DropTargetFlatSimple:
124+
// -8.58968 mm
117125
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Drop Target - Simple, Flat (VPX).prefab");
118126
case TargetType.DropTargetSimple:
127+
// -5.12326 mm
119128
return AssetDatabase.LoadAssetAtPath<GameObject>($"{targetsPath}/Drop Target - Simple (VPX).prefab");
120129
default:
121130
throw new ArgumentException(nameof(type), $"Unknown drop target type {type}.");

‎LookDev~/.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,12 @@ crashlytics-build.properties
6666
# Packed Addressables
6767
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
6868

69-
# Temporary auto-generated Android Assets
69+
/UIElementsSchema/*
7070
/[Aa]ssets/[Ss]treamingAssets/aa.meta
7171
/[Aa]ssets/[Ss]treamingAssets/aa/*
72+
/[Aa]ssets/Asset Cleaner/*
73+
/[Aa]ssets/TextMesh Pro/*
74+
/[Aa]ssets/Samples/*
7275
/[Aa]ssets/Tables/*
7376
/[Aa]ssets/Tables.meta
7477
Build~/**

0 commit comments

Comments
 (0)