Skip to content
This repository was archived by the owner on Oct 20, 2021. It is now read-only.

Commit 3ef63b1

Browse files
mbirkettsmithzeroZshadow
authored andcommitted
Health pickup prefab art fix - Reassigned material to missing material in pickup prefab (#133)
1 parent 33f19ac commit 3ef63b1

File tree

1 file changed

+129
-125
lines changed

1 file changed

+129
-125
lines changed

workers/unity/Assets/Fps/Prefabs/HealthPickup.prefab

Lines changed: 129 additions & 125 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,11 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1001 &100100000
4-
Prefab:
5-
m_ObjectHideFlags: 1
6-
serializedVersion: 2
7-
m_Modification:
8-
m_TransformParent: {fileID: 0}
9-
m_Modifications: []
10-
m_RemovedComponents: []
11-
m_SourcePrefab: {fileID: 0}
12-
m_RootGameObject: {fileID: 1466186237968154}
13-
m_IsPrefabAsset: 1
143
--- !u!1 &1466186237968154
154
GameObject:
165
m_ObjectHideFlags: 0
176
m_CorrespondingSourceObject: {fileID: 0}
18-
m_PrefabInternal: {fileID: 100100000}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
199
serializedVersion: 6
2010
m_Component:
2111
- component: {fileID: 4098788009680278}
@@ -27,11 +17,44 @@ GameObject:
2717
m_NavMeshLayer: 0
2818
m_StaticEditorFlags: 0
2919
m_IsActive: 1
20+
--- !u!4 &4098788009680278
21+
Transform:
22+
m_ObjectHideFlags: 0
23+
m_CorrespondingSourceObject: {fileID: 0}
24+
m_PrefabInstance: {fileID: 0}
25+
m_PrefabAsset: {fileID: 0}
26+
m_GameObject: {fileID: 1466186237968154}
27+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28+
m_LocalPosition: {x: 0, y: 0, z: 3.685}
29+
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
30+
m_Children:
31+
- {fileID: 4008993411819740}
32+
- {fileID: 4896808265088638}
33+
m_Father: {fileID: 0}
34+
m_RootOrder: 0
35+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
--- !u!54 &54750521425877476
37+
Rigidbody:
38+
m_ObjectHideFlags: 0
39+
m_CorrespondingSourceObject: {fileID: 0}
40+
m_PrefabInstance: {fileID: 0}
41+
m_PrefabAsset: {fileID: 0}
42+
m_GameObject: {fileID: 1466186237968154}
43+
serializedVersion: 2
44+
m_Mass: 1
45+
m_Drag: 0
46+
m_AngularDrag: 0.05
47+
m_UseGravity: 0
48+
m_IsKinematic: 1
49+
m_Interpolate: 0
50+
m_Constraints: 0
51+
m_CollisionDetection: 0
3052
--- !u!1 &1521248954019730
3153
GameObject:
3254
m_ObjectHideFlags: 0
3355
m_CorrespondingSourceObject: {fileID: 0}
34-
m_PrefabInternal: {fileID: 100100000}
56+
m_PrefabInstance: {fileID: 0}
57+
m_PrefabAsset: {fileID: 0}
3558
serializedVersion: 6
3659
m_Component:
3760
- component: {fileID: 4008993411819740}
@@ -46,28 +69,12 @@ GameObject:
4669
m_NavMeshLayer: 0
4770
m_StaticEditorFlags: 0
4871
m_IsActive: 1
49-
--- !u!1 &1624874677666840
50-
GameObject:
51-
m_ObjectHideFlags: 0
52-
m_CorrespondingSourceObject: {fileID: 0}
53-
m_PrefabInternal: {fileID: 100100000}
54-
serializedVersion: 6
55-
m_Component:
56-
- component: {fileID: 4896808265088638}
57-
- component: {fileID: 33229141541398220}
58-
- component: {fileID: 23183507152248366}
59-
m_Layer: 0
60-
m_Name: Base
61-
m_TagString: Untagged
62-
m_Icon: {fileID: 0}
63-
m_NavMeshLayer: 0
64-
m_StaticEditorFlags: 0
65-
m_IsActive: 1
6672
--- !u!4 &4008993411819740
6773
Transform:
68-
m_ObjectHideFlags: 1
74+
m_ObjectHideFlags: 0
6975
m_CorrespondingSourceObject: {fileID: 0}
70-
m_PrefabInternal: {fileID: 100100000}
76+
m_PrefabInstance: {fileID: 0}
77+
m_PrefabAsset: {fileID: 0}
7178
m_GameObject: {fileID: 1521248954019730}
7279
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
7380
m_LocalPosition: {x: 0, y: 2, z: 0}
@@ -76,40 +83,13 @@ Transform:
7683
m_Father: {fileID: 4098788009680278}
7784
m_RootOrder: 0
7885
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
79-
--- !u!4 &4098788009680278
80-
Transform:
81-
m_ObjectHideFlags: 1
82-
m_CorrespondingSourceObject: {fileID: 0}
83-
m_PrefabInternal: {fileID: 100100000}
84-
m_GameObject: {fileID: 1466186237968154}
85-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
86-
m_LocalPosition: {x: 0, y: 0, z: 3.685}
87-
m_LocalScale: {x: 0.5, y: 0.5, z: 0.5}
88-
m_Children:
89-
- {fileID: 4008993411819740}
90-
- {fileID: 4896808265088638}
91-
m_Father: {fileID: 0}
92-
m_RootOrder: 0
93-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
94-
--- !u!4 &4896808265088638
95-
Transform:
96-
m_ObjectHideFlags: 1
97-
m_CorrespondingSourceObject: {fileID: 0}
98-
m_PrefabInternal: {fileID: 100100000}
99-
m_GameObject: {fileID: 1624874677666840}
100-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
101-
m_LocalPosition: {x: 0, y: 1.1, z: 0}
102-
m_LocalScale: {x: 1.5, y: 0.1, z: 1.5}
103-
m_Children: []
104-
m_Father: {fileID: 4098788009680278}
105-
m_RootOrder: 1
106-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
107-
--- !u!23 &23183507152248366
86+
--- !u!23 &23635887951003292
10887
MeshRenderer:
109-
m_ObjectHideFlags: 1
88+
m_ObjectHideFlags: 0
11089
m_CorrespondingSourceObject: {fileID: 0}
111-
m_PrefabInternal: {fileID: 100100000}
112-
m_GameObject: {fileID: 1624874677666840}
90+
m_PrefabInstance: {fileID: 0}
91+
m_PrefabAsset: {fileID: 0}
92+
m_GameObject: {fileID: 1521248954019730}
11393
m_Enabled: 1
11494
m_CastShadows: 1
11595
m_ReceiveShadows: 1
@@ -118,8 +98,9 @@ MeshRenderer:
11898
m_LightProbeUsage: 1
11999
m_ReflectionProbeUsage: 1
120100
m_RenderingLayerMask: 4294967295
101+
m_RendererPriority: 0
121102
m_Materials:
122-
- {fileID: 2100000, guid: 1feae1a71b7bb074cb0272d467e6e00f, type: 2}
103+
- {fileID: 2100000, guid: f764914129d5d524992b5c737dfb0408, type: 2}
123104
m_StaticBatchInfo:
124105
firstSubMesh: 0
125106
subMeshCount: 0
@@ -139,22 +120,100 @@ MeshRenderer:
139120
m_SortingLayerID: 0
140121
m_SortingLayer: 0
141122
m_SortingOrder: 0
142-
--- !u!23 &23635887951003292
143-
MeshRenderer:
144-
m_ObjectHideFlags: 1
123+
--- !u!33 &33669243737764310
124+
MeshFilter:
125+
m_ObjectHideFlags: 0
126+
m_CorrespondingSourceObject: {fileID: 0}
127+
m_PrefabInstance: {fileID: 0}
128+
m_PrefabAsset: {fileID: 0}
129+
m_GameObject: {fileID: 1521248954019730}
130+
m_Mesh: {fileID: 4300000, guid: c9ccdf34d96b5ba4bac637ab81c3626c, type: 3}
131+
--- !u!114 &114309127286800110
132+
MonoBehaviour:
133+
m_ObjectHideFlags: 0
145134
m_CorrespondingSourceObject: {fileID: 0}
146-
m_PrefabInternal: {fileID: 100100000}
135+
m_PrefabInstance: {fileID: 0}
136+
m_PrefabAsset: {fileID: 0}
147137
m_GameObject: {fileID: 1521248954019730}
148138
m_Enabled: 1
139+
m_EditorHideFlags: 0
140+
m_Script: {fileID: 11500000, guid: 0a6505a3bb71eaa47973c8308afdb608, type: 3}
141+
m_Name:
142+
m_EditorClassIdentifier:
143+
HoverTimePeriodSecs: 3
144+
RotationSpeedDegreesPerSec: 60
145+
HoverRange: 0.25
146+
--- !u!65 &65927307382903952
147+
BoxCollider:
148+
m_ObjectHideFlags: 0
149+
m_CorrespondingSourceObject: {fileID: 0}
150+
m_PrefabInstance: {fileID: 0}
151+
m_PrefabAsset: {fileID: 0}
152+
m_GameObject: {fileID: 1521248954019730}
153+
m_Material: {fileID: 0}
154+
m_IsTrigger: 1
155+
m_Enabled: 1
156+
serializedVersion: 2
157+
m_Size: {x: 1, y: 1, z: 1}
158+
m_Center: {x: 0, y: 0, z: 0}
159+
--- !u!1 &1624874677666840
160+
GameObject:
161+
m_ObjectHideFlags: 0
162+
m_CorrespondingSourceObject: {fileID: 0}
163+
m_PrefabInstance: {fileID: 0}
164+
m_PrefabAsset: {fileID: 0}
165+
serializedVersion: 6
166+
m_Component:
167+
- component: {fileID: 4896808265088638}
168+
- component: {fileID: 33229141541398220}
169+
- component: {fileID: 23183507152248366}
170+
m_Layer: 0
171+
m_Name: Base
172+
m_TagString: Untagged
173+
m_Icon: {fileID: 0}
174+
m_NavMeshLayer: 0
175+
m_StaticEditorFlags: 0
176+
m_IsActive: 1
177+
--- !u!4 &4896808265088638
178+
Transform:
179+
m_ObjectHideFlags: 0
180+
m_CorrespondingSourceObject: {fileID: 0}
181+
m_PrefabInstance: {fileID: 0}
182+
m_PrefabAsset: {fileID: 0}
183+
m_GameObject: {fileID: 1624874677666840}
184+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
185+
m_LocalPosition: {x: 0, y: 1.1, z: 0}
186+
m_LocalScale: {x: 1.5, y: 0.1, z: 1.5}
187+
m_Children: []
188+
m_Father: {fileID: 4098788009680278}
189+
m_RootOrder: 1
190+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
191+
--- !u!33 &33229141541398220
192+
MeshFilter:
193+
m_ObjectHideFlags: 0
194+
m_CorrespondingSourceObject: {fileID: 0}
195+
m_PrefabInstance: {fileID: 0}
196+
m_PrefabAsset: {fileID: 0}
197+
m_GameObject: {fileID: 1624874677666840}
198+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
199+
--- !u!23 &23183507152248366
200+
MeshRenderer:
201+
m_ObjectHideFlags: 0
202+
m_CorrespondingSourceObject: {fileID: 0}
203+
m_PrefabInstance: {fileID: 0}
204+
m_PrefabAsset: {fileID: 0}
205+
m_GameObject: {fileID: 1624874677666840}
206+
m_Enabled: 1
149207
m_CastShadows: 1
150208
m_ReceiveShadows: 1
151209
m_DynamicOccludee: 1
152210
m_MotionVectors: 1
153211
m_LightProbeUsage: 1
154212
m_ReflectionProbeUsage: 1
155213
m_RenderingLayerMask: 4294967295
214+
m_RendererPriority: 0
156215
m_Materials:
157-
- {fileID: 2100000, guid: f764914129d5d524992b5c737dfb0408, type: 2}
216+
- {fileID: 2100000, guid: 91fe024fab287f243beedec61640e4f1, type: 2}
158217
m_StaticBatchInfo:
159218
firstSubMesh: 0
160219
subMeshCount: 0
@@ -174,58 +233,3 @@ MeshRenderer:
174233
m_SortingLayerID: 0
175234
m_SortingLayer: 0
176235
m_SortingOrder: 0
177-
--- !u!33 &33229141541398220
178-
MeshFilter:
179-
m_ObjectHideFlags: 1
180-
m_CorrespondingSourceObject: {fileID: 0}
181-
m_PrefabInternal: {fileID: 100100000}
182-
m_GameObject: {fileID: 1624874677666840}
183-
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
184-
--- !u!33 &33669243737764310
185-
MeshFilter:
186-
m_ObjectHideFlags: 1
187-
m_CorrespondingSourceObject: {fileID: 0}
188-
m_PrefabInternal: {fileID: 100100000}
189-
m_GameObject: {fileID: 1521248954019730}
190-
m_Mesh: {fileID: 4300000, guid: c9ccdf34d96b5ba4bac637ab81c3626c, type: 3}
191-
--- !u!54 &54750521425877476
192-
Rigidbody:
193-
m_ObjectHideFlags: 1
194-
m_CorrespondingSourceObject: {fileID: 0}
195-
m_PrefabInternal: {fileID: 100100000}
196-
m_GameObject: {fileID: 1466186237968154}
197-
serializedVersion: 2
198-
m_Mass: 1
199-
m_Drag: 0
200-
m_AngularDrag: 0.05
201-
m_UseGravity: 0
202-
m_IsKinematic: 1
203-
m_Interpolate: 0
204-
m_Constraints: 0
205-
m_CollisionDetection: 0
206-
--- !u!65 &65927307382903952
207-
BoxCollider:
208-
m_ObjectHideFlags: 1
209-
m_CorrespondingSourceObject: {fileID: 0}
210-
m_PrefabInternal: {fileID: 100100000}
211-
m_GameObject: {fileID: 1521248954019730}
212-
m_Material: {fileID: 0}
213-
m_IsTrigger: 1
214-
m_Enabled: 1
215-
serializedVersion: 2
216-
m_Size: {x: 1, y: 1, z: 1}
217-
m_Center: {x: 0, y: 0, z: 0}
218-
--- !u!114 &114309127286800110
219-
MonoBehaviour:
220-
m_ObjectHideFlags: 1
221-
m_CorrespondingSourceObject: {fileID: 0}
222-
m_PrefabInternal: {fileID: 100100000}
223-
m_GameObject: {fileID: 1521248954019730}
224-
m_Enabled: 1
225-
m_EditorHideFlags: 0
226-
m_Script: {fileID: 11500000, guid: 0a6505a3bb71eaa47973c8308afdb608, type: 3}
227-
m_Name:
228-
m_EditorClassIdentifier:
229-
HoverTimePeriodSecs: 3
230-
RotationSpeedDegreesPerSec: 60
231-
HoverRange: 0.25

0 commit comments

Comments
 (0)