Skip to content

Commit 6d61219

Browse files
committed
bumper: Rename assets.
1 parent 689c569 commit 6d61219

File tree

9 files changed

+8
-17
lines changed

9 files changed

+8
-17
lines changed

Assets/Art/Materials/Visual Pinball/Bumper Base.mat renamed to Assets/Art/Materials/Visual Pinball/Bumper (Base).mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Material:
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
23-
m_Name: Bumper Base
23+
m_Name: Bumper (Base)
2424
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
2525
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
2626
m_LightmapFlags: 4
File renamed without changes.

Assets/Art/Materials/Visual Pinball/Bumper Cap.mat renamed to Assets/Art/Materials/Visual Pinball/Bumper (Cap).mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Material:
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
23-
m_Name: Bumper Cap
23+
m_Name: Bumper (Cap)
2424
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
2525
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE
2626
_SURFACE_TYPE_TRANSPARENT
File renamed without changes.

Assets/Art/Materials/Visual Pinball/Bumper Ring.mat renamed to Assets/Art/Materials/Visual Pinball/Bumper (Ring).mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ Material:
2020
m_CorrespondingSourceObject: {fileID: 0}
2121
m_PrefabInstance: {fileID: 0}
2222
m_PrefabAsset: {fileID: 0}
23-
m_Name: Bumper Ring
23+
m_Name: Bumper (Ring)
2424
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
2525
m_ShaderKeywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
2626
m_LightmapFlags: 4
File renamed without changes.

Assets/Art/Materials/Visual Pinball/Bumper Skirt.mat renamed to Assets/Art/Materials/Visual Pinball/Bumper (Skirt).mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Material:
2222
m_CorrespondingSourceObject: {fileID: 0}
2323
m_PrefabInstance: {fileID: 0}
2424
m_PrefabAsset: {fileID: 0}
25-
m_Name: Bumper Skirt
25+
m_Name: Bumper (Skirt)
2626
m_Shader: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
2727
m_ShaderKeywords: _AXF_BRDF_TYPE_SVBRDF _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP
2828
_NORMALMAP_TANGENT_SPACE
File renamed without changes.

Assets/Resources/Prefabs/Bumper.prefab

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,6 @@ MonoBehaviour:
8181
IsReflectionEnabled: 0
8282
IsTimerEnabled: 0
8383
TimerInterval: 0
84-
Radius: 45
85-
Orientation: 0
86-
Surface: {fileID: 0}
8784
--- !u!114 &1813312543483188556
8885
MonoBehaviour:
8986
m_ObjectHideFlags: 0
@@ -99,10 +96,6 @@ MonoBehaviour:
9996
PhysicsMaterial: {fileID: 0}
10097
ShowColliderMesh: 0
10198
ShowAabbs: 0
102-
Threshold: 1
103-
Force: 15
104-
Scatter: 0
105-
HitEvent: 1
10699
--- !u!114 &558255656085877858
107100
MonoBehaviour:
108101
m_ObjectHideFlags: 0
@@ -155,7 +148,7 @@ MeshFilter:
155148
m_PrefabInstance: {fileID: 0}
156149
m_PrefabAsset: {fileID: 0}
157150
m_GameObject: {fileID: 2782857395794746971}
158-
m_Mesh: {fileID: 4300000, guid: d55cf3bf545887f439aa6732b5ef7598, type: 2}
151+
m_Mesh: {fileID: 4300000, guid: 23cba34ca423ac64598eb00a6c49c21d, type: 2}
159152
--- !u!23 &8557801633222693968
160153
MeshRenderer:
161154
m_ObjectHideFlags: 0
@@ -242,16 +235,14 @@ MonoBehaviour:
242235
m_Script: {fileID: 11500000, guid: aff42798b4f4d7149b76ac24b29d83db, type: 3}
243236
m_Name:
244237
m_EditorClassIdentifier:
245-
RingSpeed: 0.5
246-
RingDropOffset: 0
247238
--- !u!33 &2838277533150802644
248239
MeshFilter:
249240
m_ObjectHideFlags: 0
250241
m_CorrespondingSourceObject: {fileID: 0}
251242
m_PrefabInstance: {fileID: 0}
252243
m_PrefabAsset: {fileID: 0}
253244
m_GameObject: {fileID: 4831611243493218810}
254-
m_Mesh: {fileID: 4300000, guid: d233abba9e49dd2479ef4d56c762ba35, type: 2}
245+
m_Mesh: {fileID: 4300000, guid: 9ab275eadf37d214e9b19f950656e126, type: 2}
255246
--- !u!23 &2116278473410869078
256247
MeshRenderer:
257248
m_ObjectHideFlags: 0
@@ -345,7 +336,7 @@ MeshFilter:
345336
m_PrefabInstance: {fileID: 0}
346337
m_PrefabAsset: {fileID: 0}
347338
m_GameObject: {fileID: 5455811174752170985}
348-
m_Mesh: {fileID: 4300000, guid: e22c94cc99fd0ca4390520da39cba2f7, type: 2}
339+
m_Mesh: {fileID: 4300000, guid: 1c6eae054101b3d48b5866f6672ff86b, type: 2}
349340
--- !u!23 &4142735908450955278
350341
MeshRenderer:
351342
m_ObjectHideFlags: 0
@@ -426,7 +417,7 @@ MeshFilter:
426417
m_PrefabInstance: {fileID: 0}
427418
m_PrefabAsset: {fileID: 0}
428419
m_GameObject: {fileID: 5797145664016368702}
429-
m_Mesh: {fileID: 4300000, guid: d733957a228d7614b8c1cf56b3259de1, type: 2}
420+
m_Mesh: {fileID: 4300000, guid: 126ef1edc4ca89d438ecf6fcc62d59fe, type: 2}
430421
--- !u!23 &2855870074223701206
431422
MeshRenderer:
432423
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)