Skip to content

Commit 41069ee

Browse files
ciro-unityciro-unity
committed
Worldbuilding
1 parent 83d069d commit 41069ee

40 files changed

+18357
-8636
lines changed

‎UOP1_Project/Assets/Art/Effects/Fire/Halo.mat

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ Material:
9797
- _BumpScale: 1
9898
- _CameraFadingEnabled: 1
9999
- _CameraFarFadeDistance: 4.69
100-
- _CameraNearFadeDistance: 0
100+
- _CameraNearFadeDistance: 3
101101
- _ClearCoatMask: 0
102102
- _ClearCoatSmoothness: 0
103103
- _ColorMode: 0
@@ -138,9 +138,9 @@ Material:
138138
- _WorkflowMode: 1
139139
- _ZWrite: 0
140140
m_Colors:
141-
- _BaseColor: {r: 1, g: 0.75294125, b: 0, a: 0.043137256}
141+
- _BaseColor: {r: 0.6320754, g: 0.4762213, b: 0, a: 0.050980393}
142142
- _BaseColorAddSubDiff: {r: 1, g: 0, b: 0, a: 0}
143-
- _CameraFadeParams: {r: 0, g: 0.21321961, b: 0, a: 0}
143+
- _CameraFadeParams: {r: 3, g: 0.59171593, b: 0, a: 0}
144144
- _Color: {r: 1, g: 1, b: 1, a: 1}
145145
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
146146
- _SoftParticleFadeParams: {r: 0, g: 0.97087383, b: 0, a: 0}

‎UOP1_Project/Assets/Prefabs/Effects/CookingSteam.prefab

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4009,7 +4009,7 @@ ParticleSystem:
40094009
maxColor: {r: 1, g: 1, b: 1, a: 1}
40104010
maxGradient:
40114011
serializedVersion: 2
4012-
key0: {r: 1, g: 1, b: 1, a: 0.0627451}
4012+
key0: {r: 1, g: 1, b: 1, a: 0.23529412}
40134013
key1: {r: 1, g: 1, b: 1, a: 0}
40144014
key2: {r: 0, g: 0, b: 0, a: 0}
40154015
key3: {r: 0, g: 0, b: 0, a: 0}
@@ -4026,7 +4026,7 @@ ParticleSystem:
40264026
ctime6: 0
40274027
ctime7: 0
40284028
atime0: 45783
4029-
atime1: 58874
4029+
atime1: 57802
40304030
atime2: 31772
40314031
atime3: 65535
40324032
atime4: 65535

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

Lines changed: 45 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,48 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &4972155520882203797
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: 6439590626505592162}
12+
- component: {fileID: 3433253593952249441}
13+
m_Layer: 0
14+
m_Name: Light Probe Group
15+
m_TagString: EditorOnly
16+
m_Icon: {fileID: 0}
17+
m_NavMeshLayer: 0
18+
m_StaticEditorFlags: 0
19+
m_IsActive: 1
20+
--- !u!4 &6439590626505592162
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: 4972155520882203797}
27+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28+
m_LocalPosition: {x: 0, y: 1.287, z: -0}
29+
m_LocalScale: {x: 1, y: 1, z: 1}
30+
m_Children: []
31+
m_Father: {fileID: 6185197018001484098}
32+
m_RootOrder: 0
33+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34+
--- !u!220 &3433253593952249441
35+
LightProbeGroup:
36+
m_ObjectHideFlags: 0
37+
m_CorrespondingSourceObject: {fileID: 0}
38+
m_PrefabInstance: {fileID: 0}
39+
m_PrefabAsset: {fileID: 0}
40+
m_GameObject: {fileID: 4972155520882203797}
41+
m_Enabled: 1
42+
m_SourcePositions:
43+
- {x: 0.8355851, y: -0.41367978, z: -0.0027707906}
44+
- {x: -0.9016338, y: -0.4136805, z: -0.0027710167}
45+
m_Dering: 1
346
--- !u!1 &6817864098021700600
447
GameObject:
548
m_ObjectHideFlags: 0
@@ -30,7 +73,8 @@ Transform:
3073
m_LocalRotation: {x: -6.123234e-17, y: 1, z: 6.123234e-17, w: -3.7493994e-33}
3174
m_LocalPosition: {x: 19.21, y: 0, z: -0.01999998}
3275
m_LocalScale: {x: 1, y: 1, z: 1}
33-
m_Children: []
76+
m_Children:
77+
- {fileID: 6439590626505592162}
3478
m_Father: {fileID: 0}
3579
m_RootOrder: 0
3680
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,21 @@ PrefabInstance:
2626
propertyPath: m_RootOrder
2727
value: 0
2828
objectReference: {fileID: 0}
29+
- target: {fileID: -8679921383154817045, guid: 2828e4decae56ce49ab172678a17cad5,
30+
type: 3}
31+
propertyPath: m_LocalScale.x
32+
value: 1.2
33+
objectReference: {fileID: 0}
34+
- target: {fileID: -8679921383154817045, guid: 2828e4decae56ce49ab172678a17cad5,
35+
type: 3}
36+
propertyPath: m_LocalScale.y
37+
value: 1.2
38+
objectReference: {fileID: 0}
39+
- target: {fileID: -8679921383154817045, guid: 2828e4decae56ce49ab172678a17cad5,
40+
type: 3}
41+
propertyPath: m_LocalScale.z
42+
value: 1.2
43+
objectReference: {fileID: 0}
2944
- target: {fileID: -8679921383154817045, guid: 2828e4decae56ce49ab172678a17cad5,
3045
type: 3}
3146
propertyPath: m_LocalPosition.x

