Skip to content

Commit 76d3ef4

Browse files
freezyfreezy
committed
gate: Use meshes from FBX file and fix scaling.
1 parent c19ad3d commit 76d3ef4

File tree

5 files changed

+38
-10
lines changed

5 files changed

+38
-10
lines changed

‎Assets/Resources/Prefabs/Gate - Long Plate.prefab‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 0}
910
m_Modifications:
1011
- target: {fileID: 2012952979694143057, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
@@ -15,6 +16,10 @@ PrefabInstance:
1516
propertyPath: m_Name
1617
value: Gate - Long Plate
1718
objectReference: {fileID: 0}
19+
- target: {fileID: 5934777780303694896, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
20+
propertyPath: m_Mesh
21+
value:
22+
objectReference: {fileID: -3605029237302266654, guid: f7b77729178432248a07efe02e9f5752, type: 3}
1823
- target: {fileID: 7014708109448554416, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
1924
propertyPath: m_RootOrder
2025
value: 0
@@ -66,6 +71,9 @@ PrefabInstance:
6671
- target: {fileID: 7906856659845120077, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
6772
propertyPath: m_Mesh
6873
value:
69-
objectReference: {fileID: 4300000, guid: a8ca1390ec4bbfa4b8ba55eaf0e60911, type: 2}
74+
objectReference: {fileID: -448636328567412366, guid: f7b77729178432248a07efe02e9f5752, type: 3}
7075
m_RemovedComponents: []
76+
m_RemovedGameObjects: []
77+
m_AddedGameObjects: []
78+
m_AddedComponents: []
7179
m_SourcePrefab: {fileID: 100100000, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}

‎Assets/Resources/Prefabs/Gate - Plate.prefab‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 0}
910
m_Modifications:
1011
- target: {fileID: 2012952979694143057, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
@@ -66,6 +67,9 @@ PrefabInstance:
6667
- target: {fileID: 7906856659845120077, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
6768
propertyPath: m_Mesh
6869
value:
69-
objectReference: {fileID: 4300000, guid: 10294356d8e9e5f49b0a8205a50a231d, type: 2}
70+
objectReference: {fileID: -5578165834312501777, guid: f7b77729178432248a07efe02e9f5752, type: 3}
7071
m_RemovedComponents: []
72+
m_RemovedGameObjects: []
73+
m_AddedGameObjects: []
74+
m_AddedComponents: []
7175
m_SourcePrefab: {fileID: 100100000, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}

‎Assets/Resources/Prefabs/Gate - Wire Rectangle.prefab‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 0}
910
m_Modifications:
1011
- target: {fileID: 2012952979694143057, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
@@ -15,6 +16,10 @@ PrefabInstance:
1516
propertyPath: m_Name
1617
value: Gate - Wire Rectangle
1718
objectReference: {fileID: 0}
19+
- target: {fileID: 5934777780303694896, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
20+
propertyPath: m_Mesh
21+
value:
22+
objectReference: {fileID: 3748382445984247160, guid: f7b77729178432248a07efe02e9f5752, type: 3}
1823
- target: {fileID: 7014708109448554416, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
1924
propertyPath: m_RootOrder
2025
value: 0
@@ -66,6 +71,9 @@ PrefabInstance:
6671
- target: {fileID: 7906856659845120077, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
6772
propertyPath: m_Mesh
6873
value:
69-
objectReference: {fileID: 4300000, guid: 7acf0d2e27548b9468aee732b53307d5, type: 2}
74+
objectReference: {fileID: 6729438931495173720, guid: f7b77729178432248a07efe02e9f5752, type: 3}
7075
m_RemovedComponents: []
76+
m_RemovedGameObjects: []
77+
m_AddedGameObjects: []
78+
m_AddedComponents: []
7179
m_SourcePrefab: {fileID: 100100000, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}

‎Assets/Resources/Prefabs/Gate - Wire W.prefab‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ PrefabInstance:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Modification:
8+
serializedVersion: 3
89
m_TransformParent: {fileID: 0}
910
m_Modifications:
1011
- target: {fileID: 2012952979694143057, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
@@ -15,6 +16,10 @@ PrefabInstance:
1516
propertyPath: m_Name
1617
value: Gate - Wire W
1718
objectReference: {fileID: 0}
19+
- target: {fileID: 5934777780303694896, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
20+
propertyPath: m_Mesh
21+
value:
22+
objectReference: {fileID: -6366382902508278438, guid: f7b77729178432248a07efe02e9f5752, type: 3}
1823
- target: {fileID: 7014708109448554416, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
1924
propertyPath: m_RootOrder
2025
value: 0
@@ -66,6 +71,9 @@ PrefabInstance:
6671
- target: {fileID: 7906856659845120077, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}
6772
propertyPath: m_Mesh
6873
value:
69-
objectReference: {fileID: 4300000, guid: 9769cadf367235440b2bf43056c012f7, type: 2}
74+
objectReference: {fileID: 1795337771752254519, guid: f7b77729178432248a07efe02e9f5752, type: 3}
7075
m_RemovedComponents: []
76+
m_RemovedGameObjects: []
77+
m_AddedGameObjects: []
78+
m_AddedComponents: []
7179
m_SourcePrefab: {fileID: 100100000, guid: 39866beefccc860418d80ae53ef5ba09, type: 3}

‎Assets/Resources/Prefabs/Gate.prefab‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ Transform:
2525
m_PrefabInstance: {fileID: 0}
2626
m_PrefabAsset: {fileID: 0}
2727
m_GameObject: {fileID: 4689510019247135382}
28+
serializedVersion: 2
2829
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2930
m_LocalPosition: {x: 0, y: 0, z: 0}
3031
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -33,7 +34,6 @@ Transform:
3334
- {fileID: 6622806185196320941}
3435
- {fileID: 2980705729845053989}
3536
m_Father: {fileID: 0}
36-
m_RootOrder: 0
3737
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3838
--- !u!114 &3468265542873711340
3939
MonoBehaviour:
@@ -51,8 +51,6 @@ MonoBehaviour:
5151
_editorLayer: 0
5252
_editorLayerName:
5353
_editorLayerVisibility: 1
54-
Position: {x: 0, y: 0, z: 0}
55-
_rotation: 0
5654
_length: 100
5755
_surface: {fileID: 0}
5856
_type: 0
@@ -71,6 +69,7 @@ MonoBehaviour:
7169
m_EditorClassIdentifier:
7270
PhysicsMaterial: {fileID: 0}
7371
ShowColliderMesh: 0
72+
ShowColliderOctree: 0
7473
ShowAabbs: 0
7574
_angleMax: 90
7675
_angleMin: 0
@@ -79,6 +78,7 @@ MonoBehaviour:
7978
Friction: 0.02
8079
GravityFactor: 0.25
8180
_twoWay: 0
81+
_isKinematic: 0
8282
--- !u!1 &6497995796854627700
8383
GameObject:
8484
m_ObjectHideFlags: 0
@@ -104,13 +104,13 @@ Transform:
104104
m_PrefabInstance: {fileID: 0}
105105
m_PrefabAsset: {fileID: 0}
106106
m_GameObject: {fileID: 6497995796854627700}
107+
serializedVersion: 2
107108
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
108109
m_LocalPosition: {x: 0, y: 0, z: 0}
109110
m_LocalScale: {x: 1, y: 1, z: 1}
110111
m_ConstrainProportionsScale: 0
111112
m_Children: []
112113
m_Father: {fileID: 7014708109448554416}
113-
m_RootOrder: 0
114114
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
115115
--- !u!33 &5934777780303694896
116116
MeshFilter:
@@ -119,7 +119,7 @@ MeshFilter:
119119
m_PrefabInstance: {fileID: 0}
120120
m_PrefabAsset: {fileID: 0}
121121
m_GameObject: {fileID: 6497995796854627700}
122-
m_Mesh: {fileID: 4300000, guid: 7fa0b44495abba04c9aaed0dcfd513f5, type: 2}
122+
m_Mesh: {fileID: 5571604379467031474, guid: f7b77729178432248a07efe02e9f5752, type: 3}
123123
--- !u!23 &2012952979694143057
124124
MeshRenderer:
125125
m_ObjectHideFlags: 0
@@ -188,13 +188,13 @@ Transform:
188188
m_PrefabInstance: {fileID: 0}
189189
m_PrefabAsset: {fileID: 0}
190190
m_GameObject: {fileID: 6797621395313525970}
191+
serializedVersion: 2
191192
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
192193
m_LocalPosition: {x: 0, y: 0, z: 0}
193194
m_LocalScale: {x: 1, y: 1, z: 1}
194195
m_ConstrainProportionsScale: 0
195196
m_Children: []
196197
m_Father: {fileID: 7014708109448554416}
197-
m_RootOrder: 1
198198
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
199199
--- !u!114 &8205464296606553136
200200
MonoBehaviour:

0 commit comments

Comments
 (0)