Skip to content

Commit 6c08da5

Browse files
freezyfreezy
committed
Clean up Williams lighting flippers.
1 parent 60684d0 commit 6c08da5

70 files changed

Lines changed: 198 additions & 1426 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Left.prefab‎

Lines changed: 187 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,187 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &1807799404462680055
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: 6852294172980931214}
12+
- component: {fileID: 4814831299086297744}
13+
- component: {fileID: 2015211010257812846}
14+
- component: {fileID: 5573336099998774783}
15+
m_Layer: 0
16+
m_Name: Flipper, Williams, Lightning (2
17+
m_TagString: Untagged
18+
m_Icon: {fileID: 0}
19+
m_NavMeshLayer: 0
20+
m_StaticEditorFlags: 0
21+
m_IsActive: 1
22+
--- !u!4 &6852294172980931214
23+
Transform:
24+
m_ObjectHideFlags: 0
25+
m_CorrespondingSourceObject: {fileID: 0}
26+
m_PrefabInstance: {fileID: 0}
27+
m_PrefabAsset: {fileID: 0}
28+
m_GameObject: {fileID: 1807799404462680055}
29+
m_LocalRotation: {x: 0, y: 0.87035567, z: 0, w: 0.49242356}
30+
m_LocalPosition: {x: 0, y: 0, z: 0}
31+
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_ConstrainProportionsScale: 0
33+
m_Children:
34+
- {fileID: 1933060330275665339}
35+
m_Father: {fileID: 0}
36+
m_RootOrder: 0
37+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
38+
--- !u!114 &4814831299086297744
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: 1807799404462680055}
45+
m_Enabled: 1
46+
m_EditorHideFlags: 0
47+
m_Script: {fileID: 11500000, guid: 545ad741f74d2444faf5d2882fba6b69, 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+
_startAngle: 121
56+
EndAngle: 70
57+
_surface: {fileID: 0}
58+
IsEnabled: 1
59+
IsDualWound: 0
60+
_height: 50
61+
_baseRadius: 20
62+
_endRadius: 10.2
63+
FlipperRadiusMin: 0
64+
FlipperRadiusMax: 117
65+
_rubberThickness: 5.8
66+
_rubberHeight: 17.3
67+
_rubberWidth: 23.3
68+
InstantiateAsPrefab: 0
69+
_originalRotateZ: 0
70+
--- !u!114 &2015211010257812846
71+
MonoBehaviour:
72+
m_ObjectHideFlags: 0
73+
m_CorrespondingSourceObject: {fileID: 0}
74+
m_PrefabInstance: {fileID: 0}
75+
m_PrefabAsset: {fileID: 0}
76+
m_GameObject: {fileID: 1807799404462680055}
77+
m_Enabled: 1
78+
m_EditorHideFlags: 0
79+
m_Script: {fileID: 11500000, guid: 1a6867661ef306b40958372e88a16b2a, type: 3}
80+
m_Name:
81+
m_EditorClassIdentifier:
82+
PhysicsMaterial: {fileID: 0}
83+
ShowColliderMesh: 1
84+
ShowAabbs: 0
85+
Mass: 1
86+
Strength: 2200
87+
Elasticity: 0.8
88+
ElasticityFalloff: 0.43
89+
Friction: 0.6
90+
Return: 0.058
91+
RampUp: 3
92+
TorqueDamping: 0.75
93+
TorqueDampingAngle: 6
94+
Scatter: 0
95+
FlipperCorrection: {fileID: 11400000, guid: f8799be363ab20a459dd185669ece8aa, type: 2}
96+
useFlipperTricksPhysics: 0
97+
SOSRampUp: 2.5
98+
SOSEM: 0.85
99+
EOSReturn: 0.055
100+
EOSTNew: 0.8
101+
EOSANew: 1
102+
EOSRampup: 0
103+
Overshoot: 3
104+
BumpOnRelease: 0.4
105+
useFlipperLiveCatch: 0
106+
LiveCatchDistanceMin: 40
107+
LiveCatchDistanceMax: 100
108+
LiveCatchMinimalBallSpeed: 6
109+
LiveCatchFullTime: 16
110+
LiveCatchPerfectTime: 8
111+
LiveCatchMinmalBounceSpeedMultiplier: 0.1
112+
LiveCatchInaccurateBounceSpeedMultiplier: 1
113+
--- !u!114 &5573336099998774783
114+
MonoBehaviour:
115+
m_ObjectHideFlags: 0
116+
m_CorrespondingSourceObject: {fileID: 0}
117+
m_PrefabInstance: {fileID: 0}
118+
m_PrefabAsset: {fileID: 0}
119+
m_GameObject: {fileID: 1807799404462680055}
120+
m_Enabled: 1
121+
m_EditorHideFlags: 0
122+
m_Script: {fileID: 11500000, guid: ea7d7495833204790ba1d3a8755397f8, type: 3}
123+
m_Name:
124+
m_EditorClassIdentifier:
125+
ConversionMode: 1
126+
--- !u!1001 &8289342304558382543
127+
PrefabInstance:
128+
m_ObjectHideFlags: 0
129+
serializedVersion: 2
130+
m_Modification:
131+
m_TransformParent: {fileID: 6852294172980931214}
132+
m_Modifications:
133+
- target: {fileID: 7102709206781481678, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
134+
propertyPath: m_Name
135+
value: Williams, Lightning (2.875in)
136+
objectReference: {fileID: 0}
137+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
138+
propertyPath: m_RootOrder
139+
value: 0
140+
objectReference: {fileID: 0}
141+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
142+
propertyPath: m_LocalPosition.x
143+
value: 0
144+
objectReference: {fileID: 0}
145+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
146+
propertyPath: m_LocalPosition.y
147+
value: -0
148+
objectReference: {fileID: 0}
149+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
150+
propertyPath: m_LocalPosition.z
151+
value: 0
152+
objectReference: {fileID: 0}
153+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
154+
propertyPath: m_LocalRotation.w
155+
value: 1
156+
objectReference: {fileID: 0}
157+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
158+
propertyPath: m_LocalRotation.x
159+
value: 0
160+
objectReference: {fileID: 0}
161+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
162+
propertyPath: m_LocalRotation.y
163+
value: 0
164+
objectReference: {fileID: 0}
165+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
166+
propertyPath: m_LocalRotation.z
167+
value: 0
168+
objectReference: {fileID: 0}
169+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
170+
propertyPath: m_LocalEulerAnglesHint.x
171+
value: 0
172+
objectReference: {fileID: 0}
173+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
174+
propertyPath: m_LocalEulerAnglesHint.y
175+
value: 0
176+
objectReference: {fileID: 0}
177+
- target: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
178+
propertyPath: m_LocalEulerAnglesHint.z
179+
value: 0
180+
objectReference: {fileID: 0}
181+
m_RemovedComponents: []
182+
m_SourcePrefab: {fileID: 100100000, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
183+
--- !u!4 &1933060330275665339 stripped
184+
Transform:
185+
m_CorrespondingSourceObject: {fileID: 7627466956121770100, guid: 1bb1089dcf242ee488043d46596b22cd, type: 3}
186+
m_PrefabInstance: {fileID: 8289342304558382543}
187+
m_PrefabAsset: {fileID: 0}

Assets/Library/Flipper/Williams/Flipper Bat Williams 3 Inch (Left).prefab.meta renamed to Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Left.prefab.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Library/Flipper/Williams, Lightning (2.875in)/Williams, Lightning (2.875in) - Plastic Red.mat renamed to Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Plastic Red.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: Williams, Lightning (2
10+
m_Name: Flipper, Williams, Lightning (2
1111
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
1212
m_ValidKeywords:
1313
- _DISABLE_SSR_TRANSPARENT

Assets/Library/Flipper/Williams, Lightning (2.875in)/Williams, Lightning (2.875in) - Plastic Red.mat.meta renamed to Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Plastic Red.mat.meta

File renamed without changes.

Assets/Library/Flipper/Williams, Lightning (2.875in)/Williams, Lightning (2.875in) - Plastic White.mat renamed to Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Plastic White.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: Williams, Lightning (2
10+
m_Name: Flipper, Williams, Lightning (2
1111
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
1212
m_ValidKeywords:
1313
- _DISABLE_SSR_TRANSPARENT

Assets/Library/Flipper/Williams, Lightning (2.875in)/Williams, Lightning (2.875in) - Plastic White.mat.meta renamed to Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Plastic White.mat.meta

File renamed without changes.

Assets/Library/Flipper/Williams, Lightning (2.875in)/Williams, Lightning (2.875in) - Plastic Yellow.mat renamed to Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Plastic Yellow.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: Williams, Lightning (2.875in) - Plastic Yellow
10+
m_Name: Flipper, Williams, Lightning (2
1111
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
1212
m_ValidKeywords:
1313
- _DISABLE_SSR_TRANSPARENT

Assets/Library/Flipper/Williams, Lightning (2.875in)/Williams, Lightning (2.875in) - Plastic Yellow.mat.meta renamed to Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Plastic Yellow.mat.meta

File renamed without changes.

Assets/Library/Flipper/Williams, Lightning (2.875in)/Williams, Lightning (2.875in) - Rubber Black.mat renamed to Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Rubber Black.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: Williams, Lightning (2
10+
m_Name: Flipper, Williams, Lightning (2
1111
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
1212
m_ValidKeywords:
1313
- _DISABLE_SSR_TRANSPARENT

Assets/Library/Flipper/Williams, Lightning (2.875in)/Williams, Lightning (2.875in) - Rubber Black.mat.meta renamed to Assets/Library/Flipper/Williams, Lightning (2.875in)/Flipper, Williams, Lightning (2.875in) - Rubber Black.mat.meta

File renamed without changes.

0 commit comments

Comments
 (0)