‎UOP1_Project/Assets/Prefabs/Gameplay/FallCatcher.prefab

Lines changed: 157 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,157 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &6940163839637067414
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: 8973046805947103834}
12+
- component: {fileID: 5988202379271965916}
13+
- component: {fileID: 1139264909358345263}
14+
- component: {fileID: 8690334291356580271}
15+
m_Layer: 0
16+
m_Name: FallCatcher
17+
m_TagString: Untagged
18+
m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0}
19+
m_NavMeshLayer: 0
20+
m_StaticEditorFlags: 0
21+
m_IsActive: 1
22+
--- !u!4 &8973046805947103834
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: 6940163839637067414}
29+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
30+
m_LocalPosition: {x: 20.8087, y: 1.0054599, z: -9.273869}
31+
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_Children:
33+
- {fileID: 1956617335693518547}
34+
m_Father: {fileID: 0}
35+
m_RootOrder: 0
36+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
37+
--- !u!114 &5988202379271965916
38+
MonoBehaviour:
39+
m_ObjectHideFlags: 0
40+
m_CorrespondingSourceObject: {fileID: 0}
41+
m_PrefabInstance: {fileID: 0}
42+
m_PrefabAsset: {fileID: 0}
43+
m_GameObject: {fileID: 6940163839637067414}
44+
m_Enabled: 1
45+
m_EditorHideFlags: 0
46+
m_Script: {fileID: 11500000, guid: 7b40d4330999a9f4b99b6f67e3e50055, type: 3}
47+
m_Name:
48+
m_EditorClassIdentifier:
49+
_leadsToPath: {fileID: 0}
50+
_pathStorage: {fileID: 11400000, guid: a9ec09853cba047a8a58f5881053cfc6, type: 2}
51+
--- !u!65 &1139264909358345263
52+
BoxCollider:
53+
m_ObjectHideFlags: 0
54+
m_CorrespondingSourceObject: {fileID: 0}
55+
m_PrefabInstance: {fileID: 0}
56+
m_PrefabAsset: {fileID: 0}
57+
m_GameObject: {fileID: 6940163839637067414}
58+
m_Material: {fileID: 0}
59+
m_IsTrigger: 1
60+
m_Enabled: 1
61+
serializedVersion: 2
62+
m_Size: {x: 1, y: 3, z: 3}
63+
m_Center: {x: 0, y: 1.5, z: 0}
64+
--- !u!114 &8690334291356580271
65+
MonoBehaviour:
66+
m_ObjectHideFlags: 0
67+
m_CorrespondingSourceObject: {fileID: 0}
68+
m_PrefabInstance: {fileID: 0}
69+
m_PrefabAsset: {fileID: 0}
70+
m_GameObject: {fileID: 6940163839637067414}
71+
m_Enabled: 1
72+
m_EditorHideFlags: 0
73+
m_Script: {fileID: 11500000, guid: 14441bd075da9464e9c254e66e1849e3, type: 3}
74+
m_Name:
75+
m_EditorClassIdentifier:
76+
_verticalOffset: 0.1
77+
--- !u!1 &7769894030278673013
78+
GameObject:
79+
m_ObjectHideFlags: 0
80+
m_CorrespondingSourceObject: {fileID: 0}
81+
m_PrefabInstance: {fileID: 0}
82+
m_PrefabAsset: {fileID: 0}
83+
serializedVersion: 6
84+
m_Component:
85+
- component: {fileID: 1956617335693518547}
86+
- component: {fileID: 7879004522692414699}
87+
- component: {fileID: 9163081069603010599}
88+
m_Layer: 0
89+
m_Name: DebugVisualisation
90+
m_TagString: EditorOnly
91+
m_Icon: {fileID: 0}
92+
m_NavMeshLayer: 0
93+
m_StaticEditorFlags: 0
94+
m_IsActive: 1
95+
--- !u!4 &1956617335693518547
96+
Transform:
97+
m_ObjectHideFlags: 0
98+
m_CorrespondingSourceObject: {fileID: 0}
99+
m_PrefabInstance: {fileID: 0}
100+
m_PrefabAsset: {fileID: 0}
101+
m_GameObject: {fileID: 7769894030278673013}
102+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
103+
m_LocalPosition: {x: 0, y: 1.5, z: 0}
104+
m_LocalScale: {x: 1, y: 3, z: 3}
105+
m_Children: []
106+
m_Father: {fileID: 8973046805947103834}
107+
m_RootOrder: 0
108+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
109+
--- !u!33 &7879004522692414699
110+
MeshFilter:
111+
m_ObjectHideFlags: 0
112+
m_CorrespondingSourceObject: {fileID: 0}
113+
m_PrefabInstance: {fileID: 0}
114+
m_PrefabAsset: {fileID: 0}
115+
m_GameObject: {fileID: 7769894030278673013}
116+
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
117+
--- !u!23 &9163081069603010599
118+
MeshRenderer:
119+
m_ObjectHideFlags: 0
120+
m_CorrespondingSourceObject: {fileID: 0}
121+
m_PrefabInstance: {fileID: 0}
122+
m_PrefabAsset: {fileID: 0}
123+
m_GameObject: {fileID: 7769894030278673013}
124+
m_Enabled: 0
125+
m_CastShadows: 0
126+
m_ReceiveShadows: 1
127+
m_DynamicOccludee: 0
128+
m_MotionVectors: 1
129+
m_LightProbeUsage: 0
130+
m_ReflectionProbeUsage: 0
131+
m_RayTracingMode: 2
132+
m_RayTraceProcedural: 0
133+
m_RenderingLayerMask: 1
134+
m_RendererPriority: 0
135+
m_Materials:
136+
- {fileID: 2100000, guid: 43cc88de02783754fa81506bf52da0b2, type: 2}
137+
m_StaticBatchInfo:
138+
firstSubMesh: 0
139+
subMeshCount: 0
140+
m_StaticBatchRoot: {fileID: 0}
141+
m_ProbeAnchor: {fileID: 0}
142+
m_LightProbeVolumeOverride: {fileID: 0}
143+
m_ScaleInLightmap: 1
144+
m_ReceiveGI: 1
145+
m_PreserveUVs: 0
146+
m_IgnoreNormalsForChartDetection: 0
147+
m_ImportantGI: 0
148+
m_StitchLightmapSeams: 1
149+
m_SelectedEditorRenderState: 3
150+
m_MinimumChartSize: 4
151+
m_AutoUVMaxDistance: 0.5
152+
m_AutoUVMaxAngle: 89
153+
m_LightmapParameters: {fileID: 0}
154+
m_SortingLayerID: 0
155+
m_SortingLayer: 0
156+
m_SortingOrder: 0
157+
m_AdditionalVertexStreams: {fileID: 0}

‎UOP1_Project/Assets/Prefabs/Gameplay/FallCatcher.prefab.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -398,6 +398,11 @@ PrefabInstance:
398398
m_Modification:
399399
m_TransformParent: {fileID: 3639386882481120833}
400400
m_Modifications:
401+
- target: {fileID: 4734982731406355516, guid: f38545979646fbf42842e6c368a1f42e,
402+
type: 3}
403+
propertyPath: m_Range
404+
value: 3
405+
objectReference: {fileID: 0}
401406
- target: {fileID: 4734982731406355518, guid: f38545979646fbf42842e6c368a1f42e,
402407
type: 3}
403408
propertyPath: m_Name

0 commit comments

Comments
 (0)