Skip to content

Commit d8d2067

Browse files
ciro-unityciro-unity
committed
Art assets
Tweaked wooden bench UVs and texture, created Campfire prefab out of PotOverFire
1 parent dfe4883 commit d8d2067

File tree

13 files changed

+996
-199
lines changed

13 files changed

+996
-199
lines changed

‎UOP1_Project/Assets/Art/Props/BeerKeg/BeerKeg.mat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Material:
1212
type: 3}
1313
m_ShaderKeywords:
1414
m_LightmapFlags: 4
15-
m_EnableInstancingVariants: 0
15+
m_EnableInstancingVariants: 1
1616
m_DoubleSidedGI: 0
1717
m_CustomRenderQueue: -1
1818
stringTagMap: {}

‎UOP1_Project/Assets/Art/Props/BeerKeg/BeerKeg.png

-307 KB
Loading

‎UOP1_Project/Assets/Art/Props/PotOverFire/PotOverFire.fbx

-181 KB
Binary file not shown.

‎UOP1_Project/Assets/Art/Props/WoodenBench/WoodenBench.fbx

6.14 KB
Binary file not shown.

‎UOP1_Project/Assets/Art/Props/WoodenBench/WoodenBench.png

212 KB
Loading

‎UOP1_Project/Assets/Prefabs/Furniture/WoodenBench.prefab

Lines changed: 91 additions & 98 deletions
Original file line numberDiff line numberDiff line change
@@ -1,118 +1,111 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!65 &534883411797647977
3+
--- !u!1 &6817864098021700600
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: 6185197018001484098}
12+
- component: {fileID: 6431148445010515189}
13+
- component: {fileID: 1169261291636530789}
14+
- component: {fileID: 2545534025127112234}
15+
- component: {fileID: 477754538425323399}
16+
m_Layer: 0
17+
m_Name: WoodenBench
18+
m_TagString: Untagged
19+
m_Icon: {fileID: 0}
20+
m_NavMeshLayer: 0
21+
m_StaticEditorFlags: 123
22+
m_IsActive: 1
23+
--- !u!4 &6185197018001484098
24+
Transform:
25+
m_ObjectHideFlags: 0
26+
m_CorrespondingSourceObject: {fileID: 0}
27+
m_PrefabInstance: {fileID: 0}
28+
m_PrefabAsset: {fileID: 0}
29+
m_GameObject: {fileID: 6817864098021700600}
30+
m_LocalRotation: {x: -6.123234e-17, y: 1, z: 6.123234e-17, w: -3.7493994e-33}
31+
m_LocalPosition: {x: 19.21, y: 0, z: -0.01999998}
32+
m_LocalScale: {x: 1, y: 1, z: 1}
33+
m_Children: []
34+
m_Father: {fileID: 0}
35+
m_RootOrder: 0
36+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
--- !u!33 &6431148445010515189
38+
MeshFilter:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_GameObject: {fileID: 6817864098021700600}
44+
m_Mesh: {fileID: -1161848509326141579, guid: 2aae116101adc3646bd2ede6a10564e9, type: 3}
45+
--- !u!23 &1169261291636530789
46+
MeshRenderer:
47+
m_ObjectHideFlags: 0
48+
m_CorrespondingSourceObject: {fileID: 0}
49+
m_PrefabInstance: {fileID: 0}
50+
m_PrefabAsset: {fileID: 0}
51+
m_GameObject: {fileID: 6817864098021700600}
52+
m_Enabled: 1
53+
m_CastShadows: 1
54+
m_ReceiveShadows: 1
55+
m_DynamicOccludee: 1
56+
m_MotionVectors: 1
57+
m_LightProbeUsage: 1
58+
m_ReflectionProbeUsage: 1
59+
m_RayTracingMode: 2
60+
m_RayTraceProcedural: 0
61+
m_RenderingLayerMask: 1
62+
m_RendererPriority: 0
63+
m_Materials:
64+
- {fileID: 2100000, guid: 5b2ffc78155b95d4089248e8c087729d, type: 2}
65+
m_StaticBatchInfo:
66+
firstSubMesh: 0
67+
subMeshCount: 0
68+
m_StaticBatchRoot: {fileID: 0}
69+
m_ProbeAnchor: {fileID: 0}
70+
m_LightProbeVolumeOverride: {fileID: 0}
71+
m_ScaleInLightmap: 1
72+
m_ReceiveGI: 1
73+
m_PreserveUVs: 0
74+
m_IgnoreNormalsForChartDetection: 0
75+
m_ImportantGI: 0
76+
m_StitchLightmapSeams: 1
77+
m_SelectedEditorRenderState: 3
78+
m_MinimumChartSize: 4
79+
m_AutoUVMaxDistance: 0.5
80+
m_AutoUVMaxAngle: 89
81+
m_LightmapParameters: {fileID: 0}
82+
m_SortingLayerID: 0
83+
m_SortingLayer: 0
84+
m_SortingOrder: 0
85+
m_AdditionalVertexStreams: {fileID: 0}
86+
--- !u!65 &2545534025127112234
487
BoxCollider:
588
m_ObjectHideFlags: 0
689
m_CorrespondingSourceObject: {fileID: 0}
790
m_PrefabInstance: {fileID: 0}
891
m_PrefabAsset: {fileID: 0}
9-
m_GameObject: {fileID: 6084573853626076775}
92+
m_GameObject: {fileID: 6817864098021700600}
1093
m_Material: {fileID: 0}
1194
m_IsTrigger: 0
1295
m_Enabled: 1
1396
serializedVersion: 2
14-
m_Size: {x: 2.4, y: 0.50987154, z: 0.600662}
15-
m_Center: {x: 0, y: 0.2549355, z: 0}
16-
--- !u!65 &2494597459909641156
97+
m_Size: {x: 1.9216976, y: 0.4143628, z: 0.4992423}
98+
m_Center: {x: -0.00084877014, y: 0.20718122, z: 0.0000002682209}
99+
--- !u!65 &477754538425323399
17100
BoxCollider:
18101
m_ObjectHideFlags: 0
19102
m_CorrespondingSourceObject: {fileID: 0}
20103
m_PrefabInstance: {fileID: 0}
21104
m_PrefabAsset: {fileID: 0}
22-
m_GameObject: {fileID: 6084573853626076775}
105+
m_GameObject: {fileID: 6817864098021700600}
23106
m_Material: {fileID: 0}
24107
m_IsTrigger: 0
25108
m_Enabled: 1
26109
serializedVersion: 2
27-
m_Size: {x: 0.11534482, y: 0.17235331, z: 0.6}
28-
m_Center: {x: 1.1423309, y: 0.5438234, z: 0}
29-
--- !u!1001 &5934761996929322665
30-
PrefabInstance:
31-
m_ObjectHideFlags: 0
32-
serializedVersion: 2
33-
m_Modification:
34-
m_TransformParent: {fileID: 0}
35-
m_Modifications:
36-
- target: {fileID: -8778574258118410034, guid: 2aae116101adc3646bd2ede6a10564e9,
37-
type: 3}
38-
propertyPath: m_StaticEditorFlags
39-
value: 123
40-
objectReference: {fileID: 0}
41-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
42-
type: 3}
43-
propertyPath: m_RootOrder
44-
value: 0
45-
objectReference: {fileID: 0}
46-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
47-
type: 3}
48-
propertyPath: m_LocalPosition.x
49-
value: -2.7853966
50-
objectReference: {fileID: 0}
51-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
52-
type: 3}
53-
propertyPath: m_LocalPosition.y
54-
value: 0.0000000834465
55-
objectReference: {fileID: 0}
56-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
57-
type: 3}
58-
propertyPath: m_LocalPosition.z
59-
value: -4.021866
60-
objectReference: {fileID: 0}
61-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
62-
type: 3}
63-
propertyPath: m_LocalRotation.w
64-
value: 1
65-
objectReference: {fileID: 0}
66-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
67-
type: 3}
68-
propertyPath: m_LocalRotation.x
69-
value: 0
70-
objectReference: {fileID: 0}
71-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
72-
type: 3}
73-
propertyPath: m_LocalRotation.y
74-
value: 0
75-
objectReference: {fileID: 0}
76-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
77-
type: 3}
78-
propertyPath: m_LocalRotation.z
79-
value: 0
80-
objectReference: {fileID: 0}
81-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
82-
type: 3}
83-
propertyPath: m_LocalEulerAnglesHint.x
84-
value: 0
85-
objectReference: {fileID: 0}
86-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
87-
type: 3}
88-
propertyPath: m_LocalEulerAnglesHint.y
89-
value: 0
90-
objectReference: {fileID: 0}
91-
- target: {fileID: -8679921383154817045, guid: 2aae116101adc3646bd2ede6a10564e9,
92-
type: 3}
93-
propertyPath: m_LocalEulerAnglesHint.z
94-
value: 0
95-
objectReference: {fileID: 0}
96-
- target: {fileID: -1848364327098884977, guid: 2aae116101adc3646bd2ede6a10564e9,
97-
type: 3}
98-
propertyPath: m_Materials.Array.data[0]
99-
value:
100-
objectReference: {fileID: 2100000, guid: 5b2ffc78155b95d4089248e8c087729d, type: 2}
101-
- target: {fileID: 919132149155446097, guid: 2aae116101adc3646bd2ede6a10564e9,
102-
type: 3}
103-
propertyPath: m_Name
104-
value: WoodenBench
105-
objectReference: {fileID: 0}
106-
- target: {fileID: 919132149155446097, guid: 2aae116101adc3646bd2ede6a10564e9,
107-
type: 3}
108-
propertyPath: m_StaticEditorFlags
109-
value: 123
110-
objectReference: {fileID: 0}
111-
m_RemovedComponents: []
112-
m_SourcePrefab: {fileID: 100100000, guid: 2aae116101adc3646bd2ede6a10564e9, type: 3}
113-
--- !u!1 &6084573853626076775 stripped
114-
GameObject:
115-
m_CorrespondingSourceObject: {fileID: -8778574258118410034, guid: 2aae116101adc3646bd2ede6a10564e9,
116-
type: 3}
117-
m_PrefabInstance: {fileID: 5934761996929322665}
118-
m_PrefabAsset: {fileID: 0}
110+
m_Size: {x: 0.10638237, y: 0.1832788, z: 0.50774705}
111+
m_Center: {x: -0.90751934, y: 0.49034953, z: 9.44582e-25}

‎UOP1_Project/Assets/Prefabs/Props/BeerKeg.prefab

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,10 @@ PrefabInstance:
7272
propertyPath: m_Name
7373
value: BeerKeg
7474
objectReference: {fileID: 0}
75+
- target: {fileID: 919132149155446097, guid: 44526cab69056014ab36d46a85ae8d84,
76+
type: 3}
77+
propertyPath: m_StaticEditorFlags
78+
value: 123
79+
objectReference: {fileID: 0}
7580
m_RemovedComponents: []
7681
m_SourcePrefab: {fileID: 100100000, guid: 44526cab69056014ab36d46a85ae8d84, type: 3}

0 commit comments

Comments
 (0)